summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--servconf.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d7f5a59c2..5f753198a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 [sftp.1] 9 [sftp.1]
10 document top-level -a option (the -a option to 'get' was already 10 document top-level -a option (the -a option to 'get' was already
11 documented) 11 documented)
12 - djm@cvs.openbsd.org 2013/08/06 23:06:01
13 [servconf.c]
14 add cast to avoid format warning; from portable
12 15
1320130808 1620130808
14 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt 17 - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt
diff --git a/servconf.c b/servconf.c
index 747edde6c..c761ff01c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.240 2013/07/19 07:37:48 markus Exp $ */ 2/* $OpenBSD: servconf.c,v 1.241 2013/08/06 23:06:01 djm Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -2063,7 +2063,8 @@ dump_config(ServerOptions *o)
2063 printf("ipqos %s ", iptos2str(o->ip_qos_interactive)); 2063 printf("ipqos %s ", iptos2str(o->ip_qos_interactive));
2064 printf("%s\n", iptos2str(o->ip_qos_bulk)); 2064 printf("%s\n", iptos2str(o->ip_qos_bulk));
2065 2065
2066 printf("rekeylimit %lld %d\n", o->rekey_limit, o->rekey_interval); 2066 printf("rekeylimit %lld %d\n", (long long)o->rekey_limit,
2067 o->rekey_interval);
2067 2068
2068 channel_print_adm_permitted_opens(); 2069 channel_print_adm_permitted_opens();
2069} 2070}