merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 456 insertions, 84 deletions

diff --git a/configure b/configure
index 5e473371d..c4d1ed0d2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.496 .
+# From configure.ac Revision: 1.518 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for OpenSSH Portable.
 #
@@ -614,6 +614,8 @@ XAUTH_PATH
 STRIP_OPT
 xauth_path
 PRIVSEP_PATH
+K5LIBS
+GSSLIBS
 KRB5CONF
 SSHDLIBS
 SSHLIBS
@@ -5587,60 +5589,6 @@ if test "x$ac_cv_have_decl_PR_SET_NO_NEW_PRIVS" = xyes; then :
   have_linux_no_new_privs=1
 fi
 
-if test "x$have_linux_no_new_privs" = "x1" ; then
-ac_fn_c_check_decl "$LINENO" "SECCOMP_MODE_FILTER" "ac_cv_have_decl_SECCOMP_MODE_FILTER" "
-        #include <sys/types.h>
-        #include <linux/seccomp.h>
-
-"
-if test "x$ac_cv_have_decl_SECCOMP_MODE_FILTER" = xyes; then :
-  have_seccomp_filter=1
-fi
-
-fi
-if test "x$have_seccomp_filter" = "x1" ; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for seccomp_filter support" >&5
-$as_echo_n "checking kernel for seccomp_filter support... " >&6; }
-if test "$cross_compiling" = yes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: cross-compiling, assuming yes" >&5
-$as_echo "cross-compiling, assuming yes" >&6; }
-
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-                #include <errno.h>
-                #include <linux/seccomp.h>
-                #include <stdlib.h>
-                #include <sys/prctl.h>
-
-int
-main ()
-{
- errno = 0;
-           prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL, 0, 0);
-           exit(errno == EFAULT ? 0 : 1);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-
-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-                # Disable seccomp filter as a target
-                have_seccomp_filter=0
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-
 use_stack_protector=1
 
 # Check whether --with-stackprotect was given.
@@ -5996,6 +5944,34 @@ fi
         fi
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler allows __attribute__ on return types" >&5
+$as_echo_n "checking if compiler allows __attribute__ on return types... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+__attribute__((__unused__)) static void foo(void){return;}
+int
+main ()
+{
+ exit(0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define NO_ATTRIBUTE_ON_RETURN_TYPE 1" >>confdefs.h
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 if test "x$no_attrib_nonnull" != "x1" ; then
 
 $as_echo "#define HAVE_ATTRIBUTE__NONNULL__ 1" >>confdefs.h
@@ -6087,6 +6063,7 @@ for ac_header in  \
         crypto/sha2.h \
         dirent.h \
         endian.h \
+        elf.h \
         features.h \
         fcntl.h \
         floatingpoint.h \
@@ -6513,6 +6490,9 @@ $as_echo "#define SSHPAM_CHAUTHTOK_NEEDS_RUID 1" >>confdefs.h
 
 $as_echo "#define PTY_ZEROREAD 1" >>confdefs.h
 
+
+$as_echo "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h
+
         ;;
 *-*-cygwin*)
         check_for_libcrypt_later=1
@@ -6777,6 +6757,9 @@ $as_echo "#define LOCKED_PASSWD_STRING \"*\"" >>confdefs.h
 
         $as_echo "#define SPT_TYPE SPT_PSTAT" >>confdefs.h
 
+
+$as_echo "#define PLATFORM_SYS_DIR_UID 2" >>confdefs.h
+
         maildir="/var/mail"
         LIBS="$LIBS -lsec"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for t_error in -lxnet" >&5
@@ -7006,22 +6989,32 @@ _ACEOF
 fi
 done
 
-        have_seccomp_audit_arch=1
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seccomp architecture" >&5
+$as_echo_n "checking for seccomp architecture... " >&6; }
+        seccomp_audit_arch=
         case "$host" in
         x86_64-*)
-
-$as_echo "#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64" >>confdefs.h
-
+                seccomp_audit_arch=AUDIT_ARCH_X86_64
                 ;;
         i*86-*)
