summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-08-21 02:40:01 +1000
committerDamien Miller <djm@mindrot.org>2013-08-21 02:40:01 +1000
commita6d6c1f38ac9b4a5e1bd4df889e1020a8370ed55 (patch)
tree0bf822795a63d93c31565c7caabb54945bf25839
parenteec840673bce3f69ad269672fba7ed8ff05f154f (diff)
- djm@cvs.openbsd.org 2013/08/06 23:06:01
[servconf.c] add cast to avoid format warning; from portable
-rw-r--r--ChangeLog3
-rw-r--r--servconf.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d7f5a59c..5f753198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
[sftp.1]
document top-level -a option (the -a option to 'get' was already
documented)
+ - djm@cvs.openbsd.org 2013/08/06 23:06:01
+ [servconf.c]
+ add cast to avoid format warning; from portable
20130808
- (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/servconf.c b/servconf.c
index 747edde6..c761ff01 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: servconf.c,v 1.240 2013/07/19 07:37:48 markus Exp $ */
+/* $OpenBSD: servconf.c,v 1.241 2013/08/06 23:06:01 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -2063,7 +2063,8 @@ dump_config(ServerOptions *o)
printf("ipqos %s ", iptos2str(o->ip_qos_interactive));
printf("%s\n", iptos2str(o->ip_qos_bulk));
- printf("rekeylimit %lld %d\n", o->rekey_limit, o->rekey_interval);
+ printf("rekeylimit %lld %d\n", (long long)o->rekey_limit,
+ o->rekey_interval);
channel_print_adm_permitted_opens();
}