summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--Makefile.in6
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac98
-rw-r--r--defines.h26
5 files changed, 124 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 54cea031d..ac0bebcc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
120020226
2 - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
3 based on patch by mooney@dogbert.cc.ndsu.nodak.edu (Tim Mooney)
4 Bug 45 [configure.ac] modify skey test to work around conflict with autoconf
5 reported by nolan@naic.edu (Michael Nolan)
6 patch by Pekka Savola <pekkas@netcore.fi>
7 Bug 74 [configure.ac defines.h] add sig_atomic_t test
8 reported by dwd@bell-labs.com (Dave Dykstra)
9 Bug 102 [defines.h] UNICOS fixes. patch by wendyp@cray.com
10 [configure.ac Makefile.in] link libwrap only with sshd
11 based on patch by Maciej W. Rozycki <macro@ds2.pg.gda.pl>
12 Bug 123 link libpam only with sshd
13 reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky)
14 [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
15 [acconfig.h] remove unused HAVE_REGCOMP
16
120020225 1720020225
2 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() 18 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
3 since we need more session information than provided by that function. 19 since we need more session information than provided by that function.
@@ -7670,4 +7686,4 @@
7670 - Wrote replacements for strlcpy and mkdtemp 7686 - Wrote replacements for strlcpy and mkdtemp
7671 - Released 1.0pre1 7687 - Released 1.0pre1
7672 7688
7673$Id: ChangeLog,v 1.1874 2002/02/25 15:48:02 mouring Exp $ 7689$Id: ChangeLog,v 1.1875 2002/02/26 16:40:48 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 54bb6955a..2e9fb39d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.195 2002/02/10 07:32:29 djm Exp $ 1# $Id: Makefile.in,v 1.196 2002/02/26 16:40:49 tim Exp $
2 2
3prefix=@prefix@ 3prefix=@prefix@
4exec_prefix=@exec_prefix@ 4exec_prefix=@exec_prefix@
@@ -31,6 +31,8 @@ LD=@LD@
31CFLAGS=@CFLAGS@ 31CFLAGS=@CFLAGS@
32CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ 32CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
33LIBS=@LIBS@ 33LIBS=@LIBS@
34LIBPAM=@LIBPAM@
35LIBWRAP=@LIBWRAP@
34AR=@AR@ 36AR=@AR@
35RANLIB=@RANLIB@ 37RANLIB=@RANLIB@
36INSTALL=@INSTALL@ 38INSTALL=@INSTALL@
@@ -100,7 +102,7 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)
100 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 102 $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
101 103
102sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) 104sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS)
103 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 105 $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
104 106
105scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o 107scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o
106 $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 108 $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
diff --git a/acconfig.h b/acconfig.h
index caf30149f..40cbeeb7d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.121 2002/01/22 10:57:54 djm Exp $ */ 1/* $Id: acconfig.h,v 1.122 2002/02/26 16:40:49 tim Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -257,9 +257,6 @@
257#undef HAVE_SS_FAMILY_IN_SS 257#undef HAVE_SS_FAMILY_IN_SS
258#undef HAVE___SS_FAMILY_IN_SS 258#undef HAVE___SS_FAMILY_IN_SS
259 259
260/* Define if you have a regcomp() function */
261#undef HAVE_REGCOMP
262
263/* Define if you have /dev/ptmx */ 260/* Define if you have /dev/ptmx */
264#undef HAVE_DEV_PTMX 261#undef HAVE_DEV_PTMX
265 262
diff --git a/configure.ac b/configure.ac
index e342c974e..1f537868e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.20 2002/02/13 21:44:06 djm Exp $ 1# $Id: configure.ac,v 1.21 2002/02/26 16:40:49 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -320,6 +320,18 @@ AC_ARG_WITH(libs,
320 ] 320 ]
321) 321)
322 322
323# Checks for header files.
324AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
325 getopt.h glob.h lastlog.h limits.h login.h \
326 login_cap.h maillock.h netdb.h netgroup.h \
327 netinet/in_systm.h paths.h poll.h pty.h \
328 security/pam_appl.h shadow.h stddef.h stdint.h \
329 strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
330 sys/poll.h sys/queue.h sys/select.h sys/stat.h \
331 sys/stropts.h sys/sysmacros.h sys/time.h \
332 sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \
333 util.h utime.h utmp.h utmpx.h)
334
323# Checks for libraries. 335# Checks for libraries.
324AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match)) 336AC_CHECK_FUNC(yp_match, , AC_CHECK_LIB(nsl, yp_match))
325AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) 337AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
@@ -391,19 +403,6 @@ AC_CHECK_FUNCS(logout updwtmp logwtmp)
391 403
392AC_FUNC_STRFTIME 404AC_FUNC_STRFTIME
393 405
394# Checks for header files.
395AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
396 getopt.h glob.h lastlog.h limits.h login.h \
397 login_cap.h maillock.h netdb.h netgroup.h \
398 netinet/in_systm.h paths.h poll.h pty.h \
399 rpc/rpc.h \
400 security/pam_appl.h shadow.h stddef.h stdint.h \
401 strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
402 sys/poll.h sys/queue.h sys/select.h sys/stat.h \
403 sys/stropts.h sys/sysmacros.h sys/time.h \
404 sys/ttcompat.h sys/un.h time.h ttyent.h usersec.h \
405 util.h utime.h utmp.h utmpx.h)
406
407# Check for ALTDIRFUNC glob() extension 406# Check for ALTDIRFUNC glob() extension
408AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support) 407AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support)
409AC_EGREP_CPP(FOUNDIT, 408AC_EGREP_CPP(FOUNDIT,
@@ -469,9 +468,16 @@ AC_ARG_WITH(skey,
469 LIBS="-lskey $LIBS" 468 LIBS="-lskey $LIBS"
470 SKEY_MSG="yes" 469 SKEY_MSG="yes"
471 470
472 AC_CHECK_FUNC(skey_keyinfo, 471 AC_MSG_CHECKING([for s/key support])
473 [], 472 AC_TRY_RUN(
473 [
474#include <stdio.h>
475#include <skey.h>
476int main() { char *ff = skey_keyinfo(""); ff=""; return 0; }
477 ],
478 [AC_MSG_RESULT(yes)],
474 [ 479 [
480 AC_MSG_RESULT(no)
475 AC_MSG_ERROR([** Incomplete or missing s/key libraries.]) 481 AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
476 ]) 482 ])
477 fi 483 fi
@@ -508,7 +514,8 @@ AC_ARG_WITH(tcp-wrappers,
508 CPPFLAGS="-I${withval} ${CPPFLAGS}" 514 CPPFLAGS="-I${withval} ${CPPFLAGS}"
509 fi 515 fi
510 fi 516 fi
511 LIBS="-lwrap $LIBS" 517 LIBWRAP="-lwrap"
518 LIBS="$LIBWRAP $LIBS"
512 AC_MSG_CHECKING(for libwrap) 519 AC_MSG_CHECKING(for libwrap)
513 AC_TRY_LINK( 520 AC_TRY_LINK(
514 [ 521 [
@@ -519,12 +526,14 @@ AC_ARG_WITH(tcp-wrappers,
519 [ 526 [
520 AC_MSG_RESULT(yes) 527 AC_MSG_RESULT(yes)
521 AC_DEFINE(LIBWRAP) 528 AC_DEFINE(LIBWRAP)
529 AC_SUBST(LIBWRAP)
522 TCPW_MSG="yes" 530 TCPW_MSG="yes"
523 ], 531 ],
524 [ 532 [
525 AC_MSG_ERROR([*** libwrap missing]) 533 AC_MSG_ERROR([*** libwrap missing])
526 ] 534 ]
527 ) 535 )
536 LIBS="$saved_LIBS"
528 fi 537 fi
529 ] 538 ]
530) 539)
@@ -640,6 +649,7 @@ AC_ARG_WITH(pam,
640 PAM_MSG="yes" 649 PAM_MSG="yes"
641 650
642 AC_DEFINE(USE_PAM) 651 AC_DEFINE(USE_PAM)
652 AC_SUBST(LIBPAM, ["-lpam -ldl"])
643 fi 653 fi
644 ] 654 ]
645) 655)
@@ -956,6 +966,25 @@ AC_ARG_WITH(prngd-socket,
956 PRNGD_SOCKET="$withval" 966 PRNGD_SOCKET="$withval"
957 AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET") 967 AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
958 fi 968 fi
969 ],
970 [
971 # Check for existing socket only if we don't have a random device already
972 if test "$USE_RAND_HELPER" = yes ; then
973 AC_MSG_CHECKING(for PRNGD/EGD socket)
974 # Insert other locations here
975 for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do
976 if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then
977 PRNGD_SOCKET="$sock"
978 AC_DEFINE_UNQUOTED(PRNGD_SOCKET, "$PRNGD_SOCKET")
979 break;
980 fi
981 done
982 if test ! -z "$PRNGD_SOCKET" ; then
983 AC_MSG_RESULT($PRNGD_SOCKET)
984 else
985 AC_MSG_RESULT(not found)
986 fi
987 fi
959 ] 988 ]
960) 989)
961 990
@@ -1086,6 +1115,19 @@ if test -z "$have_int64_t" ; then
1086 ) 1115 )
1087fi 1116fi
1088 1117
1118if test -z "$have_int64_t" ; then
1119 AC_MSG_CHECKING([for int64_t type in sys/bitypes.h])
1120 AC_TRY_COMPILE(
1121 [ #include <sys/bitypes.h> ],
1122 [ int64_t a; a = 1],
1123 [
1124 AC_DEFINE(HAVE_INT64_T)
1125 AC_MSG_RESULT(yes)
1126 ],
1127 [ AC_MSG_RESULT(no) ]
1128 )
1129fi
1130
1089AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [ 1131AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
1090 AC_TRY_COMPILE( 1132 AC_TRY_COMPILE(
1091 [ #include <sys/types.h> ], 1133 [ #include <sys/types.h> ],
@@ -1125,6 +1167,19 @@ if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
1125 have_u_int64_t=1 1167 have_u_int64_t=1
1126fi 1168fi
1127 1169
1170if test -z "$have_u_int64_t" ; then
1171 AC_MSG_CHECKING([for u_int64_t type in sys/bitypes.h])
1172 AC_TRY_COMPILE(
1173 [ #include <sys/bitypes.h> ],
1174 [ u_int64_t a; a = 1],
1175 [
1176 AC_DEFINE(HAVE_U_INT64_T)
1177 AC_MSG_RESULT(yes)
1178 ],
1179 [ AC_MSG_RESULT(no) ]
1180 )
1181fi
1182
1128if test -z "$have_u_intxx_t" ; then 1183if test -z "$have_u_intxx_t" ; then
1129 AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ 1184 AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
1130 AC_TRY_COMPILE( 1185 AC_TRY_COMPILE(
@@ -1193,6 +1248,8 @@ fi
1193 1248
1194TYPE_SOCKLEN_T 1249TYPE_SOCKLEN_T
1195 1250
1251AC_CHECK_TYPES(sig_atomic_t)
1252
1196AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [ 1253AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [
1197 AC_TRY_COMPILE( 1254 AC_TRY_COMPILE(
1198 [ 1255 [
@@ -2191,6 +2248,11 @@ if test ! -z "$blibpath" ; then
2191 AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) 2248 AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile])
2192fi 2249fi
2193 2250
2251dnl remove pam and dl because they are in $LIBPAM
2252if test "$PAM_MSG" = yes ; then
2253 LIBS=`echo $LIBS | sed 's/-lpam -ldl //'`
2254fi
2255
2194AC_EXEEXT 2256AC_EXEEXT
2195AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds]) 2257AC_CONFIG_FILES([Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds])
2196AC_OUTPUT 2258AC_OUTPUT
@@ -2240,7 +2302,7 @@ echo " Compiler: ${CC}"
2240echo " Compiler flags: ${CFLAGS}" 2302echo " Compiler flags: ${CFLAGS}"
2241echo "Preprocessor flags: ${CPPFLAGS}" 2303echo "Preprocessor flags: ${CPPFLAGS}"
2242echo " Linker flags: ${LDFLAGS}" 2304echo " Linker flags: ${LDFLAGS}"
2243echo " Libraries: ${LIBS}" 2305echo " Libraries: ${LIBWRAP} ${LIBPAM} ${LIBS}"
2244 2306
2245echo "" 2307echo ""
2246 2308
diff --git a/defines.h b/defines.h
index b5d254b31..77ca2281b 100644
--- a/defines.h
+++ b/defines.h
@@ -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.79 2002/02/13 18:14:53 tim Exp $ */ 4/* $Id: defines.h,v 1.80 2002/02/26 16:40:49 tim Exp $ */
5 5
6/* Necessary headers */ 6/* Necessary headers */
7 7
@@ -11,9 +11,6 @@
11#include <netinet/in_systm.h> /* For typedefs */ 11#include <netinet/in_systm.h> /* For typedefs */
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_RPC_RPC_H
15# include <rpc/rpc.h> /* For INADDR_LOOPBACK on SCO OSR3 */
16#endif
17#ifdef HAVE_SYS_UN_H 14#ifdef HAVE_SYS_UN_H
18# include <sys/un.h> /* For sockaddr_un */ 15# include <sys/un.h> /* For sockaddr_un */
19#endif 16#endif
@@ -144,6 +141,14 @@ enum
144# define NFDBITS (8 * sizeof(unsigned long)) 141# define NFDBITS (8 * sizeof(unsigned long))
145#endif 142#endif
146 143
144/*
145SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but
146including rpc/rpc.h breaks Solaris 6
147*/
148#ifndef INADDR_LOOPBACK
149#define INADDR_LOOPBACK ((ulong)0x7f000001)
150#endif
151
147/* Types */ 152/* Types */
148 153
149/* If sys/types.h does not supply intXX_t, supply them ourselves */ 154/* If sys/types.h does not supply intXX_t, supply them ourselves */
@@ -164,7 +169,11 @@ typedef char int8_t;
164typedef short int int16_t; 169typedef short int int16_t;
165# else 170# else
166# ifdef _CRAY 171# ifdef _CRAY
172# if (SIZEOF_SHORT_INT == 4)
173typedef short int16_t;
174# else
167typedef long int16_t; 175typedef long int16_t;
176# endif
168# else 177# else
169# error "16 bit int type not found." 178# error "16 bit int type not found."
170# endif /* _CRAY */ 179# endif /* _CRAY */
@@ -197,7 +206,11 @@ typedef unsigned char u_int8_t;
197typedef unsigned short int u_int16_t; 206typedef unsigned short int u_int16_t;
198# else 207# else
199# ifdef _CRAY 208# ifdef _CRAY
209# if (SIZEOF_SHORT_INT == 4)
210typedef unsigned short u_int16_t;
211# else
200typedef unsigned long u_int16_t; 212typedef unsigned long u_int16_t;
213# endif
201# else 214# else
202# error "16 bit int type not found." 215# error "16 bit int type not found."
203# endif 216# endif
@@ -272,6 +285,11 @@ typedef int pid_t;
272# define HAVE_PID_T 285# define HAVE_PID_T
273#endif /* HAVE_PID_T */ 286#endif /* HAVE_PID_T */
274 287
288#ifndef HAVE_SIG_ATOMIC_T
289typedef int sig_atomic_t;
290# define HAVE_SIG_ATOMIC_T
291#endif /* HAVE_SIG_ATOMIC_T */
292
275#ifndef HAVE_MODE_T 293#ifndef HAVE_MODE_T
276typedef int mode_t; 294typedef int mode_t;
277# define HAVE_MODE_T 295# define HAVE_MODE_T