tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-26 03:18:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [configure.ac readconf.c servconf.c

Browse Source 
openbsd-compat/openbsd-compat.h] Add compat bits for scan_scaled.
This commit is contained in:
Darren Tucker 2013-05-16 20:47:31 +10:00
parent b7ee852144
commit e194ba4111
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -50,6 +50,8 @@
- dtucker@cvs.openbsd.org 2013/05/16 09:12:31 - dtucker@cvs.openbsd.org 2013/05/16 09:12:31
[readconf.c servconf.c] [readconf.c servconf.c]
switch RekeyLimit traffic volume parsing to scan_scaled. ok djm@ 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 20130510
- (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler - (dtucker) [configure.ac] Enable -Wsizeof-pointer-memaccess if the compiler

7
configure.ac
View File

@ -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 # Copyright (c) 1999-2004 Damien Miller
# #
@ -15,7 +15,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) 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_CONFIG_SRCDIR([ssh.c])
AC_LANG([C]) AC_LANG([C])
@ -1175,12 +1175,13 @@ AC_CHECK_FUNCS([utimes],
dnl Checks for libutil functions dnl Checks for libutil functions
AC_CHECK_HEADERS([bsd/libutil.h libutil.h]) AC_CHECK_HEADERS([bsd/libutil.h libutil.h])
AC_SEARCH_LIBS([fmt_scaled], [util bsd]) AC_SEARCH_LIBS([fmt_scaled], [util bsd])
AC_SEARCH_LIBS([scan_scaled], [util bsd])
AC_SEARCH_LIBS([login], [util bsd]) AC_SEARCH_LIBS([login], [util bsd])
AC_SEARCH_LIBS([logout], [util bsd]) AC_SEARCH_LIBS([logout], [util bsd])
AC_SEARCH_LIBS([logwtmp], [util bsd]) AC_SEARCH_LIBS([logwtmp], [util bsd])
AC_SEARCH_LIBS([openpty], [util bsd]) AC_SEARCH_LIBS([openpty], [util bsd])
AC_SEARCH_LIBS([updwtmp], [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 AC_FUNC_STRFTIME

6
openbsd-compat/openbsd-compat.h
View File

@ -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. * 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); int fmt_scaled(long long number, char *result);
#endif #endif
#ifndef HAVE_SCAN_SCALED
int scan_scaled(char *, long long *);
#endif
#if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA) #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
char *inet_ntoa(struct in_addr in); char *inet_ntoa(struct in_addr in);
#endif #endif

2
readconf.c
View File

@ -30,7 +30,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_UTIL_H
#include <util.h> #include <util.h>
#endif
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
servconf.c
View File

@ -30,7 +30,9 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UTIL_H
#include <util.h> #include <util.h>
#endif
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
#include "xmalloc.h" #include "xmalloc.h"