Import openssh_7.3p1.orig.tar.gz

1 files changed, 124 insertions, 68 deletions

diff --git a/configure.ac b/configure.ac
index 7258cc0e5..373d21b34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -373,6 +373,7 @@ AC_CHECK_HEADERS([ \
         dirent.h \
         endian.h \
         elf.h \
+        err.h \
         features.h \
         fcntl.h \
         floatingpoint.h \
@@ -381,6 +382,7 @@ AC_CHECK_HEADERS([ \
         ia.h \
         iaf.h \
         inttypes.h \
+        langinfo.h \
         limits.h \
         locale.h \
         login.h \
@@ -433,6 +435,7 @@ AC_CHECK_HEADERS([ \
         utmp.h \
         utmpx.h \
         vis.h \
+        wchar.h \
 ])
 
 # lastlog.h requires sys/time.h to be included first on Solaris
@@ -586,9 +589,6 @@ case "$host" in
                 [Define if you want to disable shadow passwords])
         AC_DEFINE([NO_X11_UNIX_SOCKETS], [1],
                 [Define if X11 doesn't support AF_UNIX sockets on that system])
-        AC_DEFINE([NO_IPPORT_RESERVED_CONCEPT], [1],
-                [Define if the concept of ports only accessible to
-                superusers isn't known])
         AC_DEFINE([DISABLE_FD_PASSING], [1],
                 [Define if your platform needs to skip post auth
                 file descriptor passing])
@@ -633,7 +633,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
             [Prepend the address family to IP tunnel traffic])
         m4_pattern_allow([AU_IPv])
-        AC_CHECK_DECL([AU_IPv4], [], 
+        AC_CHECK_DECL([AU_IPv4], [],
             AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
             [#include <bsm/audit.h>]
         AC_DEFINE([LASTLOG_WRITE_PUTUTXLINE], [1],
@@ -652,12 +652,12 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         SSHDLIBS="$SSHDLIBS -lcrypt"
         TEST_MALLOC_OPTIONS="AFGJPRX"
         ;;
-*-*-haiku*) 
+*-*-haiku*)
     LIBS="$LIBS -lbsd "
     AC_CHECK_LIB([network], [socket])
     AC_DEFINE([HAVE_U_INT64_T])
-    MANTYPE=man 
-    ;; 
+    MANTYPE=man
+    ;;
 *-*-hpux*)
         # first we define all of the options common to all HP-UX releases
         CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
@@ -797,6 +797,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
         aarch64*-*)
                 seccomp_audit_arch=AUDIT_ARCH_AARCH64
                 ;;
+        s390x-*)
+                seccomp_audit_arch=AUDIT_ARCH_S390X
+                ;;
+        s390-*)
+                seccomp_audit_arch=AUDIT_ARCH_S390
+                ;;
+        powerpc64-*)
+                seccomp_audit_arch=AUDIT_ARCH_PPC64
+                ;;
+        powerpc64le-*)
+                seccomp_audit_arch=AUDIT_ARCH_PPC64LE
+                ;;
+        mips-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPS
+                ;;
+        mipsel-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPSEL
+                ;;
+        mips64-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPS64
+                ;;
+        mips64el-*)
+                seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
+                ;;
         esac
         if test "x$seccomp_audit_arch" != "x" ; then
                 AC_MSG_RESULT(["$seccomp_audit_arch"])
@@ -815,6 +839,7 @@ mips-sony-bsd|mips-sony-newsos4)
         if test "x$withval" != "xno" ; then
                 need_dash_r=1
         fi
+        CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
         AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
         AC_CHECK_HEADER([net/if_tap.h], ,
             AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
@@ -899,6 +924,7 @@ mips-sony-bsd|mips-sony-newsos4)
         else
                 AC_MSG_RESULT([no])
         fi
+        AC_CHECK_FUNCS([setpflags])
         AC_CHECK_FUNCS([setppriv])
         AC_CHECK_FUNCS([priv_basicset])
         AC_CHECK_HEADERS([priv.h])
