2c2
< # From configure.ac Revision: 1.397 .
---
> # From configure.ac Revision: 1.409 .
725a726
> TEST_SSH_IPV6
5408,5409c5409,5410
< 3.*) CFLAGS="$CFLAGS -Wsign-compare" ;;
< 4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign" ;;
---
> 3.*) CFLAGS="$CFLAGS -Wsign-compare -Wformat-security" ;;
> 4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign -Wformat-security" ;;
5412a5414,5461
> { echo "$as_me:$LINENO: checking if $CC accepts -fno-builtin-memset" >&5
> echo $ECHO_N "checking if $CC accepts -fno-builtin-memset... $ECHO_C" >&6; }
> saved_CFLAGS="$CFLAGS"
> CFLAGS="$CFLAGS -fno-builtin-memset"
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
>
> #include <string.h>
> int main(void){char b[10]; memset(b, 0, sizeof(b));}
>
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
> if { (ac_try="$ac_link"
> case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> (eval "$ac_link") 2>conftest.er1
> ac_status=$?
> grep -v '^ *+' conftest.er1 >conftest.err
> rm -f conftest.er1
> cat conftest.err >&5
> echo "$as_me:$LINENO: \$? = $ac_status" >&5
> (exit $ac_status); } && {
> test -z "$ac_c_werror_flag" ||
> test ! -s conftest.err
> } && test -s conftest$ac_exeext &&
> $as_test_x conftest$ac_exeext; then
> { echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6; }
> else
> echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> { echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6; }
> CFLAGS="$saved_CFLAGS"
>
> fi
>
> rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
> conftest$ac_exeext conftest.$ac_ext
>
5745a5795,5796
>
>
5784a5836
> sys/mount.h \
5793a5846
> sys/statvfs.h \
7637,7641d7689
< #define DONT_TRY_OTHER_AF 1
< _ACEOF
<
<
< cat >>confdefs.h <<\_ACEOF
9047a9096,9100
>
> cat >>confdefs.h <<\_ACEOF
> #define BROKEN_READV_COMPARISON 1
> _ACEOF
>
11252c11305,11306
< for ac_func in logout updwtmp logwtmp
---
>
> for ac_func in fmt_scaled logout updwtmp logwtmp
12600a12655,12659
>
>
>
>
>
12602a12662,12663
> arc4random_buf \
> arc4random_uniform \
12615a12677
> fstatvfs \
12666a12729,12730
> statfs \
> statvfs \
21620a21685,21695
> { echo "$as_me:$LINENO: checking for fsblkcnt_t" >&5
> echo $ECHO_N "checking for fsblkcnt_t... $ECHO_C" >&6; }
> if test "${ac_cv_type_fsblkcnt_t+set}" = set; then
> echo $ECHO_N "(cached) $ECHO_C" >&6
> else
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
21621a21697,21832
> #include <sys/types.h>
> #ifdef HAVE_SYS_BITYPES_H
> #include <sys/bitypes.h>
> #endif
> #ifdef HAVE_SYS_STATFS_H
> #include <sys/statfs.h>
> #endif
> #ifdef HAVE_SYS_STATVFS_H
> #include <sys/statvfs.h>
> #endif
>
>
> typedef fsblkcnt_t ac__type_new_;
> int
> main ()
> {
> if ((ac__type_new_ *) 0)
> return 0;
> if (sizeof (ac__type_new_))
> return 0;
> ;
> return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext
> if { (ac_try="$ac_compile"
> case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> (eval "$ac_compile") 2>conftest.er1
> ac_status=$?
> grep -v '^ *+' conftest.er1 >conftest.err
> rm -f conftest.er1
> cat conftest.err >&5
> echo "$as_me:$LINENO: \$? = $ac_status" >&5
> (exit $ac_status); } && {
> test -z "$ac_c_werror_flag" ||
> test ! -s conftest.err
> } && test -s conftest.$ac_objext; then
> ac_cv_type_fsblkcnt_t=yes
> else
> echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> ac_cv_type_fsblkcnt_t=no
> fi
>
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
> { echo "$as_me:$LINENO: result: $ac_cv_type_fsblkcnt_t" >&5
> echo "${ECHO_T}$ac_cv_type_fsblkcnt_t" >&6; }
> if test $ac_cv_type_fsblkcnt_t = yes; then
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_FSBLKCNT_T 1
> _ACEOF
>
>
> fi
> { echo "$as_me:$LINENO: checking for fsfilcnt_t" >&5
> echo $ECHO_N "checking for fsfilcnt_t... $ECHO_C" >&6; }
> if test "${ac_cv_type_fsfilcnt_t+set}" = set; then
> echo $ECHO_N "(cached) $ECHO_C" >&6
> else
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
>
> #include <sys/types.h>
> #ifdef HAVE_SYS_BITYPES_H
> #include <sys/bitypes.h>
> #endif
> #ifdef HAVE_SYS_STATFS_H
> #include <sys/statfs.h>
> #endif
> #ifdef HAVE_SYS_STATVFS_H
> #include <sys/statvfs.h>
> #endif
>
>
> typedef fsfilcnt_t ac__type_new_;
> int
> main ()
> {
> if ((ac__type_new_ *) 0)
> return 0;
> if (sizeof (ac__type_new_))
> return 0;
> ;
> return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext
> if { (ac_try="$ac_compile"
> case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> (eval "$ac_compile") 2>conftest.er1
> ac_status=$?
> grep -v '^ *+' conftest.er1 >conftest.err
> rm -f conftest.er1
> cat conftest.err >&5
> echo "$as_me:$LINENO: \$? = $ac_status" >&5
> (exit $ac_status); } && {
> test -z "$ac_c_werror_flag" ||
> test ! -s conftest.err
> } && test -s conftest.$ac_objext; then
> ac_cv_type_fsfilcnt_t=yes
> else
> echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> ac_cv_type_fsfilcnt_t=no
> fi
>
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> fi
> { echo "$as_me:$LINENO: result: $ac_cv_type_fsfilcnt_t" >&5
> echo "${ECHO_T}$ac_cv_type_fsfilcnt_t" >&6; }
> if test $ac_cv_type_fsfilcnt_t = yes; then
>
> cat >>confdefs.h <<_ACEOF
> #define HAVE_FSFILCNT_T 1
> _ACEOF
>
>
> fi
>
>
23927a24139,24192
> { echo "$as_me:$LINENO: checking if f_fsid has val members" >&5
> echo $ECHO_N "checking if f_fsid has val members... $ECHO_C" >&6; }
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> cat confdefs.h >>conftest.$ac_ext
> cat >>conftest.$ac_ext <<_ACEOF
> /* end confdefs.h. */
>
> #include <sys/types.h>
> #include <sys/statvfs.h>
> int
> main ()
> {
> struct fsid_t t; t.val[0] = 0;
> ;
> return 0;
> }
> _ACEOF
> rm -f conftest.$ac_objext
> if { (ac_try="$ac_compile"
> case "(($ac_try" in
> *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
> *) ac_try_echo=$ac_try;;
> esac
> eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
> (eval "$ac_compile") 2>conftest.er1
> ac_status=$?
> grep -v '^ *+' conftest.er1 >conftest.err
> rm -f conftest.er1
> cat conftest.err >&5
> echo "$as_me:$LINENO: \$? = $ac_status" >&5
> (exit $ac_status); } && {
> test -z "$ac_c_werror_flag" ||
> test ! -s conftest.err
> } && test -s conftest.$ac_objext; then
> { echo "$as_me:$LINENO: result: yes" >&5
> echo "${ECHO_T}yes" >&6; }
>
> cat >>confdefs.h <<\_ACEOF
> #define FSID_HAS_VAL 1
> _ACEOF
>
> else
> echo "$as_me: failed program was:" >&5
> sed 's/^/| /' conftest.$ac_ext >&5
>
> { echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6; }
>
> fi
>
> rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>
26206,26208c26471,26473
< { echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi" >&5
< echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6; }
< if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then
---
> { echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi_krb5" >&5
> echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6; }
> if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then
26212c26477
< LIBS="-lgssapi $K5LIBS $LIBS"
---
> LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
26253c26518
< ac_cv_lib_gssapi_gss_init_sec_context=yes
---
> ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
26258c26523
< ac_cv_lib_gssapi_gss_init_sec_context=no
---
> ac_cv_lib_gssapi_krb5_gss_init_sec_context=no
26265,26267c26530,26532
< { echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
< echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6; }
< if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then
---
> { echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
> echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; }
> if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then
26272c26537
< K5LIBS="-lgssapi $K5LIBS"
---
> K5LIBS="-lgssapi_krb5 $K5LIBS"
26274,26276c26539,26541
< { echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi_krb5" >&5
< echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6; }
< if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then
---
> { echo "$as_me:$LINENO: checking for gss_init_sec_context in -lgssapi" >&5
> echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6; }
> if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then
26280c26545
< LIBS="-lgssapi_krb5 $K5LIBS $LIBS"
---
> LIBS="-lgssapi $K5LIBS $LIBS"
26321c26586
< ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes
---
> ac_cv_lib_gssapi_gss_init_sec_context=yes
26326c26591
< ac_cv_lib_gssapi_krb5_gss_init_sec_context=no
---
> ac_cv_lib_gssapi_gss_init_sec_context=no
26333,26335c26598,26600
< { echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5
< echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6; }
< if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then
---
> { echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5
> echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6; }
> if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then
26340c26605
< K5LIBS="-lgssapi_krb5 $K5LIBS"
---
> K5LIBS="-lgssapi $K5LIBS"
28609a28875,28877
> if grep "#define BROKEN_GETADDRINFO 1" confdefs.h >/dev/null || \
> test "x$ac_cv_func_getaddrinfo" != "xyes" ; then
> TEST_SSH_IPV6=no
28610a28879,28884
> else
> TEST_SSH_IPV6=yes
>
> fi
>
>
29384a29659
> TEST_SSH_IPV6!$TEST_SSH_IPV6$ac_delim
29389c29664
< if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
---
> if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then