-
-$as_echo "#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386" >>confdefs.h
-
-                ;;
-        *)
-                have_seccomp_audit_arch=0
+                seccomp_audit_arch=AUDIT_ARCH_I386
                 ;;
+        arm*-*)
+                seccomp_audit_arch=AUDIT_ARCH_ARM
+                ;;
         esac
+        if test "x$seccomp_audit_arch" != "x" ; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$seccomp_audit_arch\"" >&5
+$as_echo "\"$seccomp_audit_arch\"" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SECCOMP_AUDIT_ARCH $seccomp_audit_arch
+_ACEOF
+
+        else
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: architecture not supported" >&5
+$as_echo "architecture not supported" >&6; }
+        fi
         ;;
 mips-sony-bsd|mips-sony-newsos4)
 
@@ -7072,6 +7065,9 @@ fi
 
 $as_echo "#define BROKEN_GLOB 1" >>confdefs.h
 
+
+$as_echo "#define BROKEN_STRNVIS 1" >>confdefs.h
+
         ;;
 *-*-bsdi*)
         $as_echo "#define SETEUID_BREAKS_SETUID 1" >>confdefs.h
@@ -7556,6 +7552,7 @@ done
 
         MANTYPE=man
         TEST_SHELL=ksh
+        SKIP_DISABLE_LASTLOG_DEFINE=yes
         ;;
 *-*-unicosmk*)
 
@@ -8387,12 +8384,13 @@ fi
 done
 
 
-for ac_header in libutil.h
+for ac_header in bsd/libutil.h libutil.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_libutil_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTIL_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -9582,6 +9580,8 @@ for ac_func in  \
         getopt \
         getpeereid \
         getpeerucred \
+        getpgid \
+        getpgrp \
         _getpty \
         getrlimit \
         getttyent \
@@ -9641,6 +9641,7 @@ for ac_func in  \
         strtonum \
         strtoll \
         strtoul \
+        strtoull \
         swap32 \
         sysconf \
         tcgetpgrp \
@@ -9649,6 +9650,7 @@ for ac_func in  \
         unsetenv \
         updwtmpx \
         user_from_uid \
+        usleep \
         vasprintf \
         vhangup \
         vsnprintf \