@@ -1378,6 +1404,9 @@ g.gl_statv = NULL;
 
 AC_CHECK_DECLS([GLOB_NOMATCH], , , [#include <glob.h>])
 
+AC_CHECK_DECL([VIS_ALL], ,
+    AC_DEFINE(BROKEN_STRNVIS, 1, [missing VIS_ALL]), [#include <vis.h>])
+
 AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
 AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([[
@@ -1438,7 +1467,7 @@ AC_ARG_WITH([skey],
                                         AC_MSG_RESULT([no])
                                         AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
                                 ])
-                        AC_MSG_CHECKING([if skeychallenge takes 4 arguments])
+                        AC_MSG_CHECKING([if skeychallenge takes 4 arguments])
                         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <stdio.h>
 #include <skey.h>
@@ -1501,7 +1530,7 @@ AC_ARG_WITH([libedit],
                         AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
                         if test "x$PKGCONFIG" != "xno"; then
                                 AC_MSG_CHECKING([if $PKGCONFIG knows about libedit])
-                                if "$PKGCONFIG" libedit; then
+                                if "$PKGCONFIG" libedit; then
                                         AC_MSG_RESULT([yes])
                                         use_pkgconfig_for_libedit=yes
                                 else
@@ -1572,9 +1601,9 @@ AC_ARG_WITH([audit],
                 AC_CHECK_FUNCS([getaudit_addr aug_get_machine])
                 AC_DEFINE([USE_BSM_AUDIT], [1], [Use BSM audit module])
                 if test "$sol2ver" -ge 11; then
-                        SSHDLIBS="$SSHDLIBS -lscf"
-                        AC_DEFINE([BROKEN_BSM_API], [1], 
-                                  [The system has incomplete BSM API])
+                        SSHDLIBS="$SSHDLIBS -lscf"
+                        AC_DEFINE([BROKEN_BSM_API], [1],
+                                [The system has incomplete BSM API])
                 fi
                 ;;
           linux)
@@ -1666,6 +1695,8 @@ AC_CHECK_FUNCS([ \
         closefrom \
         dirfd \
         endgrent \
+        err \
+        errx \
         explicit_bzero \
         fchmod \
         fchown \
@@ -1692,7 +1723,6 @@ AC_CHECK_FUNCS([ \
         inet_ntop \
         innetgr \
         login_getcapbool \
-        mblen \
         md5_crypt \
         memmove \
         memset_s \
@@ -1757,8 +1787,15 @@ AC_CHECK_FUNCS([ \
         vasprintf \
         vsnprintf \
         waitpid \
+        warn \
 ])
 
+dnl Wide character support.  Linux man page says it needs _XOPEN_SOURCE.
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
+AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth])
+CFLAGS="$saved_CFLAGS"
+
 AC_LINK_IFELSE(
         [AC_LANG_PROGRAM(
            [[ #include <ctype.h> ]],
@@ -1766,8 +1803,18 @@ AC_LINK_IFELSE(
         [AC_DEFINE([HAVE_ISBLANK], [1], [Define if you have isblank(3C).])
 ])
 
+disable_pkcs11=
+AC_ARG_ENABLE([pkcs11],
+        [  --disable-pkcs11        disable PKCS#11 support code [no]],
+        [
+                if test "x$enableval" = "xno" ; then
+                        disable_pkcs11=1
+                fi
+        ]
+)
+
 # PKCS11 depends on OpenSSL.
-if test "x$openssl" = "xyes" ; then
+if test "x$openssl" = "xyes" && test "x$disable_pkcs11" = "x"; then
         # PKCS#11 support requires dlopen() and co
         AC_SEARCH_LIBS([dlopen], [dl],
             [AC_DEFINE([ENABLE_PKCS11], [], [Enable for PKCS#11 support])]
@@ -1982,7 +2029,7 @@ if test "x$ac_cv_func_snprintf" = "xyes" ; then
                 [[
         char b[5];
         snprintf(b,5,"123456789");
-        exit(b[4]!='\0'); 
+        exit(b[4]!='\0');
                 ]])],
                 [AC_MSG_RESULT([yes])],
                 [
@@ -2392,8 +2439,9 @@ if test "x$openssl" = "xyes" ; then
                 if(fd == NULL)
                         exit(1);
 
-                if ((rc = fprintf(fd ,"%08lx (%s)\n",
-                    (unsigned long)OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
+                if ((rc = fprintf(fd, "%08lx (%s)\n",
+                    (unsigned long)OPENSSL_VERSION_NUMBER,
+                     OPENSSL_VERSION_TEXT)) < 0)
                         exit(1);
 
                 exit(0);
@@ -2428,8 +2476,8 @@ if test "x$openssl" = "xyes" ; then
                 if(fd == NULL)
                         exit(1);
 
-                if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(),
-                    SSLeay_version(SSLEAY_VERSION))) <0)
+                if ((rc = fprintf(fd, "%08lx (%s)\n", (unsigned long)SSLeay(),
+                    SSLeay_version(SSLEAY_VERSION))) < 0)
                         exit(1);
 
                 exit(0);
@@ -2604,7 +2652,8 @@ if test "x$openssl" = "xyes" ; then
                 [
                         AC_MSG_RESULT([no])
                         unsupported_algorithms="$unsupported_cipers \
-                           aes128-gcm@openssh.com aes256-gcm@openssh.com"
+                           aes128-gcm@openssh.com \
+                           aes256-gcm@openssh.com"
                 ]
         )
 
@@ -2647,16 +2696,18 @@ if test "x$openssl" = "xyes" ; then
         # Search for SHA256 support in libc and/or OpenSSL
         AC_CHECK_FUNCS([SHA256_Update EVP_sha256], ,
             [unsupported_algorithms="$unsupported_algorithms \
-                hmac-sha2-256 hmac-sha2-512 \
+                hmac-sha2-256 \
+                hmac-sha2-512 \
                 diffie-hellman-group-exchange-sha256 \
-                hmac-sha2-256-etm@openssh.com hmac-sha2-512-etm@openssh.com"
+                hmac-sha2-256-etm@openssh.com \
+                hmac-sha2-512-etm@openssh.com"
              ]
         )
         # Search for RIPE-MD support in OpenSSL
         AC_CHECK_FUNCS([EVP_ripemd160], ,
             [unsupported_algorithms="$unsupported_algorithms \
-                hmac-ripemd160
-                hmac-ripemd160@openssh.com
+                hmac-ripemd160 \
+                hmac-ripemd160@openssh.com \
                 hmac-ripemd160-etm@openssh.com"
              ]
         )
@@ -2757,24 +2808,30 @@ if test "x$openssl" = "xyes" ; then
                 TEST_SSH_ECC=yes
                 COMMENT_OUT_ECC=""
         else
-                unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp256 \
-                    ecdh-sha2-nistp256 ecdsa-sha2-nistp256-cert-v01@openssh.com"
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdsa-sha2-nistp256 \
+                        ecdh-sha2-nistp256 \
+                        ecdsa-sha2-nistp256-cert-v01@openssh.com"
         fi
         if test x$enable_nistp384 = x1; then
                 AC_DEFINE([OPENSSL_HAS_NISTP384], [1], [libcrypto has NID_secp384r1])
                 TEST_SSH_ECC=yes
                 COMMENT_OUT_ECC=""
         else
-                unsupported_algorithms="$unsupported_algorithms ecdsa-sha2-nistp384 \
-                    ecdh-sha2-nistp384 ecdsa-sha2-nistp384-cert-v01@openssh.com"
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdsa-sha2-nistp384 \
+                        ecdh-sha2-nistp384 \
+                        ecdsa-sha2-nistp384-cert-v01@openssh.com"
         fi
         if test x$enable_nistp521 = x1; then
                 AC_DEFINE([OPENSSL_HAS_NISTP521], [1], [libcrypto has NID_secp521r1])
                 TEST_SSH_ECC=yes
                 COMMENT_OUT_ECC=""
         else
-                unsupported_algorithms="$unsupported_algorithms ecdh-sha2-nistp521 \
-                    ecdsa-sha2-nistp521 ecdsa-sha2-nistp521-cert-v01@openssh.com"
+                unsupported_algorithms="$unsupported_algorithms \
+                        ecdh-sha2-nistp521 \
+                        ecdsa-sha2-nistp521 \
+                        ecdsa-sha2-nistp521-cert-v01@openssh.com"
         fi
 
         AC_SUBST([TEST_SSH_ECC])
@@ -2796,7 +2853,7 @@ AC_CHECK_LIB([iaf], [ia_openinfo], [
         LIBS="$LIBS -liaf"
         AC_CHECK_FUNCS([set_id], [SSHDLIBS="$SSHDLIBS -liaf"
                                 AC_DEFINE([HAVE_LIBIAF], [1],
-                        [Define if system has libiaf that supports set_id])
+                        [Define if system has libiaf that supports set_id])
                                 ])
 ])
 LIBS="$saved_LIBS"
@@ -3322,7 +3379,7 @@ fi
 AC_CACHE_CHECK([for u_int type], ac_cv_have_u_int, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ u_int a; a = 1;]])],
-        [ ac_cv_have_u_int="yes" ], [ ac_cv_have_u_int="no" 
+        [ ac_cv_have_u_int="yes" ], [ ac_cv_have_u_int="no"
         ])
 ])
 if test "x$ac_cv_have_u_int" = "xyes" ; then
@@ -3333,7 +3390,7 @@ fi
 AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ int8_t a; int16_t b; int32_t c; a = b = c = 1;]])],
-        [ ac_cv_have_intxx_t="yes" ], [ ac_cv_have_intxx_t="no" 
+        [ ac_cv_have_intxx_t="yes" ], [ ac_cv_have_intxx_t="no"
         ])
 ])
 if test "x$ac_cv_have_intxx_t" = "xyes" ; then
@@ -3350,7 +3407,7 @@ then
                 [
                         AC_DEFINE([HAVE_INTXX_T])
                         AC_MSG_RESULT([yes])
-                ], [ AC_MSG_RESULT([no]) 
+                ], [ AC_MSG_RESULT([no])
         ])
 fi
 
@@ -3367,7 +3424,7 @@ AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
                 ]], [[
 int64_t a; a = 1;
                 ]])],
