From e194ba4111ffd47cd1f4c8be1ddc8a4cb673d005 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Thu, 16 May 2013 20:47:31 +1000
Subject:  - (dtucker) [configure.ac readconf.c servconf.c     
 openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.

---
 ChangeLog                       | 2 ++
 configure.ac                    | 7 ++++---
 openbsd-compat/openbsd-compat.h | 6 +++++-
 readconf.c                      | 2 ++
 servconf.c                      | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 845a6a28d..1779aa748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,8 @@
    - dtucker@cvs.openbsd.org 2013/05/16 09:12:31
      [readconf.c servconf.c]
      switch RekeyLimit traffic volume parsing to scan_scaled.  ok djm@
+ - (dtucker) [configure.ac readconf.c servconf.c
+     openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.
 
 20130510
  - (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 @@
-# $Id: configure.ac,v 1.523 2013/05/10 08:53:14 dtucker Exp $
+# $Id: configure.ac,v 1.524 2013/05/16 10:47:32 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.523 $)
+AC_REVISION($Revision: 1.524 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1175,12 +1175,13 @@ AC_CHECK_FUNCS([utimes],
 dnl    Checks for libutil functions
 AC_CHECK_HEADERS([bsd/libutil.h libutil.h])
 AC_SEARCH_LIBS([fmt_scaled], [util bsd])
+AC_SEARCH_LIBS([scan_scaled], [util bsd])
 AC_SEARCH_LIBS([login], [util bsd])
 AC_SEARCH_LIBS([logout], [util bsd])
 AC_SEARCH_LIBS([logwtmp], [util bsd])
 AC_SEARCH_LIBS([openpty], [util bsd])
 AC_SEARCH_LIBS([updwtmp], [util bsd])
-AC_CHECK_FUNCS([fmt_scaled login logout openpty updwtmp logwtmp])
+AC_CHECK_FUNCS([fmt_scaled scan_scaled login logout openpty updwtmp logwtmp])
 
 AC_FUNC_STRFTIME
 
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 @@
-/* $Id: openbsd-compat.h,v 1.56 2013/05/10 08:08:49 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.57 2013/05/16 10:47:32 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -111,6 +111,10 @@ char *dirname(const char *path);
 int	fmt_scaled(long long number, char *result);
 #endif
 
+#ifndef HAVE_SCAN_SCALED
+int	scan_scaled(char *, long long *);
+#endif
+
 #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
 char *inet_ntoa(struct in_addr in);
 #endif
diff --git a/readconf.c b/readconf.c
index dccf3ba16..cbc1981ab 100644
--- a/readconf.c
+++ b/readconf.c
@@ -30,7 +30,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#ifdef HAVE_UTIL_H
 #include <util.h>
+#endif
 
 #include "xmalloc.h"
 #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 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <errno.h>
+#ifdef HAVE_UTIL_H
 #include <util.h>
+#endif
 
 #include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
-- 
cgit v1.2.3