@@ -11256,6 +11258,147 @@ fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
+# Check for OpenSSL with EVP_aes_*ctr
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has AES CTR via EVP" >&5
+$as_echo_n "checking whether OpenSSL has AES CTR via EVP... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.h>
+#include <openssl/evp.h>
+
+int
+main ()
+{
+
+        exit(EVP_aes_128_ctr() == NULL ||
+            EVP_aes_192_cbc() == NULL ||
+            EVP_aes_256_cbc() == NULL);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define OPENSSL_HAVE_EVPCTR 1" >>confdefs.h
+
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+# Check for OpenSSL with EVP_aes_*gcm
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OpenSSL has AES GCM via EVP" >&5
+$as_echo_n "checking whether OpenSSL has AES GCM via EVP... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.h>
+#include <openssl/evp.h>
+
+int
+main ()
+{
+
+        exit(EVP_aes_128_gcm() == NULL ||
+            EVP_aes_256_gcm() == NULL ||
+            EVP_CTRL_GCM_SET_IV_FIXED == 0 ||
+            EVP_CTRL_GCM_IV_GEN == 0 ||
+            EVP_CTRL_GCM_SET_TAG == 0 ||
+            EVP_CTRL_GCM_GET_TAG == 0 ||
+            EVP_CIPHER_CTX_ctrl(NULL, 0, 0, NULL) == 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define OPENSSL_HAVE_EVPGCM 1" >>confdefs.h
+
+
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing EVP_CIPHER_CTX_ctrl" >&5
+$as_echo_n "checking for library containing EVP_CIPHER_CTX_ctrl... " >&6; }
+if ${ac_cv_search_EVP_CIPHER_CTX_ctrl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char EVP_CIPHER_CTX_ctrl ();
+int
+main ()
+{
+return EVP_CIPHER_CTX_ctrl ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' crypto; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_EVP_CIPHER_CTX_ctrl=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_EVP_CIPHER_CTX_ctrl+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_EVP_CIPHER_CTX_ctrl+:} false; then :
+
+else
+  ac_cv_search_EVP_CIPHER_CTX_ctrl=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_EVP_CIPHER_CTX_ctrl" >&5
+$as_echo "$ac_cv_search_EVP_CIPHER_CTX_ctrl" >&6; }
+ac_res=$ac_cv_search_EVP_CIPHER_CTX_ctrl
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+$as_echo "#define HAVE_EVP_CIPHER_CTX_CTRL 1" >>confdefs.h
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if EVP_DigestUpdate returns an int" >&5
 $as_echo_n "checking if EVP_DigestUpdate returns an int... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11885,6 +12028,57 @@ _ACEOF
 
 
 
+if test "x$have_linux_no_new_privs" = "x1" ; then
+ac_fn_c_check_decl "$LINENO" "SECCOMP_MODE_FILTER" "ac_cv_have_decl_SECCOMP_MODE_FILTER" "
+        #include <sys/types.h>
+        #include <linux/seccomp.h>
+
+"
+if test "x$ac_cv_have_decl_SECCOMP_MODE_FILTER" = xyes; then :
+  have_seccomp_filter=1
+fi
+
+fi
+if test "x$have_seccomp_filter" = "x1" ; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel for seccomp_filter support" >&5
+$as_echo_n "checking kernel for seccomp_filter support... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+                #include <errno.h>
+                #include <elf.h>
+                #include <linux/audit.h>
+                #include <linux/seccomp.h>
+                #include <stdlib.h>
+                #include <sys/prctl.h>
+
+int
+main ()
+{
+ int i = $seccomp_audit_arch;
+           errno = 0;
+           prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL, 0, 0);
+           exit(errno == EFAULT ? 0 : 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                # Disable seccomp filter as a target
+                have_seccomp_filter=0
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
 # Decide which sandbox style to use
 sandbox_arg=""
 
@@ -11933,6 +12127,7 @@ main ()
         struct rlimit rl_zero;
         int fd, r;
         fd_set fds;
+        struct timeval tv;
 
         fd = open("/dev/null", O_RDONLY);
         FD_ZERO(&fds);
@@ -11940,7 +12135,9 @@ main ()
         rl_zero.rlim_cur = rl_zero.rlim_max = 0;
         setrlimit(RLIMIT_FSIZE, &rl_zero);
         setrlimit(RLIMIT_NOFILE, &rl_zero);
-        r = select(fd+1, &fds, NULL, NULL, NULL);
+        tv.tv_sec = 1;
+        tv.tv_usec = 0;
+        r = select(fd+1, &fds, NULL, NULL, &tv);
         exit (r == -1 ? 1 : 0);
 
   ;
@@ -11961,6 +12158,54 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if setrlimit(RLIMIT_NOFILE,{0,0}) works" >&5
+$as_echo_n "checking if setrlimit(RLIMIT_NOFILE,{0,0}) works... " >&6; }
+if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross compiling: assuming yes" >&5
+$as_echo "$as_me: WARNING: cross compiling: assuming yes" >&2;}
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <sys/resource.h>
+#include <errno.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+
+        struct rlimit rl_zero;
+        int fd, r;
+        fd_set fds;
+
+        rl_zero.rlim_cur = rl_zero.rlim_max = 0;
+        r = setrlimit(RLIMIT_NOFILE, &rl_zero);
+        exit (r == -1 ? 1 : 0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+         rlimit_nofile_zero_works=yes
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+         rlimit_nofile_zero_works=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if setrlimit RLIMIT_FSIZE works" >&5
 $as_echo_n "checking if setrlimit RLIMIT_FSIZE works... " >&6; }
 if test "$cross_compiling" = yes; then :
@@ -12024,11 +12269,13 @@ $as_echo "#define SANDBOX_DARWIN 1" >>confdefs.h
 elif test "x$sandbox_arg" = "xseccomp_filter" || \
      ( test -z "$sandbox_arg" && \
        test "x$have_seccomp_filter" = "x1" && \
+       test "x$ac_cv_header_elf_h" = "xyes" && \
        test "x$ac_cv_header_linux_audit_h" = "xyes" && \
-       test "x$have_seccomp_audit_arch" = "x1" && \
+       test "x$ac_cv_header_linux_filter_h" = "xyes" && \
+       test "x$seccomp_audit_arch" != "x" && \
        test "x$have_linux_no_new_privs" = "x1" && \
        test "x$ac_cv_func_prctl" = "xyes" ) ; then
-        test "x$have_seccomp_audit_arch" != "x1" && \
+        test "x$seccomp_audit_arch" = "x" && \
                 as_fn_error $? "seccomp_filter sandbox not supported on $host" "$LINENO" 5
         test "x$have_linux_no_new_privs" != "x1" && \
                 as_fn_error $? "seccomp_filter sandbox requires PR_SET_NO_NEW_PRIVS" "$LINENO" 5
@@ -12042,7 +12289,8 @@ $as_echo "#define SANDBOX_SECCOMP_FILTER 1" >>confdefs.h
 
 elif test "x$sandbox_arg" = "xrlimit" || \
      ( test -z "$sandbox_arg" && test "x$ac_cv_func_setrlimit" = "xyes" && \
-       test "x$select_works_with_rlimit" == "xyes" ) ; then
+       test "x$select_works_with_rlimit" = "xyes" && \
+       test "x$rlimit_nofile_zero_works" = "xyes" ) ; then
         test "x$ac_cv_func_setrlimit" != "xyes" && \
                 as_fn_error $? "rlimit sandbox requires setrlimit function" "$LINENO" 5
         test "x$select_works_with_rlimit" != "xyes" && \
@@ -15227,6 +15475,9 @@ fi
 
 
                 if test -x $KRB5CONF ; then
+                        K5CFLAGS="`$KRB5CONF --cflags`"
+                        K5LIBS="`$KRB5CONF --libs`"
+                        CPPFLAGS="$CPPFLAGS $K5CFLAGS"
 
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gssapi support" >&5
 $as_echo_n "checking for gssapi support... " >&6; }
