RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-07 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix some Linux libc5 problems reported by Miles Wilson <mw@mctitle.com>

Browse Source
This commit is contained in:
Damien Miller 1999-11-16 13:29:26 +11:00
parent a7cafae274
commit 4874c79a3a
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acconfig.h
View File

@ -34,6 +34,10 @@
/* ******************* Shouldn't need to edit below this line ************** */ /* ******************* Shouldn't need to edit below this line ************** */
#include <sys/types.h> /* For u_intXX_t */
#include <sys/socket.h> /* For SHUT_XXXX */
#include <paths.h> /* For _PATH_XXX */
#ifndef SHUT_RDWR #ifndef SHUT_RDWR
enum enum
{ {
@ -46,9 +50,6 @@ enum
}; };
#endif #endif
#include <sys/types.h> /* For u_intXX_t */
#include <paths.h> /* For _PATH_XXX */
#if !defined(u_int32_t) && defined(uint32_t) #if !defined(u_int32_t) && defined(uint32_t)
#define u_int32_t uint32_t #define u_int32_t uint32_t
#endif #endif
@ -57,6 +58,10 @@ enum
#define u_int16_t uint16_t #define u_int16_t uint16_t
#endif #endif
#if !defined(quad_t) && defined(int64_t)
#define quad_t int64_t
#endif
#ifndef _PATH_LASTLOG #ifndef _PATH_LASTLOG
# ifdef LASTLOG_LOCATION # ifdef LASTLOG_LOCATION
# define _PATH_LASTLOG LASTLOG_LOCATION # define _PATH_LASTLOG LASTLOG_LOCATION
@ -88,3 +93,8 @@ enum
# define _PATH_MAILDIR MAILDIR # define _PATH_MAILDIR MAILDIR
# endif # endif
#endif #endif
#ifndef MAX
# define MAX(a,b) (((a)>(b))?(a):(b))
# define MIN(a,b) (((a)<(b))?(a):(b))
#endif

2
configure.in
View File

@ -55,7 +55,7 @@ AC_CHECK_LIB(dl, dlopen, , )
AC_CHECK_LIB(pam, pam_authenticate, , ) AC_CHECK_LIB(pam, pam_authenticate, , )
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h) AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h sys/select.h)
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin) AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin)

15
includes.h
View File

@ -19,9 +19,10 @@ This file includes most of the needed system headers.
#define RCSID(msg) \ #define RCSID(msg) \
static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include "config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/select.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -52,8 +53,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include <time.h> #include <time.h>
#include <dirent.h> #include <dirent.h>
#include "config.h"
#ifdef HAVE_NETGROUP_H #ifdef HAVE_NETGROUP_H
# include <netgroup.h> # include <netgroup.h>
#endif #endif
@ -63,16 +62,18 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#ifdef HAVE_ENDIAN_H #ifdef HAVE_ENDIAN_H
# include <endian.h> # include <endian.h>
#endif #endif
#ifdef HAVE_SYS_SELECT_H
# include <sys/select.h>
#endif
#ifdef HAVE_LIBPAM
# include <security/pam_appl.h>
#endif /* HAVE_PAM */
#include "version.h" #include "version.h"
#include "helper.h" #include "helper.h"
#include "mktemp.h" #include "mktemp.h"
#include "strlcpy.h" #include "strlcpy.h"
#ifdef HAVE_LIBPAM
#include <security/pam_appl.h>
#endif /* HAVE_PAM */
/* Define this to be the path of the xauth program. */ /* Define this to be the path of the xauth program. */
#ifndef XAUTH_PATH #ifndef XAUTH_PATH
#define XAUTH_PATH "/usr/X11R6/bin/xauth" #define XAUTH_PATH "/usr/X11R6/bin/xauth"