Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 55 insertions, 7 deletions

diff --git a/config.h.in b/config.h.in
index 41495c4fb..32622dc5f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /* config.h.in.  Generated automatically from configure.ac by autoheader.  */
-/* $Id: acconfig.h,v 1.166 2003/09/16 01:52:19 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.173 2004/02/06 05:24:31 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -42,6 +42,12 @@
 /* Define if your setregid() is broken */
 #undef BROKEN_SETREGID
 
+/* Define if your setresuid() is broken */
+#undef BROKEN_SETRESUID
+
+/* Define if your setresgid() is broken */
+#undef BROKEN_SETRESGID
+
 /* Define to a Set Process Title type if your system is */
 /* supported by bsd-setproctitle.c */
 #undef SPT_TYPE
@@ -60,6 +66,9 @@
 /* from environment and PATH */
 #undef LOGIN_PROGRAM_FALLBACK
 
+/* Full path of your "passwd" program */
+#undef _PATH_PASSWD_PROG
+
 /* Define if your password has a pw_class field */
 #undef HAVE_PW_CLASS_IN_PASSWD
 
@@ -90,6 +99,9 @@
 /* Define if you have the getuserattr function.  */
 #undef HAVE_GETUSERATTR
 
+/* Define if you have the basename function. */
+#undef HAVE_BASENAME
+
 /* Work around problematic Linux PAM modules handling of PAM_TTY */
 #undef PAM_TTY_KLUDGE
 
@@ -248,6 +260,9 @@
 /* Define this if you are using the Heimdal version of Kerberos V5 */
 #undef HEIMDAL
 
+/* Define this if you want to use libkafs' AFS support */
+#undef USE_AFS
+
 /* Define if you want S/Key support */
 #undef SKEY
 
@@ -416,15 +431,15 @@
 #undef LOCKED_PASSWD_PREFIX
 #undef LOCKED_PASSWD_SUBSTR
 
-/* Define if DNS support is to be activated */
-#undef DNS
-
 /* Define if getrrsetbyname() exists */
 #undef HAVE_GETRRSETBYNAME
 
 /* Define if HEADER.ad exists in arpa/nameser.h */
 #undef HAVE_HEADER_AD
 
+/* Define if your resolver libs need this for getrrsetbyname */
+#undef BIND_8_COMPAT
+
 
 /* Define if the `getpgrp' function takes no argument. */
 #undef GETPGRP_VOID
@@ -438,9 +453,6 @@
 /* Define if you have the `b64_pton' function. */
 #undef HAVE_B64_PTON
 
-/* Define if you have the `basename' function. */
-#undef HAVE_BASENAME
-
 /* Define if you have the `bcopy' function. */
 #undef HAVE_BCOPY
 
@@ -453,6 +465,9 @@
 /* Define if you have the `clock' function. */
 #undef HAVE_CLOCK
 
+/* Define if gai_strerror() returns const char * */
+#undef HAVE_CONST_GAI_STRERROR_PROTO
+
 /* Define if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
@@ -552,9 +567,24 @@
 /* Define if you have the <glob.h> header file. */
 #undef HAVE_GLOB_H
 
+/* Define if you have the <gssapi_generic.h> header file. */
+#undef HAVE_GSSAPI_GENERIC_H
+
+/* Define if you have the <gssapi/gssapi_generic.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_GENERIC_H
+
+/* Define if you have the <gssapi/gssapi.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_H
+
+/* Define if you have the <gssapi/gssapi_krb5.h> header file. */
+#undef HAVE_GSSAPI_GSSAPI_KRB5_H
+
 /* Define if you have the <gssapi.h> header file. */
 #undef HAVE_GSSAPI_H
 
+/* Define if you have the <gssapi_krb5.h> header file. */
+#undef HAVE_GSSAPI_KRB5_H
+
 /* Define if you have the <ia.h> header file. */
 #undef HAVE_IA_H
 
@@ -669,6 +699,9 @@
 /* Define if you have the `pam_getenvlist' function. */
 #undef HAVE_PAM_GETENVLIST
 
+/* Define if you have the <pam/pam_appl.h> header file. */
+#undef HAVE_PAM_PAM_APPL_H
+
 /* Define if you have the `pam_putenv' function. */
 #undef HAVE_PAM_PUTENV
 
@@ -825,6 +858,9 @@
 /* Define if you have the `strsep' function. */
 #undef HAVE_STRSEP
 
+/* Define if you have the `strtoul' function. */
+#undef HAVE_STRTOUL
+
 /* Define if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
@@ -852,12 +888,18 @@
 /* Define if you have the <sys/pstat.h> header file. */
 #undef HAVE_SYS_PSTAT_H
 
+/* Define if you have the <sys/ptms.h> header file. */
+#undef HAVE_SYS_PTMS_H
+
 /* Define if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
 /* Define if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define if you have the <sys/stream.h> header file. */
+#undef HAVE_SYS_STREAM_H
+
 /* Define if you have the <sys/stropts.h> header file. */
 #undef HAVE_SYS_STROPTS_H
 
@@ -906,6 +948,9 @@
 /* Define if you have the `updwtmp' function. */
 #undef HAVE_UPDWTMP
 
+/* Define if you have the `updwtmpx' function. */
+#undef HAVE_UPDWTMPX
+
 /* Define if you have the <usersec.h> header file. */
 #undef HAVE_USERSEC_H
 
@@ -933,6 +978,9 @@
 /* Define if you have the `vhangup' function. */
 #undef HAVE_VHANGUP
 
+/* Define if you have the <vis.h> header file. */
+#undef HAVE_VIS_H
+
 /* Define if you have the `vsnprintf' function. */
 #undef HAVE_VSNPRINTF