@@ -15236,15 +15487,13 @@ $as_echo "yes" >&6; }
 
 $as_echo "#define GSSAPI 1" >>confdefs.h
 
-                                k5confopts=gssapi
+                                GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
+                                GSSLIBS="`$KRB5CONF --libs gssapi`"
+                                CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
                         else
                                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                                k5confopts=""
                         fi
-                        K5CFLAGS="`$KRB5CONF --cflags $k5confopts`"
-                        K5LIBS="`$KRB5CONF --libs $k5confopts`"
-                        CPPFLAGS="$CPPFLAGS $K5CFLAGS"
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Heimdal" >&5
 $as_echo_n "checking whether we are using Heimdal... " >&6; }
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15447,7 +15696,7 @@ if ${ac_cv_lib_gssapi_krb5_gss_init_sec_context+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
+LIBS="-lgssapi_krb5  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15480,7 +15729,7 @@ $as_echo "$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; }
 if test "x$ac_cv_lib_gssapi_krb5_gss_init_sec_context" = xyes; then :
    $as_echo "#define GSSAPI 1" >>confdefs.h
 
-                                  K5LIBS="-lgssapi_krb5 $K5LIBS"
+                                  GSSLIBS="-lgssapi_krb5"
 else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgssapi" >&5
 $as_echo_n "checking for gss_init_sec_context in -lgssapi... " >&6; }
