RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-17 22:36:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: avoid another compiler warning spotted in -portable

Browse Source 
OpenBSD-Commit-ID: 1d29c51ac844b287c4c8bcaf04c63c7d9ba3b8c7
This commit is contained in:
djm@openbsd.org 2020-04-03 05:48:57 +00:00 committed by Damien Miller
parent 9f8a42340b
commit 338ccee1e7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
krl.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: krl.c,v 1.49 2020/04/03 04:43:24 djm Exp $ */ /* $OpenBSD: krl.c,v 1.50 2020/04/03 05:48:57 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -1370,7 +1370,8 @@ krl_dump(struct ssh_krl *krl, FILE *f)
/* Try to print in a KRL spec-compatible format */ /* Try to print in a KRL spec-compatible format */
format_timestamp(krl->generated_date, timestamp, sizeof(timestamp)); format_timestamp(krl->generated_date, timestamp, sizeof(timestamp));
fprintf(f, "# KRL version %llu\n", krl->krl_version); fprintf(f, "# KRL version %llu\n",
(unsigned long long)krl->krl_version);
fprintf(f, "# Generated at %s\n", timestamp); fprintf(f, "# Generated at %s\n", timestamp);
if (krl->comment != NULL && *krl->comment != '\0') { if (krl->comment != NULL && *krl->comment != '\0') {
r = INT_MAX; r = INT_MAX;
@ -1427,11 +1428,13 @@ krl_dump(struct ssh_krl *krl, FILE *f)
free(fp); free(fp);
} }
RB_FOREACH(rs, revoked_serial_tree, &rc->revoked_serials) { RB_FOREACH(rs, revoked_serial_tree, &rc->revoked_serials) {
if (rs->lo == rs->hi) if (rs->lo == rs->hi) {
fprintf(f, "serial: %llu\n", rs->lo); fprintf(f, "serial: %llu\n",
else { (unsigned long long)rs->lo);
} else {
fprintf(f, "serial: %llu-%llu\n", fprintf(f, "serial: %llu-%llu\n",
rs->lo, rs->hi); (unsigned long long)rs->lo,
(unsigned long long)rs->hi);
} }
} }
RB_FOREACH(rki, revoked_key_id_tree, &rc->revoked_key_ids) { RB_FOREACH(rki, revoked_key_id_tree, &rc->revoked_key_ids) {