-        [ ac_cv_have_int64_t="yes" ], [ ac_cv_have_int64_t="no" 
+        [ ac_cv_have_int64_t="yes" ], [ ac_cv_have_int64_t="no"
         ])
 ])
 if test "x$ac_cv_have_int64_t" = "xyes" ; then
@@ -3377,7 +3434,7 @@ fi
 AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;]])],
-        [ ac_cv_have_u_intxx_t="yes" ], [ ac_cv_have_u_intxx_t="no" 
+        [ ac_cv_have_u_intxx_t="yes" ], [ ac_cv_have_u_intxx_t="no"
         ])
 ])
 if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
@@ -3392,14 +3449,14 @@ if test -z "$have_u_intxx_t" ; then
                 [
                         AC_DEFINE([HAVE_U_INTXX_T])
                         AC_MSG_RESULT([yes])
-                ], [ AC_MSG_RESULT([no]) 
+                ], [ AC_MSG_RESULT([no])
         ])
 fi
 
 AC_CACHE_CHECK([for u_int64_t types], ac_cv_have_u_int64_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ u_int64_t a; a = 1;]])],
-        [ ac_cv_have_u_int64_t="yes" ], [ ac_cv_have_u_int64_t="no" 
+        [ ac_cv_have_u_int64_t="yes" ], [ ac_cv_have_u_int64_t="no"
         ])
 ])
 if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