@@ -15488,7 +15737,7 @@ if ${ac_cv_lib_gssapi_gss_init_sec_context+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi $K5LIBS $LIBS"
+LIBS="-lgssapi  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15521,7 +15770,48 @@ $as_echo "$ac_cv_lib_gssapi_gss_init_sec_context" >&6; }
 if test "x$ac_cv_lib_gssapi_gss_init_sec_context" = xyes; then :
    $as_echo "#define GSSAPI 1" >>confdefs.h
 
-                                          K5LIBS="-lgssapi $K5LIBS"
+                                          GSSLIBS="-lgssapi"
+else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_init_sec_context in -lgss" >&5
+$as_echo_n "checking for gss_init_sec_context in -lgss... " >&6; }
+if ${ac_cv_lib_gss_gss_init_sec_context+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgss  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gss_init_sec_context ();
+int
+main ()
+{
+return gss_init_sec_context ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gss_gss_init_sec_context=yes
+else
+  ac_cv_lib_gss_gss_init_sec_context=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gss_gss_init_sec_context" >&5
+$as_echo "$ac_cv_lib_gss_gss_init_sec_context" >&6; }
+if test "x$ac_cv_lib_gss_gss_init_sec_context" = xyes; then :
+   $as_echo "#define GSSAPI 1" >>confdefs.h
+
+                                                  GSSLIBS="-lgss"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find any suitable gss-api library - build may fail" >&5
 $as_echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;}
@@ -15531,6 +15821,9 @@ fi
 fi
 
 
+fi
+
+
                         ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
 if test "x$ac_cv_header_gssapi_h" = xyes; then :
 
@@ -15618,7 +15911,6 @@ fi
 done
 
 
-                LIBS="$LIBS $K5LIBS"
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing k_hasafs" >&5
 $as_echo_n "checking for library containing k_hasafs... " >&6; }
 if ${ac_cv_search_k_hasafs+:} false; then :
@@ -15677,12 +15969,39 @@ $as_echo "#define USE_AFS 1" >>confdefs.h
 
 fi
 
+
+                ac_fn_c_check_decl "$LINENO" "GSS_C_NT_HOSTBASED_SERVICE" "ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" "
+#ifdef HAVE_GSSAPI_H
+# include <gssapi.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
+# include <gssapi/gssapi.h>
+#endif
+
+#ifdef HAVE_GSSAPI_GENERIC_H
+# include <gssapi_generic.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
+# include <gssapi/gssapi_generic.h>
+#endif
+
+"
+if test "x$ac_cv_have_decl_GSS_C_NT_HOSTBASED_SERVICE" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE $ac_have_decl
+_ACEOF
+
         fi
 
 
 fi
 
 
+
+
 # Looking for programs, paths and files
 
 PRIVSEP_PATH=/var/empty
@@ -16737,7 +17056,6 @@ _ACEOF
 
 fi
 
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system defines WTMPX_FILE" >&5
 $as_echo_n "checking if your system defines WTMPX_FILE... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16790,6 +17108,60 @@ if test ! -z "$blibpath" ; then
 $as_echo "$as_me: WARNING: Please check and edit blibpath in LDFLAGS in Makefile" >&2;}
 fi
 
+ac_fn_c_check_member "$LINENO" "struct lastlog" "ll_line" "ac_cv_member_struct_lastlog_ll_line" "
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_LASTLOG_H
+#include <lastlog.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_lastlog_ll_line" = xyes; then :
+
+else
+
+    if test x$SKIP_DISABLE_LASTLOG_DEFINE != "xyes" ; then
+        $as_echo "#define DISABLE_LASTLOG 1" >>confdefs.h
+
+    fi
+
+fi
+
+
+ac_fn_c_check_member "$LINENO" "struct utmp" "ut_line" "ac_cv_member_struct_utmp_ut_line" "
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_UTMP_H
+#include <utmp.h>
+#endif
+#ifdef HAVE_UTMPX_H
+#include <utmpx.h>
+#endif
+#ifdef HAVE_LASTLOG_H
+#include <lastlog.h>
+#endif
+
+"
+if test "x$ac_cv_member_struct_utmp_ut_line" = xyes; then :
+
+else
+
+        $as_echo "#define DISABLE_UTMP 1" >>confdefs.h
+
+        $as_echo "#define DISABLE_WTMP 1" >>confdefs.h
+
+
+fi
+
+
 CFLAGS="$CFLAGS $werror_flags"
 
 if test "x$ac_cv_func_getaddrinfo" != "xyes" ; then