diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.in | 18 | ||||
-rw-r--r-- | defines.h | 9 |
4 files changed, 6 insertions, 29 deletions
@@ -1,5 +1,6 @@ | |||
1 | 20010920 | 1 | 20010920 |
2 | - (tim) [scard/Makefile.in] Don't strip the Java binary | 2 | - (tim) [scard/Makefile.in] Don't strip the Java binary |
3 | - (stevesk) sun_len, SUN_LEN() configure stuff no longer required | ||
3 | 4 | ||
4 | 20010919 | 5 | 20010919 |
5 | - (bal) OpenBSD Sync | 6 | - (bal) OpenBSD Sync |
@@ -6533,4 +6534,4 @@ | |||
6533 | - Wrote replacements for strlcpy and mkdtemp | 6534 | - Wrote replacements for strlcpy and mkdtemp |
6534 | - Released 1.0pre1 | 6535 | - Released 1.0pre1 |
6535 | 6536 | ||
6536 | $Id: ChangeLog,v 1.1549 2001/09/20 18:39:35 tim Exp $ | 6537 | $Id: ChangeLog,v 1.1550 2001/09/20 19:43:41 stevesk Exp $ |
diff --git a/acconfig.h b/acconfig.h index 2b2be91ab..0c1417885 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.116 2001/09/18 04:01:12 djm Exp $ */ | 1 | /* $Id: acconfig.h,v 1.117 2001/09/20 19:43:41 stevesk Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -32,9 +32,6 @@ | |||
32 | /* Define if your password has a pw_change field */ | 32 | /* Define if your password has a pw_change field */ |
33 | #undef HAVE_PW_CHANGE_IN_PASSWD | 33 | #undef HAVE_PW_CHANGE_IN_PASSWD |
34 | 34 | ||
35 | /* Define if your system's struct sockaddr_un has a sun_len member */ | ||
36 | #undef HAVE_SUN_LEN_IN_SOCKADDR_UN | ||
37 | |||
38 | /* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ | 35 | /* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ |
39 | #undef BROKEN_INET_NTOA | 36 | #undef BROKEN_INET_NTOA |
40 | 37 | ||
diff --git a/configure.in b/configure.in index 038569bee..5fd7225c2 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.312 2001/09/20 02:07:51 mouring Exp $ | 1 | # $Id: configure.in,v 1.313 2001/09/20 19:43:41 stevesk Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -1167,22 +1167,6 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX) | |||
1167 | OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX) | 1167 | OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX) |
1168 | AC_STRUCT_ST_BLKSIZE | 1168 | AC_STRUCT_ST_BLKSIZE |
1169 | 1169 | ||
1170 | AC_CACHE_CHECK([for sun_len field in struct sockaddr_un], | ||
1171 | ac_cv_have_sun_len_in_struct_sockaddr_un, [ | ||
1172 | AC_TRY_COMPILE( | ||
1173 | [ | ||
1174 | #include <sys/types.h> | ||
1175 | #include <sys/socket.h> | ||
1176 | ], | ||
1177 | [ struct sockaddr_un s; s.sun_len = 1; ], | ||
1178 | [ ac_cv_have_sun_len_in_struct_sockaddr_un="yes" ], | ||
1179 | [ ac_cv_have_sun_len_in_struct_sockaddr_un="no" ], | ||
1180 | ) | ||
1181 | ]) | ||
1182 | if test "x$ac_cv_have_sun_len_in_struct_sockaddr_un" = "xyes" ; then | ||
1183 | AC_DEFINE(HAVE_SUN_LEN_IN_SOCKADDR_UN) | ||
1184 | fi | ||
1185 | |||
1186 | AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage], | 1170 | AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage], |
1187 | ac_cv_have_ss_family_in_struct_ss, [ | 1171 | ac_cv_have_ss_family_in_struct_ss, [ |
1188 | AC_TRY_COMPILE( | 1172 | AC_TRY_COMPILE( |
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.71 2001/09/15 11:31:54 djm Exp $ */ | 4 | /* $Id: defines.h,v 1.72 2001/09/20 19:43:41 stevesk Exp $ */ |
5 | 5 | ||
6 | /* Necessary headers */ | 6 | /* Necessary headers */ |
7 | 7 | ||
@@ -12,7 +12,7 @@ | |||
12 | #include <netinet/in.h> /* For IPv6 macros */ | 12 | #include <netinet/in.h> /* For IPv6 macros */ |
13 | #include <netinet/ip.h> /* For IPTOS macros */ | 13 | #include <netinet/ip.h> /* For IPTOS macros */ |
14 | #ifdef HAVE_SYS_UN_H | 14 | #ifdef HAVE_SYS_UN_H |
15 | # include <sys/un.h> /* For SUN_LEN */ | 15 | # include <sys/un.h> /* For sockaddr_un */ |
16 | #endif | 16 | #endif |
17 | #ifdef HAVE_SYS_BITYPES_H | 17 | #ifdef HAVE_SYS_BITYPES_H |
18 | # include <sys/bitypes.h> /* For u_intXX_t */ | 18 | # include <sys/bitypes.h> /* For u_intXX_t */ |
@@ -405,11 +405,6 @@ struct winsize { | |||
405 | # define __attribute__(x) | 405 | # define __attribute__(x) |
406 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ | 406 | #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ |
407 | 407 | ||
408 | #ifndef SUN_LEN | ||
409 | #define SUN_LEN(su) \ | ||
410 | (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) | ||
411 | #endif /* SUN_LEN */ | ||
412 | |||
413 | /* *-*-nto-qnx doesn't define this macro in the system headers */ | 408 | /* *-*-nto-qnx doesn't define this macro in the system headers */ |
414 | #ifdef MISSING_HOWMANY | 409 | #ifdef MISSING_HOWMANY |
415 | # define howmany(x,y) (((x)+((y)-1))/(y)) | 410 | # define howmany(x,y) (((x)+((y)-1))/(y)) |