@@ -3416,7 +3473,7 @@ then
                 [
                         AC_DEFINE([HAVE_U_INT64_T])
                         AC_MSG_RESULT([yes])
-                ], [ AC_MSG_RESULT([no]) 
+                ], [ AC_MSG_RESULT([no])
         ])
 fi
 
@@ -3430,7 +3487,7 @@ if test -z "$have_u_intxx_t" ; then
         uint32_t c;
         a = b = c = 1;
                         ]])],
-                [ ac_cv_have_uintxx_t="yes" ], [ ac_cv_have_uintxx_t="no" 
+                [ ac_cv_have_uintxx_t="yes" ], [ ac_cv_have_uintxx_t="no"
                 ])
         ])
         if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
@@ -3448,7 +3505,7 @@ then
                 [
                         AC_DEFINE([HAVE_UINTXX_T])
                         AC_MSG_RESULT([yes])
-                ], [ AC_MSG_RESULT([no]) 
+                ], [ AC_MSG_RESULT([no])
         ])
 fi
 
@@ -3461,7 +3518,7 @@ then
                 [
                         AC_DEFINE([HAVE_UINTXX_T])
                         AC_MSG_RESULT([yes])
-                ], [ AC_MSG_RESULT([no]) 
+                ], [ AC_MSG_RESULT([no])
         ])
 fi
 
@@ -3488,7 +3545,7 @@ fi
 AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ u_char foo; foo = 125; ]])],
-        [ ac_cv_have_u_char="yes" ], [ ac_cv_have_u_char="no" 
+        [ ac_cv_have_u_char="yes" ], [ ac_cv_have_u_char="no"
         ])
 ])
 if test "x$ac_cv_have_u_char" = "xyes" ; then
@@ -3523,7 +3580,7 @@ AC_CHECK_TYPES([in_addr_t, in_port_t], , ,
 AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ size_t foo; foo = 1235; ]])],
-        [ ac_cv_have_size_t="yes" ], [ ac_cv_have_size_t="no" 
+        [ ac_cv_have_size_t="yes" ], [ ac_cv_have_size_t="no"
         ])
 ])
 if test "x$ac_cv_have_size_t" = "xyes" ; then
@@ -3533,7 +3590,7 @@ fi
 AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ ssize_t foo; foo = 1235; ]])],
-        [ ac_cv_have_ssize_t="yes" ], [ ac_cv_have_ssize_t="no" 
+        [ ac_cv_have_ssize_t="yes" ], [ ac_cv_have_ssize_t="no"
         ])
 ])
 if test "x$ac_cv_have_ssize_t" = "xyes" ; then
@@ -3543,7 +3600,7 @@ fi
 AC_CACHE_CHECK([for clock_t], ac_cv_have_clock_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <time.h> ]],
         [[ clock_t foo; foo = 1235; ]])],
-        [ ac_cv_have_clock_t="yes" ], [ ac_cv_have_clock_t="no" 
+        [ ac_cv_have_clock_t="yes" ], [ ac_cv_have_clock_t="no"
         ])
 ])
 if test "x$ac_cv_have_clock_t" = "xyes" ; then
@@ -3574,7 +3631,7 @@ fi
 AC_CACHE_CHECK([for pid_t], ac_cv_have_pid_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ pid_t foo; foo = 1235; ]])],
-        [ ac_cv_have_pid_t="yes" ], [ ac_cv_have_pid_t="no" 
+        [ ac_cv_have_pid_t="yes" ], [ ac_cv_have_pid_t="no"
         ])
 ])
 if test "x$ac_cv_have_pid_t" = "xyes" ; then
@@ -3584,7 +3641,7 @@ fi
 AC_CACHE_CHECK([for mode_t], ac_cv_have_mode_t, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]],
         [[ mode_t foo; foo = 1235; ]])],
-        [ ac_cv_have_mode_t="yes" ], [ ac_cv_have_mode_t="no" 
+        [ ac_cv_have_mode_t="yes" ], [ ac_cv_have_mode_t="no"
         ])
 ])
 if test "x$ac_cv_have_mode_t" = "xyes" ; then
@@ -3598,7 +3655,7 @@ AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage
 #include <sys/socket.h>
                 ]], [[ struct sockaddr_storage s; ]])],
         [ ac_cv_have_struct_sockaddr_storage="yes" ],
-        [ ac_cv_have_struct_sockaddr_storage="no" 
+        [ ac_cv_have_struct_sockaddr_storage="no"
         ])
 ])
 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
@@ -3612,7 +3669,7 @@ AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
 #include <netinet/in.h>
                 ]], [[ struct sockaddr_in6 s; s.sin6_family = 0; ]])],
         [ ac_cv_have_struct_sockaddr_in6="yes" ],
-        [ ac_cv_have_struct_sockaddr_in6="no" 
+        [ ac_cv_have_struct_sockaddr_in6="no"
         ])
 ])
 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
@@ -3626,7 +3683,7 @@ AC_CACHE_CHECK([for struct in6_addr], ac_cv_have_struct_in6_addr, [
 #include <netinet/in.h>
                 ]], [[ struct in6_addr s; s.s6_addr[0] = 0; ]])],
         [ ac_cv_have_struct_in6_addr="yes" ],
-        [ ac_cv_have_struct_in6_addr="no" 
+        [ ac_cv_have_struct_in6_addr="no"
         ])
 ])
 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then
@@ -3650,7 +3707,7 @@ AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
 #include <netdb.h>
                 ]], [[ struct addrinfo s; s.ai_flags = AI_PASSIVE; ]])],
         [ ac_cv_have_struct_addrinfo="yes" ],
-        [ ac_cv_have_struct_addrinfo="no" 
+        [ ac_cv_have_struct_addrinfo="no"
         ])
 ])
 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then
@@ -3662,7 +3719,7 @@ AC_CACHE_CHECK([for struct timeval], ac_cv_have_struct_timeval, [
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/time.h> ]],
         [[ struct timeval tv; tv.tv_sec = 1;]])],
         [ ac_cv_have_struct_timeval="yes" ],
-        [ ac_cv_have_struct_timeval="no" 
+        [ ac_cv_have_struct_timeval="no"
         ])
 ])
 if test "x$ac_cv_have_struct_timeval" = "xyes" ; then
@@ -3770,7 +3827,7 @@ AC_CACHE_CHECK([for __ss_family field in struct sockaddr_storage],
 #include <sys/socket.h>
                 ]], [[ struct sockaddr_storage s; s.__ss_family = 1; ]])],
         [ ac_cv_have___ss_family_in_struct_ss="yes" ],
-        [ ac_cv_have___ss_family_in_struct_ss="no" 
+        [ ac_cv_have___ss_family_in_struct_ss="no"
         ])
 ])
 if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then
@@ -3869,7 +3926,7 @@ AC_CACHE_CHECK([if libc defines __progname], ac_cv_libc_defines___progname, [
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
                 [[ extern char *__progname; printf("%s", __progname); ]])],
         [ ac_cv_libc_defines___progname="yes" ],
-        [ ac_cv_libc_defines___progname="no" 
+        [ ac_cv_libc_defines___progname="no"
         ])
 ])
 if test "x$ac_cv_libc_defines___progname" = "xyes" ; then
@@ -3880,7 +3937,7 @@ AC_CACHE_CHECK([whether $CC implements __FUNCTION__], ac_cv_cc_implements___FUNC
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]],
                 [[ printf("%s", __FUNCTION__); ]])],
         [ ac_cv_cc_implements___FUNCTION__="yes" ],
-        [ ac_cv_cc_implements___FUNCTION__="no" 
+        [ ac_cv_cc_implements___FUNCTION__="no"
         ])
 ])
 if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then
@@ -3892,7 +3949,7 @@ AC_CACHE_CHECK([whether $CC implements __func__], ac_cv_cc_implements___func__,
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]],
                 [[ printf("%s", __func__); ]])],
         [ ac_cv_cc_implements___func__="yes" ],
-        [ ac_cv_cc_implements___func__="no" 
+        [ ac_cv_cc_implements___func__="no"
         ])
 ])
 if test "x$ac_cv_cc_implements___func__" = "xyes" ; then
@@ -3905,7 +3962,7 @@ AC_CACHE_CHECK([whether va_copy exists], ac_cv_have_va_copy, [
 va_list x,y;
                 ]], [[ va_copy(x,y); ]])],
         [ ac_cv_have_va_copy="yes" ],
-        [ ac_cv_have_va_copy="no" 
+        [ ac_cv_have_va_copy="no"
         ])
 ])
 if test "x$ac_cv_have_va_copy" = "xyes" ; then
@@ -3917,7 +3974,7 @@ AC_CACHE_CHECK([whether __va_copy exists], ac_cv_have___va_copy, [
 #include <stdarg.h>
 va_list x,y;
                 ]], [[ __va_copy(x,y); ]])],
-        [ ac_cv_have___va_copy="yes" ], [ ac_cv_have___va_copy="no" 
+        [ ac_cv_have___va_copy="yes" ], [ ac_cv_have___va_copy="no"
         ])
 ])
 if test "x$ac_cv_have___va_copy" = "xyes" ; then
@@ -3929,7 +3986,7 @@ AC_CACHE_CHECK([whether getopt has optreset support],
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include <getopt.h> ]],
                 [[ extern int optreset; optreset = 0; ]])],
         [ ac_cv_have_getopt_optreset="yes" ],
-        [ ac_cv_have_getopt_optreset="no" 
+        [ ac_cv_have_getopt_optreset="no"
         ])
 ])
 if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then
@@ -3941,7 +3998,7 @@ AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 [[ extern const char *const sys_errlist[]; printf("%s", sys_errlist[0]);]])],
         [ ac_cv_libc_defines_sys_errlist="yes" ],
-        [ ac_cv_libc_defines_sys_errlist="no" 
+        [ ac_cv_libc_defines_sys_errlist="no"
         ])
 ])
 if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then
@@ -3954,7 +4011,7 @@ AC_CACHE_CHECK([if libc defines sys_nerr], ac_cv_libc_defines_sys_nerr, [
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
 [[ extern int sys_nerr; printf("%i", sys_nerr);]])],
         [ ac_cv_libc_defines_sys_nerr="yes" ],
-        [ ac_cv_libc_defines_sys_nerr="no" 
+        [ ac_cv_libc_defines_sys_nerr="no"
         ])
 ])
 if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
@@ -4113,7 +4170,6 @@ AC_ARG_WITH([kerberos5],
                                            [K5LIBS="$K5LIBS -ldes"])
                                        ], [ AC_MSG_RESULT([no])
                                          K5LIBS="-lkrb5 -lk5crypto -lcom_err"
-                                       
                         ])
                         AC_SEARCH_LIBS([dn_expand], [resolv])
 
@@ -4296,7 +4352,7 @@ AC_ARG_WITH([maildir],
         exit(0);
                 ]])],
                 [
-                    maildir_what=`awk -F: '{print $1}' conftest.maildir`
+                    maildir_what=`awk -F: '{print $1}' conftest.maildir`
                     maildir=`awk -F: '{print $2}' conftest.maildir \
                         | sed 's|/$||'`
                     AC_MSG_RESULT([Using: $maildir from $maildir_what])
@@ -4641,7 +4697,7 @@ AC_ARG_WITH([pid-dir],
         ]
 )
 
-AC_DEFINE_UNQUOTED([_PATH_SSH_PIDDIR], ["$piddir"], 
+AC_DEFINE_UNQUOTED([_PATH_SSH_PIDDIR], ["$piddir"],
         [Specify location of ssh.pid])
 AC_SUBST([piddir])
 
@@ -4799,7 +4855,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         ]], [[ char *utmp = UTMP_FILE; ]])],
         [ AC_MSG_RESULT([yes]) ],
         [ AC_MSG_RESULT([no])
-          system_utmp_path=no 
+          system_utmp_path=no
 ])
 if test -z "$conf_utmp_location"; then
         if test x"$system_utmp_path" = x"no" ; then
@@ -4829,7 +4885,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         ]], [[ char *wtmp = WTMP_FILE; ]])],
         [ AC_MSG_RESULT([yes]) ],
         [ AC_MSG_RESULT([no])
-          system_wtmp_path=no 
+          system_wtmp_path=no
 ])
 if test -z "$conf_wtmp_location"; then
         if test x"$system_wtmp_path" = x"no" ; then
@@ -4862,7 +4918,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         ]], [[ char *wtmpx = WTMPX_FILE; ]])],
         [ AC_MSG_RESULT([yes]) ],
         [ AC_MSG_RESULT([no])
-          system_wtmpx_path=no 
+          system_wtmpx_path=no
 ])
 if test -z "$conf_wtmpx_location"; then
         if test x"$system_wtmpx_path" = x"no" ; then