diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 6 | ||||
-rw-r--r-- | readconf.c | 2 | ||||
-rw-r--r-- | servconf.c | 2 |
5 files changed, 15 insertions, 4 deletions
@@ -50,6 +50,8 @@ | |||
50 | - dtucker@cvs.openbsd.org 2013/05/16 09:12:31 | 50 | - dtucker@cvs.openbsd.org 2013/05/16 09:12:31 |
51 | [readconf.c servconf.c] | 51 | [readconf.c servconf.c] |
52 | switch RekeyLimit traffic volume parsing to scan_scaled. ok djm@ | 52 | switch RekeyLimit traffic volume parsing to scan_scaled. ok djm@ |
53 | - (dtucker) [configure.ac readconf.c servconf.c | ||
54 | openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled. | ||
53 | 55 | ||
54 | 20130510 | 56 | 20130510 |
55 | - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler | 57 | - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler |
diff --git a/configure.ac b/configure.ac index 6bcbef638..7d8adfcbc 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.523 2013/05/10 08:53:14 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.524 2013/05/16 10:47:32 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.523 $) | 18 | AC_REVISION($Revision: 1.524 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -1175,12 +1175,13 @@ AC_CHECK_FUNCS([utimes], | |||
1175 | dnl Checks for libutil functions | 1175 | dnl Checks for libutil functions |
1176 | AC_CHECK_HEADERS([bsd/libutil.h libutil.h]) | 1176 | AC_CHECK_HEADERS([bsd/libutil.h libutil.h]) |
1177 | AC_SEARCH_LIBS([fmt_scaled], [util bsd]) | 1177 | AC_SEARCH_LIBS([fmt_scaled], [util bsd]) |
1178 | AC_SEARCH_LIBS([scan_scaled], [util bsd]) | ||
1178 | AC_SEARCH_LIBS([login], [util bsd]) | 1179 | AC_SEARCH_LIBS([login], [util bsd]) |
1179 | AC_SEARCH_LIBS([logout], [util bsd]) | 1180 | AC_SEARCH_LIBS([logout], [util bsd]) |
1180 | AC_SEARCH_LIBS([logwtmp], [util bsd]) | 1181 | AC_SEARCH_LIBS([logwtmp], [util bsd]) |
1181 | AC_SEARCH_LIBS([openpty], [util bsd]) | 1182 | AC_SEARCH_LIBS([openpty], [util bsd]) |
1182 | AC_SEARCH_LIBS([updwtmp], [util bsd]) | 1183 | AC_SEARCH_LIBS([updwtmp], [util bsd]) |
1183 | AC_CHECK_FUNCS([fmt_scaled login logout openpty updwtmp logwtmp]) | 1184 | AC_CHECK_FUNCS([fmt_scaled scan_scaled login logout openpty updwtmp logwtmp]) |
1184 | 1185 | ||
1185 | AC_FUNC_STRFTIME | 1186 | AC_FUNC_STRFTIME |
1186 | 1187 | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 94d172aaa..3dbf1f244 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.56 2013/05/10 08:08:49 dtucker Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.57 2013/05/16 10:47:32 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -111,6 +111,10 @@ char *dirname(const char *path); | |||
111 | int fmt_scaled(long long number, char *result); | 111 | int fmt_scaled(long long number, char *result); |
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | #ifndef HAVE_SCAN_SCALED | ||
115 | int scan_scaled(char *, long long *); | ||
116 | #endif | ||
117 | |||
114 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) | 118 | #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) |
115 | char *inet_ntoa(struct in_addr in); | 119 | char *inet_ntoa(struct in_addr in); |
116 | #endif | 120 | #endif |
diff --git a/readconf.c b/readconf.c index dccf3ba16..cbc1981ab 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -30,7 +30,9 @@ | |||
30 | #include <stdio.h> | 30 | #include <stdio.h> |
31 | #include <string.h> | 31 | #include <string.h> |
32 | #include <unistd.h> | 32 | #include <unistd.h> |
33 | #ifdef HAVE_UTIL_H | ||
33 | #include <util.h> | 34 | #include <util.h> |
35 | #endif | ||
34 | 36 | ||
35 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
36 | #include "ssh.h" | 38 | #include "ssh.h" |
diff --git a/servconf.c b/servconf.c index 145239342..b2123c6c7 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -30,7 +30,9 @@ | |||
30 | #include <unistd.h> | 30 | #include <unistd.h> |
31 | #include <stdarg.h> | 31 | #include <stdarg.h> |
32 | #include <errno.h> | 32 | #include <errno.h> |
33 | #ifdef HAVE_UTIL_H | ||
33 | #include <util.h> | 34 | #include <util.h> |
35 | #endif | ||
34 | 36 | ||
35 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
36 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |