From 1e9d0fc52ff4690dc476ab29f2669490362b78d3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 3 Jun 2010 16:51:12 +0200 Subject: [PATCH] samba: - update to samba-3.5.3 --- ... => 010_samba-3.5.3-crosscompile-0.1.diff} | 10329 ++++++++-------- packages/network/samba/url | 2 +- 2 files changed, 5267 insertions(+), 5064 deletions(-) rename packages/network/samba/patches/{010_samba-3.5.2-crosscompile-0.1.diff => 010_samba-3.5.3-crosscompile-0.1.diff} (98%) diff --git a/packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff b/packages/network/samba/patches/010_samba-3.5.3-crosscompile-0.1.diff similarity index 98% rename from packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff rename to packages/network/samba/patches/010_samba-3.5.3-crosscompile-0.1.diff index b834a54b1a..e2aae9048a 100644 --- a/packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff +++ b/packages/network/samba/patches/010_samba-3.5.3-crosscompile-0.1.diff @@ -1,6 +1,6 @@ -diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ---- samba-3.5.2/source3/configure 2010-04-06 09:43:16.000000000 +0200 -+++ samba-3.5.2.patch/source3/configure 2010-04-18 00:12:20.015397879 +0200 +diff -Naur samba-3.5.3/source3/configure samba-3.5.3.patch/source3/configure +--- samba-3.5.3/source3/configure 2010-05-17 13:53:13.000000000 +0200 ++++ samba-3.5.3.patch/source3/configure 2010-06-03 01:01:17.519250563 +0200 @@ -1,20 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. @@ -7038,7 +7038,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF -@@ -7521,30401 +6403,2005 @@ +@@ -7521,30546 +6403,2004 @@ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. @@ -12367,14 +12367,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -fi - - --LD=ld --{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +-{ $as_echo "$as_me:$LINENO: checking if the linker used by compiler is GNU ld" >&5 +-$as_echo_n "checking if the linker used by compiler is GNU ld... " >&6; } -if test "${ac_cv_prog_gnu_ld+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then +-if $CC -Wl,-v /dev/null 2>&1 &5; then - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no @@ -12385,7 +12384,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - - -if test "$ac_cv_prog_gnu_ld" = "yes"; then -- ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1` +- ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1` - { $as_echo "$as_me:$LINENO: checking GNU ld release date" >&5 -$as_echo_n "checking GNU ld release date... " >&6; } - ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` @@ -29662,6 +29661,144 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -fi -fi - +-{ $as_echo "$as_me:$LINENO: checking for IPV6_V6ONLY support" >&5 +-$as_echo_n "checking for IPV6_V6ONLY support... " >&6; } +-if test "${libreplace_cv_HAVE_IPV6_V6ONLY+set}" = set; then +- $as_echo_n "(cached) " >&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 /* for NULL */ +-#include +-#include +-#include +-#include +- +-int +-main () +-{ +- +-#ifndef IPV6_V6ONLY +-#error no IPV6_V6ONLY +-#endif +- +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 +- +- libreplace_cv_HAVE_IPV6_V6ONLY=yes +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- libreplace_cv_HAVE_IPV6_V6ONLY=no +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_IPV6_V6ONLY" >&5 +-$as_echo "$libreplace_cv_HAVE_IPV6_V6ONLY" >&6; } +-if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then +- { $as_echo "$as_me:$LINENO: checking for IPV6_V6ONLY in linux/in6.h" >&5 +-$as_echo_n "checking for IPV6_V6ONLY in linux/in6.h... " >&6; } +-if test "${libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26+set}" = set; then +- $as_echo_n "(cached) " >&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 +- +-int +-main () +-{ +- +- #if (IPV6_V6ONLY != 26) +- #error no linux IPV6_V6ONLY +- #endif +- +- ; +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 +- +- libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes +- +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- +- libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no +- +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-fi +-{ $as_echo "$as_me:$LINENO: result: $libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&5 +-$as_echo "$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&6; } +- if test x"$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" = x"yes"; then +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_IPV6_V6ONLY_26 1 +-_ACEOF +- +- fi +-fi +- -{ $as_echo "$as_me:$LINENO: checking for ipv6 support" >&5 -$as_echo_n "checking for ipv6 support... " >&6; } -if test "${libreplace_cv_HAVE_IPV6+set}" = set; then @@ -29695,6 +29832,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - const char *es = gai_strerror(ret); -} -freeaddrinfo(ai); +-{ +- int val = 1; +- #ifdef HAVE_LINUX_IPV6_V6ONLY_26 +- #define IPV6_V6ONLY 26 +- #endif +- ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, +- (const void *)&val, sizeof(val)); +-} - - ; - return 0; @@ -35016,11 +35161,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi --rm -f conftest.val +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi +-rm -f conftest.val +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -$as_echo "$ac_cv_sizeof_short" >&6; } - @@ -36041,9 +36186,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then -+LD=ld -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker used by compiler is GNU ld" >&5 ++$as_echo_n "checking if the linker used by compiler is GNU ld... " >&6; } +if test "${ac_cv_prog_gnu_ld+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -36060,7 +36204,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes + # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+if $LD -v 2>&1 &5; then ++if $CC -Wl,-v /dev/null 2>&1 &5; then + ac_cv_prog_gnu_ld=yes else - ac_cv_type_uid_t=no @@ -36080,7 +36224,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF + +if test "$ac_cv_prog_gnu_ld" = "yes"; then -+ ac_cv_gnu_ld_version=`$LD -v 2>/dev/null | head -1` ++ ac_cv_gnu_ld_version=`$CC -Wl,-v /dev/null 2>/dev/null | head -1` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release date" >&5 +$as_echo_n "checking GNU ld release date... " >&6; } + ac_cv_gnu_ld_date=`echo $ac_cv_gnu_ld_version | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'` @@ -36331,16 +36475,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' + rm -f conftest2.* + if { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && -+ test -f conftest2.$ac_objext && { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac @@ -36361,6 +36495,16 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - } && test -s conftest.$ac_objext; then - : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } && ++ test -f conftest2.$ac_objext && { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; + then + # cc works too. @@ -37710,12 +37854,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + ;; + *) + CPPFLAGS="$CPPFLAGS -D_SYSV" ++ ++$as_echo "#define _SYSV 1" >>confdefs.h -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+$as_echo "#define _SYSV 1" >>confdefs.h -+ + esac + ;; +# @@ -37879,17 +38023,17 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) + int libc_major = __GLIBC__; + int libc_minor = __GLIBC_MINOR__; - ++ + if (libc_major < 2) + exit(1); + if (libc_minor < 2) + exit(1); +#endif ++ /* Ensure this is kernel 2.4 or higher */ + - ; - return 0; -+ /* Ensure this is kernel 2.4 or higher */ -+ + uname(&uts); + release = strdup(uts.release); + major = atoi(strsep(&release, ".")); @@ -38129,11 +38273,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: result: $samba_cv_msghdr_msg_acctrights" >&5 -$as_echo "$samba_cv_msghdr_msg_acctrights" >&6; } -if test x"$samba_cv_msghdr_msg_acctrights" = x"yes"; then -- + -cat >>confdefs.h <<\_ACEOF -#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1 -_ACEOF - +- -fi + CPPFLAGS="$old_CPPFLAGS" + if test x$GLIBC_LFS_SUPPORT = xyes ; then @@ -38228,7 +38372,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - eval "$as_ac_var=no" -fi - @@ -38249,7 +38393,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - -fi -done -- + -if test x"$ac_cv_func_dirfd" = x"yes"; then - default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort" -fi @@ -38429,11 +38573,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_sigevent_sigev_value_sival_ptr=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_type_signal=void fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -38546,41 +38690,39 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_type_uid_t=no fi +rm -f conftest* -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5 +-$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; } +-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&5 --$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" >&6; } --if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then -+$as_echo "#define uid_t int" >>confdefs.h - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1 -_ACEOF ++$as_echo "#define uid_t int" >>confdefs.h + +-fi +$as_echo "#define gid_t int" >>confdefs.h fi --fi -+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -+if test "x$ac_cv_type_mode_t" = x""yes; then : - -{ $as_echo "$as_me:$LINENO: checking for struct timespec type" >&5 -$as_echo_n "checking for struct timespec type... " >&6; } -if test "${samba_cv_struct_timespec+set}" = set; then - $as_echo_n "(cached) " >&6 - else - +-else +- - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -38603,7 +38745,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -# include -# endif -#endif -- ++ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" ++if test "x$ac_cv_type_mode_t" = x""yes; then : + -int -main () -{ @@ -38631,28 +38775,29 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - samba_cv_struct_timespec=yes --else + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + +- samba_cv_struct_timespec=no +-fi +cat >>confdefs.h <<_ACEOF +#define mode_t int +_ACEOF -- samba_cv_struct_timespec=no - fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi + fi -{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_timespec" >&5 -$as_echo "$samba_cv_struct_timespec" >&6; } -if test x"$samba_cv_struct_timespec" = x"yes"; then + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_STRUCT_TIMESPEC 1 +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : + +else - --cat >>confdefs.h <<\_ACEOF --#define HAVE_STRUCT_TIMESPEC 1 ++ +cat >>confdefs.h <<_ACEOF +#define off_t long int _ACEOF @@ -38857,7 +39002,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ $ac_includes_default int -@@ -37950,44 +8436,17 @@ +@@ -38095,44 +8435,17 @@ return 0; } _ACEOF @@ -38907,28 +39052,50 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; -@@ -37997,166 +8456,26 @@ +@@ -38142,317 +8455,140 @@ -############################################### -# Readline included by default unless explicitly asked not to -test "${with_readline+set}" != "set" && with_readline=yes -- ++for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + -# test for where we get readline() from -{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5 -$as_echo_n "checking whether to use readline... " >&6; } -- ++fi ++done + -# Check whether --with-readline was given. -if test "${with_readline+set}" = set; then - withval=$with_readline; case "$with_readline" in - yes) - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -- -- -- -- + ++for ac_header in stdbool.h stdint.h sys/select.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + ++fi + ++done + -for ac_header in readline.h history.h readline/readline.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -38954,332 +39121,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> --_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+for ac_func in pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi -+done - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------------------- ## --## Report this to samba-technical@samba.org ## --## ---------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+for ac_header in stdbool.h stdint.h sys/select.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -38165,149 +8484,12 @@ - - done - -- --for ac_header in readline/history.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_compiler=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -- --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi -- --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------------------- ## --## Report this to samba-technical@samba.org ## --## ---------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then +for ac_header in setjmp.h utime.h +do : + 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" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -38317,474 +8499,97 @@ - done - - -+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdint_h" = x""yes; then : -+ ac_config_commands="$ac_config_commands rm-stdint.h" - -- --for ac_header in readline.h readline/readline.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -39299,17 +39149,22 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no --fi -- + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+ ac_config_commands="$ac_config_commands mk-stdint.h" ++done ++ ++ ++ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" ++if test "x$ac_cv_header_stdint_h" = x""yes; then : ++ ac_config_commands="$ac_config_commands rm-stdint.h" -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 @@ -39340,9 +39195,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_config_commands="$ac_config_commands mk-stdint.h" ++ - ac_header_preproc=no fi @@ -39350,7 +39207,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -39385,13 +39242,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 --else ++ ++ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default" ++if test "x$ac_cv_header_stdbool_h" = x""yes; then : ++ ac_config_commands="$ac_config_commands rm-stdbool.h" ++ + else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } ++ ac_config_commands="$ac_config_commands mk-stdbool.h" -fi -as_val=`eval 'as_val=${'$as_ac_Header'} @@ -39401,217 +39264,32 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- for termlib in ncurses curses termcap terminfo termlib tinfo; do -- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 --$as_echo_n "checking for tgetent in -l${termlib}... " >&6; } --if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-l${termlib} $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdbool_h" = x""yes; then : -+ ac_config_commands="$ac_config_commands rm-stdbool.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 tgetent (); --int --main () --{ --return tgetent (); -- ; -- return 0; --} --_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_Lib=yes" - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_config_commands="$ac_config_commands mk-stdbool.h" - -- eval "$as_ac_Lib=no" --fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --ac_res=`eval 'as_val=${'$as_ac_Lib'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Lib'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- TERMLIBS="-l${termlib}"; break - fi - -- done -- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 --$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; } --if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMLIBS $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* 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 rl_callback_handler_install (); --int --main () --{ --return rl_callback_handler_install (); -- ; -- return 0; --} --_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_readline_rl_callback_handler_install=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_readline_rl_callback_handler_install=no --fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5 --$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; } --if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then -- TERMLIBS="-lreadline $TERMLIBS" -+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" " -+$ac_includes_default -+#ifdef HAVE_STDBOOL_H -+#include -+#endif - --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIBREADLINE 1 --_ACEOF -+" -+if test "x$ac_cv_type_bool" = x""yes; then : - -- break --else -- TERMLIBS= --fi -+$as_echo "#define HAVE_BOOL 1" >>confdefs.h - fi -done -- -- ;; -- no) -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- ;; -- *) -- { $as_echo "$as_me:$LINENO: result: yes" >&5 --$as_echo "yes" >&6; } - -- # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at -- # alternate readline path -- _ldflags=${LDFLAGS} -- _cppflags=${CPPFLAGS} -+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" " -+$ac_includes_default -+#ifdef HAVE_STDBOOL_H -+#include -+#endif - -- # Add additional search path -- LDFLAGS="-L$with_readline/lib $LDFLAGS" -- CPPFLAGS="-I$with_readline/include $CPPFLAGS" -+" -+if test "x$ac_cv_type__Bool" = x""yes; then : - -+$as_echo "#define HAVE__Bool 1" >>confdefs.h - -+fi --for ac_header in readline.h history.h readline/readline.h +-for ac_header in readline/history.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -+$as_echo_n "checking for working mmap... " >&6; } -+if test "${libreplace_cv_HAVE_MMAP+set}" = set; then : - $as_echo_n "(cached) " >&6 --fi +- $as_echo_n "(cached) " >&6 ++ ++ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" " ++$ac_includes_default ++#ifdef HAVE_STDBOOL_H ++#include ++#endif ++ ++" ++if test "x$ac_cv_type_bool" = x""yes; then : ++ ++$as_echo "#define HAVE_BOOL 1" >>confdefs.h ++ + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -39626,7 +39304,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ --$ac_includes_default ++ ++ ++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" " + $ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext @@ -39648,13 +39329,21 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++#ifdef HAVE_STDBOOL_H ++#include ++#endif ++ ++" ++if test "x$ac_cv_type__Bool" = x""yes; then : ++ ++$as_echo "#define HAVE__Bool 1" >>confdefs.h + - ac_header_compiler=no --fi -- + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } @@ -39667,6 +39356,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 ++$as_echo_n "checking for working mmap... " >&6; } ++if test "${libreplace_cv_HAVE_MMAP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ +if test "$cross_compiling" = yes; then : + libreplace_cv_HAVE_MMAP=cross +else @@ -39693,17 +39388,28 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes --else ++if ac_fn_c_try_run "$LINENO"; then : ++ libreplace_cv_HAVE_MMAP=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ libreplace_cv_HAVE_MMAP=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi + - ac_header_preproc=no --fi -- + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5 ++$as_echo "$libreplace_cv_HAVE_MMAP" >&6; } ++if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -- ++$as_echo "#define HAVE_MMAP 1" >>confdefs.h + -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) @@ -39738,33 +39444,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+if ac_fn_c_try_run "$LINENO"; then : -+ libreplace_cv_HAVE_MMAP=yes - else +-else - eval "$as_ac_Header=\$ac_header_preproc" -+ libreplace_cv_HAVE_MMAP=no fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_MMAP" >&5 -+$as_echo "$libreplace_cv_HAVE_MMAP" >&6; } -+if test x"$libreplace_cv_HAVE_MMAP" = x"yes"; then -+ -+$as_echo "#define HAVE_MMAP 1" >>confdefs.h - fi +-fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + -+ +for ac_header in sys/syslog.h syslog.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -39774,36 +39466,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -38793,149 +8598,40 @@ +@@ -38461,475 +8597,288 @@ done -- --for ac_header in readline/history.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> +for ac_header in sys/time.h time.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -39812,152 +39478,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+done - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+for ac_header in stdarg.h vararg.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------------------- ## --## Report this to samba-technical@samba.org ## --## ---------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+done - --fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+for ac_header in sys/mount.h mntent.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -38944,946 +8640,569 @@ - - done - -+for ac_header in stropts.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" -+if test "x$ac_cv_header_stropts_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STROPTS_H 1 +_ACEOF +fi @@ -39989,12 +39509,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -+for ac_header in unix.h ++for ac_header in stdarg.h vararg.h +do : -+ ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default" -+if test "x$ac_cv_header_unix_h" = x""yes; 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_UNIX_H 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" @@ -40032,32 +39554,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ -+for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ -+fi -+done -+ -+for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename ++for ac_header in sys/mount.h mntent.h +do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var ++ 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" ++eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in @@ -40083,19 +39592,18 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - ac_header_preproc=no fi -+done -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -+for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup ++done ++ ++for ac_header in stropts.h +do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" ++if test "x$ac_cv_header_stropts_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_STROPTS_H 1 +_ACEOF -# So? What about this header? @@ -40139,6 +39647,117 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } ++ ++done ++ ++for ac_header in unix.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default" ++if test "x$ac_cv_header_unix_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_UNIX_H 1 ++_ACEOF + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++done ++ ++ ++for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF + +- for termlib in ncurses curses termcap terminfo termlib tinfo; do +- as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 +-$as_echo_n "checking for tgetent in -l${termlib}... " >&6; } +-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-l${termlib} $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++fi ++done ++ ++for ac_func in vsyslog setlinebuf mktime ftruncate chsize rename ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* 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 tgetent (); +-int +-main () +-{ +-return tgetent (); +- ; +- return 0; +-} ++fi ++done ++ ++for ac_func in waitpid wait4 strlcpy strlcat initgroups memmove strdup ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_Lib=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_Lib=no" + fi +done + +for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2 @@ -40151,10 +39770,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS fi --as_val=`eval 'as_val=${'$as_ac_Header'} +-ac_res=`eval 'as_val=${'$as_ac_Lib'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +- TERMLIBS="-l${termlib}"; break +done + +for ac_func in isatty chown lchown link readlink symlink realpath @@ -40162,24 +39790,833 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++done + +- done +- { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 +-$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; } +-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5 ++$as_echo_n "checking for setresuid declaration... " >&6; } ++if test "${ac_cv_have_setresuid_decl+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $TERMLIBS $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* 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 rl_callback_handler_install (); ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + int + main () + { +-return rl_callback_handler_install (); ++int i = (int)setresuid + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_readline_rl_callback_handler_install=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_have_setresuid_decl=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_cv_lib_readline_rl_callback_handler_install=no +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ ac_cv_have_setresuid_decl=no + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5 +-$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; } +-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then +- TERMLIBS="-lreadline $TERMLIBS" +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LIBREADLINE 1 +-_ACEOF +- +- break +-else +- TERMLIBS= ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5 ++$as_echo "$ac_cv_have_setresuid_decl" >&6; } ++ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then + +-fi ++$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h + +-done ++ fi + +- ;; +- no) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +- *) +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } + +- # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at +- # alternate readline path +- _ldflags=${LDFLAGS} +- _cppflags=${CPPFLAGS} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5 ++$as_echo_n "checking for setresgid declaration... " >&6; } ++if test "${ac_cv_have_setresgid_decl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else + +- # Add additional search path +- LDFLAGS="-L$with_readline/lib $LDFLAGS" +- CPPFLAGS="-I$with_readline/include $CPPFLAGS" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++int i = (int)setresgid ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_have_setresgid_decl=yes ++else ++ ac_cv_have_setresgid_decl=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5 ++$as_echo "$ac_cv_have_setresgid_decl" >&6; } ++ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then + ++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h + ++ fi + + +-for ac_header in readline.h history.h readline/readline.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5 ++$as_echo_n "checking for errno declaration... " >&6; } ++if test "${ac_cv_have_errno_decl+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++#include ++int ++main () ++{ ++int i = (int)errno ++ ; ++ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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_header_compiler=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_have_errno_decl=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no ++ ac_cv_have_errno_decl=no + fi +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5 ++$as_echo "$ac_cv_have_errno_decl" >&6; } ++ if test x"$ac_cv_have_errno_decl" = x"yes"; then + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h ++ ++ fi ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5 ++$as_echo_n "checking for secure mkstemp... " >&6; } ++if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++if test "$cross_compiling" = yes; then : ++ libreplace_cv_HAVE_SECURE_MKSTEMP=cross ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_header> ++#include ++#include ++#include ++#include ++main() { ++ struct stat st; ++ char tpl[20]="/tmp/test.XXXXXX"; ++ int fd = mkstemp(tpl); ++ if (fd == -1) exit(1); ++ unlink(tpl); ++ if (fstat(fd, &st) != 0) exit(1); ++ if ((st.st_mode & 0777) != 0600) exit(1); ++ exit(0); ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if ac_fn_c_try_run "$LINENO"; then : ++ libreplace_cv_HAVE_SECURE_MKSTEMP=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ libreplace_cv_HAVE_SECURE_MKSTEMP=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi + +- ac_header_preproc=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5 ++$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; } ++if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------- ## +-## Report this to samba-technical@samba.org ## +-## ---------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++for ac_header in stdio.h strings.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -38938,1034 +8887,564 @@ + + done + +- +-for ac_header in readline/history.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } ++ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" ++if test "x$ac_cv_have_decl_snprintf" = x""yes; then : ++ ac_have_decl=1 + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++ ac_have_decl=0 ++fi ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_SNPRINTF $ac_have_decl + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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_header_compiler=yes ++ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" ++if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then : ++ ac_have_decl=1 + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ ac_have_decl=0 ++fi + +- ac_header_compiler=no ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_VSNPRINTF $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default" ++if test "x$ac_cv_have_decl_asprintf" = x""yes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_ASPRINTF $ac_have_decl ++_ACEOF ++ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default" ++if test "x$ac_cv_have_decl_vasprintf" = x""yes; then : ++ ac_have_decl=1 ++else ++ ac_have_decl=0 ++fi + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_VASPRINTF $ac_have_decl + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> ++ ++for ac_func in snprintf vsnprintf asprintf vasprintf ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no + fi ++done + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------- ## +-## Report this to samba-technical@samba.org ## +-## ---------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5 ++$as_echo_n "checking for C99 vsnprintf... " >&6; } ++if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- eval "$as_ac_Header=\$ac_header_preproc" +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF ++if test "$cross_compiling" = yes; then : ++ libreplace_cv_HAVE_C99_VSNPRINTF=cross ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#include ++#include ++#include ++#include ++void foo(const char *format, ...) { ++ va_list ap; ++ int len; ++ char buf[20]; ++ long long l = 1234567890; ++ l *= 100; ++ ++ va_start(ap, format); ++ len = vsnprintf(buf, 0, format, ap); ++ va_end(ap); ++ if (len != 5) exit(1); ++ ++ va_start(ap, format); ++ len = vsnprintf(0, 0, format, ap); ++ va_end(ap); ++ if (len != 5) exit(2); ++ ++ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3); ++ ++ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4); ++ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5); ++ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6); ++ if (snprintf(buf, 20, "%s", 0) < 3) exit(7); ++ ++ exit(0); ++} ++main() { foo("hello"); } + ++_ACEOF ++if ac_fn_c_try_run "$LINENO"; then : ++ libreplace_cv_HAVE_C99_VSNPRINTF=yes ++else ++ libreplace_cv_HAVE_C99_VSNPRINTF=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi + +-done ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5 ++$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; } ++if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then + ++$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h + ++fi + + +-for ac_header in readline.h readline/readline.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 ++$as_echo_n "checking for va_copy... " >&6; } ++if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then : + $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> ++#include ++va_list ap1,ap2; ++int ++main () ++{ ++va_copy(ap1,ap2); ++ ; ++ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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_header_compiler=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ libreplace_cv_HAVE_VA_COPY=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ libreplace_cv_HAVE_VA_COPY=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5 ++$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; } ++if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then ++ ++$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h + +- ac_header_compiler=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5 ++$as_echo_n "checking for __va_copy... " >&6; } ++if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <$ac_header> ++#include ++va_list ap1,ap2; ++int ++main () ++{ ++__va_copy(ap1,ap2); ++ ; ++ return 0; ++} + _ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes ++if ac_fn_c_try_link "$LINENO"; then : ++ libreplace_cv_HAVE___VA_COPY=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_preproc=no ++ libreplace_cv_HAVE___VA_COPY=no + fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5 ++$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; } ++if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------- ## +-## Report this to samba-technical@samba.org ## +-## ---------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF - for termlib in ncurses curses termcap terminfo termlib; do - as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 -$as_echo_n "checking for tgetent in -l${termlib}... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then -+fi -+done -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5 -+$as_echo_n "checking for setresuid declaration... " >&6; } -+if test "${ac_cv_have_setresuid_decl+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5 ++$as_echo_n "checking for __FUNCTION__ macro... " >&6; } ++if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS @@ -40198,14 +40635,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -extern "C" -#endif -char tgetent (); -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+#include ++#include int main () { -return tgetent (); -+int i = (int)setresuid ++printf("%s\n", __FUNCTION__); ; return 0; } @@ -40233,7 +40670,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - }; then - eval "$as_ac_Lib=yes" +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_setresuid_decl=yes ++ libreplace_cv_HAVE_FUNCTION_MACRO=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 @@ -40245,7 +40682,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ ac_cv_have_setresuid_decl=no ++ libreplace_cv_HAVE_FUNCTION_MACRO=no fi -ac_res=`eval 'as_val=${'$as_ac_Lib'} - $as_echo "$as_val"'` @@ -40257,22 +40694,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - TERMLIBS="-l${termlib}"; break +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresuid_decl" >&5 -+$as_echo "$ac_cv_have_setresuid_decl" >&6; } -+ if test x"$ac_cv_have_setresuid_decl" = x"yes"; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5 ++$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; } ++if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then - done - { $as_echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 -$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then -+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h ++$as_echo "#define HAVE_FUNCTION_MACRO 1" >>confdefs.h + -+ fi -+ -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5 -+$as_echo_n "checking for setresgid declaration... " >&6; } -+if test "${ac_cv_have_setresgid_decl+set}" = set; then : ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5 ++$as_echo_n "checking for __func__ macro... " >&6; } ++if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS @@ -40293,12 +40728,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -char rl_callback_handler_install (); + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+#include ++#include int main () { -return rl_callback_handler_install (); -+int i = (int)setresgid ++printf("%s\n", __func__); ; return 0; } @@ -40325,18 +40760,22 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_readline_rl_callback_handler_install=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ libreplace_cv_HAVE_func_MACRO=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_readline_rl_callback_handler_install=no --fi ++ libreplace_cv_HAVE_func_MACRO=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5 -$as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; } -if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then @@ -40344,40 +40783,50 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - TERMCPPFLAGS="-I$with_readline/include" - CPPFLAGS="-I$with_readline/include $CPPFLAGS" - TERMLIBS="-lreadline $TERMLIBS" -- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5 ++$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; } ++ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then + -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBREADLINE 1 -_ACEOF -- ++$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h + - break -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_setresgid_decl=yes - else +-else - TERMLIBS= CPPFLAGS=$_cppflags --fi -- -+ ac_cv_have_setresgid_decl=no ++ fi fi -- --done -- -- + ++for ac_header in sys/param.h limits.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi + + done + + - LDFLAGS=$_ldflags - ;; - esac -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setresgid_decl" >&5 -+$as_echo "$ac_cv_have_setresgid_decl" >&6; } -+ if test x"$ac_cv_have_setresgid_decl" = x"yes"; then ++ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default" ++if test "x$ac_cv_type_comparison_fn_t" = x""yes; then : -+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h +-fi ++$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h + ++fi -+ fi -# The readline API changed slightly from readline3 to readline4, so @@ -40386,9 +40835,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 -$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5 -+$as_echo_n "checking for errno declaration... " >&6; } -+if test "${ac_cv_have_errno_decl+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5 ++$as_echo_n "checking for setenv declaration... " >&6; } ++if test "${ac_cv_have_setenv_decl+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS @@ -40409,12 +40858,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -char rl_completion_matches (); + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -+#include ++#include int main () { -return rl_completion_matches (); -+int i = (int)errno ++int i = (int)setenv ; return 0; } @@ -40442,13 +40891,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - }; then - ac_cv_lib_readline_rl_completion_matches=yes +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_errno_decl=yes ++ ac_cv_have_setenv_decl=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_readline_rl_completion_matches=no -+ ac_cv_have_errno_decl=no ++ ac_cv_have_setenv_decl=no fi - -rm -rf conftest.dSYM @@ -40460,26 +40909,37 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5 -$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; } -if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_errno_decl" >&5 -+$as_echo "$ac_cv_have_errno_decl" >&6; } -+ if test x"$ac_cv_have_errno_decl" = x"yes"; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5 ++$as_echo "$ac_cv_have_setenv_decl" >&6; } ++ if test x"$ac_cv_have_setenv_decl" = x"yes"; then ++ ++$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h ++ ++ fi -cat >>confdefs.h <<\_ACEOF -#define HAVE_NEW_LIBREADLINE 1 --_ACEOF -+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h ++for ac_func in setenv unsetenv ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF --fi -+ fi + fi ++done -# not all readline libs have rl_event_hook or history_list -{ $as_echo "$as_me:$LINENO: checking whether rl_event_hook is declared" >&5 -$as_echo_n "checking whether rl_event_hook is declared... " >&6; } -if test "${ac_cv_have_decl_rl_event_hook+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5 -+$as_echo_n "checking for secure mkstemp... " >&6; } -+if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5 ++$as_echo_n "checking for environ declaration... " >&6; } ++if test "${ac_cv_have_environ_decl+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -40489,34 +40949,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -- --int --main () --{ + ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include + int + main () + { -#ifndef rl_event_hook - (void) rl_event_hook; -#endif - -- ; -- return 0; -+if test "$cross_compiling" = yes; then : -+ libreplace_cv_HAVE_SECURE_MKSTEMP=cross -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include -+#include -+#include -+main() { -+ struct stat st; -+ char tpl[20]="/tmp/test.XXXXXX"; -+ int fd = mkstemp(tpl); -+ if (fd == -1) exit(1); -+ unlink(tpl); -+ if (fstat(fd, &st) != 0) exit(1); -+ if ((st.st_mode & 0777) != 0600) exit(1); -+ exit(0); +- ++int i = (int)environ + ; + return 0; } _ACEOF -rm -f conftest.$ac_objext @@ -40538,59 +40984,83 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_rl_event_hook=yes -+if ac_fn_c_try_run "$LINENO"; then : -+ libreplace_cv_HAVE_SECURE_MKSTEMP=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_have_environ_decl=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_rl_event_hook=no -+ libreplace_cv_HAVE_SECURE_MKSTEMP=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ++ ac_cv_have_environ_decl=no fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_rl_event_hook" >&5 -$as_echo "$ac_cv_have_decl_rl_event_hook" >&6; } -if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SECURE_MKSTEMP" >&5 -+$as_echo "$libreplace_cv_HAVE_SECURE_MKSTEMP" >&6; } -+if test x"$libreplace_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5 ++$as_echo "$ac_cv_have_environ_decl" >&6; } ++ if test x"$ac_cv_have_environ_decl" = x"yes"; then -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_RL_EVENT_HOOK 1 --_ACEOF -+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h - -+fi - --else -+for ac_header in stdio.h strings.h ++$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h ++ ++ fi ++ ++ ++for ac_func in strnlen +do : -+ 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" -+eval as_val=\$$as_ac_Header ++ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" ++if test "x$ac_cv_func_strnlen" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_STRNLEN 1 ++_ACEOF ++ ++fi ++done ++ ++for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_RL_EVENT_HOOK 0 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -- - fi - ++fi +done ++ ++ ++# this test disabled as we don't actually need __VA_ARGS__ yet ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++#define eprintf(...) fprintf(stderr, __VA_ARGS__) ++eprintf("bla", "bar"); + +-else +- cat >>confdefs.h <<_ACEOF +-#define HAVE_DECL_RL_EVENT_HOOK 0 + _ACEOF ++if ac_fn_c_try_cpp "$LINENO"; then : + ++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h + + fi ++rm -f conftest.err conftest.$ac_ext + -{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5 -$as_echo_n "checking for history_list in -lreadline... " >&6; } -if test "${ac_cv_lib_readline_history_list+set}" = set; then -- $as_echo_n "(cached) " >&6 -+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default" -+if test "x$ac_cv_have_decl_snprintf" = x""yes; then : -+ ac_have_decl=1 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5 ++$as_echo_n "checking for sig_atomic_t type... " >&6; } ++if test "${libreplace_cv_sig_atomic_t+set}" = set; then : + $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lreadline $TERMLIBS $LIBS" @@ -40599,26 +41069,30 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ ac_have_decl=0 -+fi ++ ++ 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 ++#include ++#if STDC_HEADERS ++#include ++#include + #endif -char history_list (); --int --main () --{ ++#include + int + main () + { -return history_list (); -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_SNPRINTF $ac_have_decl ++sig_atomic_t i = 0 + ; + return 0; + } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -40642,61 +41116,35 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_readline_history_list=yes -+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default" -+if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then : -+ ac_have_decl=1 ++if ac_fn_c_try_compile "$LINENO"; then : ++ libreplace_cv_sig_atomic_t=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_have_decl=0 -+fi - +- - ac_cv_lib_readline_history_list=no -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_VSNPRINTF $ac_have_decl -+_ACEOF -+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default" -+if test "x$ac_cv_have_decl_asprintf" = x""yes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 ++ libreplace_cv_sig_atomic_t=no fi - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ASPRINTF $ac_have_decl -+_ACEOF -+ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default" -+if test "x$ac_cv_have_decl_vasprintf" = x""yes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_history_list" >&5 -$as_echo "$ac_cv_lib_readline_history_list" >&6; } -if test "x$ac_cv_lib_readline_history_list" = x""yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5 ++$as_echo "$libreplace_cv_sig_atomic_t" >&6; } ++if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_HISTORY_LIST 1 -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_VASPRINTF $ac_have_decl -+_ACEOF -+ -+for ac_func in snprintf vsnprintf asprintf vasprintf -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF ++$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h fi -+done -############################################### @@ -40704,9 +41152,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for library containing yp_get_default_domain" >&5 -$as_echo_n "checking for library containing yp_get_default_domain... " >&6; } -if test "${ac_cv_search_yp_get_default_domain+set}" = set; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5 -+$as_echo_n "checking for C99 vsnprintf... " >&6; } -+if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5 ++$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; } ++if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS @@ -40715,23 +41163,29 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ++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 ++#include ++#ifdef HAVE_FCNTL_H ++#include + #endif -char yp_get_default_domain (); --int --main () --{ + int + main () + { -return yp_get_default_domain (); -- ; -- return 0; --} --_ACEOF ++int fd = open("/dev/null", O_DIRECT); + ; + return 0; + } + _ACEOF -for ac_lib in '' nsl; do - if test -z "$ac_lib"; then - ac_res="none required" @@ -40761,31 +41215,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_yp_get_default_domain=$ac_res -+if test "$cross_compiling" = yes; then : -+ libreplace_cv_HAVE_C99_VSNPRINTF=cross - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+#include -+#include -+#include -+#include -+void foo(const char *format, ...) { -+ va_list ap; -+ int len; -+ char buf[20]; -+ long long l = 1234567890; -+ l *= 100; - +- +- -fi -+ va_start(ap, format); -+ len = vsnprintf(buf, 0, format, ap); -+ va_end(ap); -+ if (len != 5) exit(1); - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext @@ -40795,46 +41231,26 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -done -if test "${ac_cv_search_yp_get_default_domain+set}" = set; then - : -+ va_start(ap, format); -+ len = vsnprintf(0, 0, format, ap); -+ va_end(ap); -+ if (len != 5) exit(2); -+ -+ if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3); -+ -+ if (snprintf(buf, 20, "%lld", l) != 12 || strcmp(buf, "123456789000") != 0) exit(4); -+ if (snprintf(buf, 20, "%zu", 123456789) != 9 || strcmp(buf, "123456789") != 0) exit(5); -+ if (snprintf(buf, 20, "%2\$d %1\$d", 3, 4) != 3 || strcmp(buf, "4 3") != 0) exit(6); -+ if (snprintf(buf, 20, "%s", 0) < 3) exit(7); -+ -+ exit(0); -+} -+main() { foo("hello"); } -+ -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ libreplace_cv_HAVE_C99_VSNPRINTF=yes ++if ac_fn_c_try_compile "$LINENO"; then : ++ libreplace_cv_HAVE_OPEN_O_DIRECT=yes else - ac_cv_search_yp_get_default_domain=no -+ libreplace_cv_HAVE_C99_VSNPRINTF=no ++ libreplace_cv_HAVE_OPEN_O_DIRECT=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_yp_get_default_domain" >&5 -$as_echo "$ac_cv_search_yp_get_default_domain" >&6; } -ac_res=$ac_cv_search_yp_get_default_domain -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5 ++$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; } ++if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then + -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_C99_VSNPRINTF" >&5 -+$as_echo "$libreplace_cv_HAVE_C99_VSNPRINTF" >&6; } -+if test x"$libreplace_cv_HAVE_C99_VSNPRINTF" = x"yes"; then -+ -+$as_echo "#define HAVE_C99_VSNPRINTF 1" >>confdefs.h ++$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h fi @@ -40845,874 +41261,120 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 -+$as_echo_n "checking for va_copy... " >&6; } -+if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+va_list ap1,ap2; -+int -+main () -+{ -+va_copy(ap1,ap2); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ libreplace_cv_HAVE_VA_COPY=yes -+else -+ libreplace_cv_HAVE_VA_COPY=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_VA_COPY" >&5 -+$as_echo "$libreplace_cv_HAVE_VA_COPY" >&6; } -+if test x"$libreplace_cv_HAVE_VA_COPY" = x"yes"; then - --#ifdef __STDC__ --# include --#else --# include --#endif -+$as_echo "#define HAVE_VA_COPY 1" >>confdefs.h - --#undef $ac_func -+fi - --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5 -+$as_echo_n "checking for __va_copy... " >&6; } -+if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+va_list ap1,ap2; - int - main () - { --return $ac_func (); -+__va_copy(ap1,ap2); - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_link "$LINENO"; then : -+ libreplace_cv_HAVE___VA_COPY=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" -+ libreplace_cv_HAVE___VA_COPY=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi --done -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE___VA_COPY" >&5 -+$as_echo "$libreplace_cv_HAVE___VA_COPY" >&6; } -+if test x"$libreplace_cv_HAVE___VA_COPY" = x"yes"; then - -+$as_echo "#define HAVE___VA_COPY 1" >>confdefs.h - --# Check if we have execl, if not we need to compile smbrun. -+fi -+fi - --for ac_func in execl --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5 -+$as_echo_n "checking for __FUNCTION__ macro... " >&6; } -+if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include --#else --# include --#endif -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+printf("%s\n", __FUNCTION__); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ libreplace_cv_HAVE_FUNCTION_MACRO=yes -+else -+ libreplace_cv_HAVE_FUNCTION_MACRO=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_FUNCTION_MACRO" >&5 -+$as_echo "$libreplace_cv_HAVE_FUNCTION_MACRO" >&6; } -+if test x"$libreplace_cv_HAVE_FUNCTION_MACRO" = x"yes"; then - --#undef $ac_func -+$as_echo "#define HAVE_FUNCTION_MACRO 1" >>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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5 -+$as_echo_n "checking for __func__ macro... " >&6; } -+if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - int - main () - { --return $ac_func (); -+printf("%s\n", __func__); - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ libreplace_cv_HAVE_func_MACRO=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" -+ libreplace_cv_HAVE_func_MACRO=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_func_MACRO" >&5 -+$as_echo "$libreplace_cv_HAVE_func_MACRO" >&6; } -+ if test x"$libreplace_cv_HAVE_func_MACRO" = x"yes"; then -+ -+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+ fi - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ -+for ac_header in sys/param.h limits.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi --done - --if test x"$ac_cv_func_execl" = x"no"; then -- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)" --fi -+done - - -+ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default" -+if test "x$ac_cv_type_comparison_fn_t" = x""yes; then : - -+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h - -+fi - - - --for ac_func in getcwd fchown chmod fchmod mknod mknod64 --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5 -+$as_echo_n "checking for setenv declaration... " >&6; } -+if test "${ac_cv_have_setenv_decl+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - int - main () - { --return $ac_func (); -+int i = (int)setenv - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_setenv_decl=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" -+ ac_cv_have_setenv_decl=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_setenv_decl" >&5 -+$as_echo "$ac_cv_have_setenv_decl" >&6; } -+ if test x"$ac_cv_have_setenv_decl" = x"yes"; then -+ -+$as_echo "#define HAVE_SETENV_DECL 1" >>confdefs.h -+ -+ fi -+ -+for ac_func in setenv unsetenv -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -39892,99 +9211,56 @@ - done - - --for ac_func in strtol --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5 -+$as_echo_n "checking for environ declaration... " >&6; } -+if test "${ac_cv_have_environ_decl+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - int - main () - { --return $ac_func (); -+int i = (int)environ - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_environ_decl=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" -+ ac_cv_have_environ_decl=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_environ_decl" >&5 -+$as_echo "$ac_cv_have_environ_decl" >&6; } -+ if test x"$ac_cv_have_environ_decl" = x"yes"; then -+ -+$as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h -+ -+ fi -+ -+ -+for ac_func in strnlen -+do : -+ ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -+if test "x$ac_cv_func_strnlen" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STRNLEN 1 -+_ACEOF - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+done -+ -+for ac_func in strtoull __strtoull strtouq strtoll __strtoll strtoq -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -39993,354 +9269,183 @@ - done - - -+# this test disabled as we don't actually need __VA_ARGS__ yet -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+#define eprintf(...) fprintf(stderr, __VA_ARGS__) -+eprintf("bla", "bar"); - --for ac_func in strchr chflags --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+if ac_fn_c_try_cpp "$LINENO"; then : - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h - --#ifdef __STDC__ --# include --#else --# include --#endif -+fi -+rm -f conftest.err conftest.$ac_ext - --#undef $ac_func - --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5 -+$as_echo_n "checking for sig_atomic_t type... " >&6; } -+if test "${libreplace_cv_sig_atomic_t+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+#include -+#if STDC_HEADERS -+#include -+#include -+#endif -+#include - int - main () - { --return $ac_func (); -+sig_atomic_t i = 0 - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ libreplace_cv_sig_atomic_t=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+ libreplace_cv_sig_atomic_t=no - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --done -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_sig_atomic_t" >&5 -+$as_echo "$libreplace_cv_sig_atomic_t" >&6; } -+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then - -+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h - -+fi - - --for ac_func in getrlimit fsync fdatasync setpgid --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5 -+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; } -+if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef $ac_func -+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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me -+#include -+#ifdef HAVE_FCNTL_H -+#include - #endif -- - int - main () - { --return $ac_func (); -+int fd = open("/dev/null", O_DIRECT); - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ libreplace_cv_HAVE_OPEN_O_DIRECT=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" -+ libreplace_cv_HAVE_OPEN_O_DIRECT=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5 -+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; } -+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then -+ -+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h - - fi --done - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5 +$as_echo_n "checking that the C compiler understands volatile... " >&6; } +if test "${libreplace_cv_volatile+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -+int -+main () -+{ + int + main () + { +-return $ac_func (); +volatile int i = 0 -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + libreplace_cv_volatile=yes -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + libreplace_cv_volatile=no -+fi + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +-done +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_volatile" >&5 +$as_echo "$libreplace_cv_volatile" >&6; } +if test x"$libreplace_cv_volatile" = x"yes"; then +$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h +-# Check if we have execl, if not we need to compile smbrun. +fi --for ac_func in setsid glob strpbrk crypt16 getauthuid +-for ac_func in execl -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -41834,28 +41496,38 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -done - +-if test x"$ac_cv_func_execl" = x"no"; then +- EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)" +-fi +- +- + - - - - -- -- -- -- --for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent +-for ac_func in getcwd fchown chmod fchmod mknod mknod64 -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_func_search_save_LIBS=$LIBS ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func @@ -41864,7 +41536,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - +- -#ifdef __STDC__ -# include -#else @@ -41872,21 +41544,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#endif - -#undef $ac_func -+done -+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -+if test $ac_header_dirent = dirent.h; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; 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 -@@ -40348,106 +9453,56 @@ +@@ -39973,100 +9452,56 @@ #ifdef __cplusplus extern "C" #endif @@ -41935,11 +41596,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" @@ -41950,6 +41606,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext ++ if test "${ac_cv_search_opendir+set}" = set; then : ++ break + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -41960,18 +41625,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext -+ if test "${ac_cv_search_opendir+set}" = set; then : -+ break - fi - done ++done +if test "${ac_cv_search_opendir+set}" = set; then : +else + ac_cv_search_opendir=no -+fi + fi +-done +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi @@ -41983,12 +41643,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +fi -- -- -- -- -- --for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf +-for ac_func in strtol -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -42027,7 +41682,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -40455,169 +9510,148 @@ +@@ -40074,268 +9509,148 @@ #ifdef __cplusplus extern "C" #endif @@ -42130,39 +41785,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -+ - done - -+for ac_header in sys/acl.h acl/libacl.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi +-done +- +done - -+# select -+for ac_header in sys/select.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_select_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_SELECT_H 1 -+_ACEOF - -+fi - -+done - - --for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64 +-for ac_func in strchr chflags -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -42172,8 +41800,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+# time -+for ac_header in sys/time.h utime.h ++for ac_header in sys/acl.h acl/libacl.h +do : + 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" @@ -42193,16 +41820,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - +- -#ifdef __STDC__ -# include -#else -# include -#endif -+fi - +- -#undef $ac_func -+done -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -42217,13 +41842,135 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++fi + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++done + +- eval "$as_ac_var=no" +-fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++# select ++for ac_header in sys/select.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_select_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_SYS_SELECT_H 1 + _ACEOF + + fi ++ + done + + ++# time ++for ac_header in sys/time.h utime.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + ++fi + ++done + +-for ac_func in getrlimit fsync fdatasync setpgid +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if test "${ac_cv_header_time+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +#include +#include +#include @@ -42298,7 +42045,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -40626,212 +9660,170 @@ +@@ -40344,425 +9659,311 @@ done @@ -42306,10 +42053,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - - - -- -- -- --for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64 +-for ac_func in setsid glob strpbrk crypt16 getauthuid -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -42450,10 +42194,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then : + $as_echo_n "(cached) " >&6 +else - ++ +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ++ + #ifdef HAVE_SYS_VFS_H + #include + #endif @@ -42467,35 +42211,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + int i; --for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ + ; + return 0; +} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func ++_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no +else + libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=yes --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi @@ -42503,15 +42227,45 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" >&6; } +if test x"$libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS" = x"yes"; then ++$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h + ++fi + +-for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5 ++$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; } ++if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- -#ifdef __STDC__ -# include -#else -# include -#endif -+$as_echo "#define BROKEN_REDHAT_7_SYSTEM_HEADERS 1" >>confdefs.h -#undef $ac_func -+fi ++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 @@ -42526,15 +42280,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5 -+$as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; } -+if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ + #ifdef HAVE_SYS_CAPABILITY_H + #include + #endif @@ -42579,8 +42324,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER=yes -+ -+fi + +- eval "$as_ac_var=no" + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER" >&5 @@ -42589,22 +42335,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + +$as_echo "#define BROKEN_RHEL5_SYS_CAP_HEADER 1" >>confdefs.h -- eval "$as_ac_var=no" - fi -+;; -+esac -+ -+# passwd -+for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -42616,66 +42346,52 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then ++;; ++esac + ++# passwd ++for ac_header in grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi +-done +- +- +- + +done -+ + +for ac_func in getpwnam_r getpwuid_r getpwent_r +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -@@ -40840,205 +9832,139 @@ - done - - -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5 -+$as_echo_n "checking for getpwent_r declaration... " >&6; } -+if test "${ac_cv_have_getpwent_r_decl+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+ #include -+ #include - -+int -+main () -+{ -+int i = (int)getpwent_r -+ ; -+ return 0; -+} ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_getpwent_r_decl=yes -+else -+ ac_cv_have_getpwent_r_decl=no + +fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5 -+$as_echo "$ac_cv_have_getpwent_r_decl" >&6; } -+ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then ++done -+$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h -+ fi - --for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64 +-for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5 -+$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; } -+if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5 ++$as_echo_n "checking for getpwent_r declaration... " >&6; } ++if test "${ac_cv_have_getpwent_r_decl+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -42683,29 +42399,25 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+ $ac_includes_default - +- -#ifdef __STDC__ -# include -#else -# include -#endif -+ #include -+ #include -#undef $ac_func -+ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen) -+ { ++ 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 @@ -42720,20 +42432,17 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+ #ifndef HAVE_GETPWENT_R_DECL -+ #error missing getpwent_r prototype -+ #endif -+ return NULL; -+ -+ } ++ #include ++ #include --int --main () --{ + int + main () + { -return $ac_func (); -- ; -- return 0; --} ++int i = (int)getpwent_r + ; + return 0; + } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -42758,20 +42467,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : -+ -+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes -+ ++ ac_cv_have_getpwent_r_decl=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - eval "$as_ac_var=no" --fi -+ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no - ++ ac_cv_have_getpwent_r_decl=no + fi +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` @@ -42782,27 +42490,68 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getpwent_r_decl" >&5 ++$as_echo "$ac_cv_have_getpwent_r_decl" >&6; } ++ if test x"$ac_cv_have_getpwent_r_decl" = x"yes"; then ++ ++$as_echo "#define HAVE_GETPWENT_R_DECL 1" >>confdefs.h ++ ++ fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5 ++$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; } ++if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++ $ac_includes_default ++ ++ #include ++ #include ++ ++ struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen) ++ { ++ ++ #ifndef HAVE_GETPWENT_R_DECL ++ #error missing getpwent_r prototype ++ #endif ++ return NULL; ++ ++ } ++ + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + +-fi +-done ++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes + ++else ++ ++ ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no + ++fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --done ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5 +$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; } +if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then : --for ac_func in getpwent_r ++$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h + + ++fi + +-for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64 -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h -+ -+ -+fi -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5 +$as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; } +if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then : @@ -42931,19 +42680,55 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -41047,345 +9973,221 @@ +@@ -40771,356 +9972,221 @@ done --for ac_func in getdents64 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5 ++$as_echo_n "checking for getgrent_r declaration... " >&6; } ++if test "${ac_cv_have_getgrent_r_decl+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else + ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + ++ #include ++ #include + ++int ++main () ++{ ++int i = (int)getgrent_r ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_have_getgrent_r_decl=yes ++else ++ ac_cv_have_getgrent_r_decl=no ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5 ++$as_echo "$ac_cv_have_getgrent_r_decl" >&6; } ++ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then + ++$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h + ++ fi + +- +-for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64 -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5 -+$as_echo_n "checking for getgrent_r declaration... " >&6; } -+if test "${ac_cv_have_getgrent_r_decl+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5 ++$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; } ++if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -42951,25 +42736,29 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++ $ac_includes_default + -#ifdef __STDC__ -# include -#else -# include -#endif ++ #include ++ #include -#undef $ac_func -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ ++ struct group *getgrent_r(struct group *src, char *buf, int buflen) ++ { -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -42984,17 +42773,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+ #include -+ #include ++ #ifndef HAVE_GETGRENT_R_DECL ++ #error missing getgrent_r prototype ++ #endif ++ return NULL; ++ ++ } - int - main () - { +-int +-main () +-{ -return $ac_func (); -+int i = (int)getgrent_r - ; - return 0; - } +- ; +- return 0; +-} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" @@ -43019,19 +42811,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - }; then - eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_have_getgrent_r_decl=yes ++ ++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes ++ else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - eval "$as_ac_var=no" -+ ac_cv_have_getgrent_r_decl=no - fi -- +-fi ++ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` @@ -43042,51 +42835,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_getgrent_r_decl" >&5 -+$as_echo "$ac_cv_have_getgrent_r_decl" >&6; } -+ if test x"$ac_cv_have_getgrent_r_decl" = x"yes"; then -+ -+$as_echo "#define HAVE_GETGRENT_R_DECL 1" >>confdefs.h -+ -+ fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5 -+$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; } -+if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+ $ac_includes_default -+ -+ #include -+ #include -+ -+ struct group *getgrent_r(struct group *src, char *buf, int buflen) -+ { -+ -+ #ifndef HAVE_GETGRENT_R_DECL -+ #error missing getgrent_r prototype -+ #endif -+ return NULL; -+ -+ } -+ - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes -+ -+else -+ -+ ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no +-_ACEOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -done -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -+fi +- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5 +$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; } +if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then : @@ -43095,15 +42849,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h --for ac_func in setenv strcasecmp fcvt fcvtl ++fi + + +-for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+fi -+ -+ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5 +$as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; } +if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then : @@ -43197,10 +42951,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" +-fi + ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no -+ - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ @@ -43213,29 +42965,63 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-done +- +- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5 +$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; } +if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then : -+ -+ + + +$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h -+ -+ + + +fi -+ + +-for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64 +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +for ac_func in getgrouplist +do : + ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist" +if test "x$ac_cv_func_getgrouplist" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++ cat >>confdefs.h <<_ACEOF +#define HAVE_GETGROUPLIST 1 _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func - fi - done +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++fi ++done +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +-#undef $ac_func +# locale +for ac_header in ctype.h locale.h langinfo.h +do : @@ -43247,49 +43033,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -+fi - --for ac_func in syslog vsyslog timegm --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -+done - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ - --#ifdef __STDC__ --# include --#else --# include --#endif -+# glob -+for ac_header in fnmatch.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default" -+if test "x$ac_cv_header_fnmatch_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_FNMATCH_H 1 -+_ACEOF - --#undef $ac_func -+fi - -/* 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. */ @@ -43303,6 +43046,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++fi ++ +done -int @@ -43312,17 +43057,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - ; - return 0; -} -+ -+# shmem -+for ac_header in sys/ipc.h sys/mman.h sys/shm.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -43350,12 +43085,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - eval "$as_ac_var=no" - fi +-fi ++# glob ++for ac_header in fnmatch.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default" ++if test "x$ac_cv_header_fnmatch_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_FNMATCH_H 1 ++_ACEOF -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -43363,11 +43106,12 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then ++ +done + + -+# terminal -+for ac_header in termios.h termio.h sys/termio.h ++# shmem ++for ac_header in sys/ipc.h sys/mman.h sys/shm.h +do : + 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" @@ -43383,50 +43127,65 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done - --for ac_func in setlocale nl_langinfo +-for ac_func in getpwent_r -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+save_LIBS="$LIBS" -+LIBS="" -+ -+libreplace_cv_dlfcn=no -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 -+$as_echo_n "checking for library containing dlopen... " >&6; } -+if test "${ac_cv_search_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++# terminal ++for ac_header in termios.h termio.h sys/termio.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_func_search_save_LIBS=$LIBS -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++fi + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++done ++ ++ ++ ++save_LIBS="$LIBS" ++LIBS="" + -#undef $ac_func ++libreplace_cv_dlfcn=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 ++$as_echo_n "checking for library containing dlopen... " >&6; } ++if test "${ac_cv_search_dlopen+set}" = set; 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 -@@ -41393,100 +10195,85 @@ +@@ -41128,100 +10194,85 @@ #ifdef __cplusplus extern "C" #endif @@ -43544,7 +43303,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done --for ac_func in nanosleep +-for ac_func in getdents64 -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -43583,7 +43342,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -41494,966 +10281,612 @@ +@@ -41229,1071 +10280,638 @@ #ifdef __cplusplus extern "C" #endif @@ -43627,6 +43386,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +for ac_lib in '' sl; do + if test -z "$ac_lib"; then + ac_res="none required" @@ -43644,12 +43406,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +fi +done +if test "${ac_cv_search_shl_load+set}" = set; then : -+ - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" ++else + ac_cv_search_shl_load=no -+fi + fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi @@ -43659,20 +43420,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- eval "$as_ac_var=no" - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+for ac_header in dl.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -+if test "x$ac_cv_header_dl_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_DL_H 1 -+_ACEOF -+ fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` @@ -43682,55 +43432,74 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + ++for ac_header in dl.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" ++if test "x$ac_cv_header_dl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_DL_H 1 + _ACEOF + + fi +-done + +done -+ + +for ac_func in shl_load shl_unload shl_findsym +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF - else ++else + libreplace_cv_shl=yes +fi +done +-for ac_func in setenv strcasecmp fcvt fcvtl +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5 +$as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; } +if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_check_lib_ext_save_LIBS=$LIBS --LIBS="-lrt $LIBS $LIBS" -+ $ac_includes_default - -+ #include - -+ void *dlopen(const char* filename, unsigned int flags) -+ { - -+ return 0; - -- { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 --$as_echo_n "checking for nanosleep in -lrt... " >&6; } --if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then -- $as_echo_n "(cached) " >&6 --else + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ } ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++ $ac_includes_default + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++ #include + +-#undef $ac_func ++ void *dlopen(const char* filename, unsigned int flags) ++ { -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -43738,11 +43507,21 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#ifdef __cplusplus -extern "C" -#endif --char nanosleep (); +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++ return 0; ++ ++ } + -int -main () -{ --return nanosleep (); +-return $ac_func (); - ; - return 0; -} @@ -43768,8 +43547,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_ext_rt_nanosleep=yes; -- ac_cv_lib_ext_rt=yes +- eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes @@ -43778,23 +43556,25 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ac_cv_lib_ext_rt_nanosleep=no; -- ac_cv_lib_ext_rt=no --fi +- eval "$as_ac_var=no" + ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no ++ + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5 --$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; } -- if test $ac_cv_lib_ext_rt_nanosleep = yes; then +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define HAVE_NANOSLEEP 1 +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5 +$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; } @@ -43805,42 +43585,16 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + fi +-done --LIBS=$ac_check_lib_ext_save_LIBS --if test $ac_cv_lib_ext_rt = yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBRT 1 --_ACEOF +if test x"${libreplace_cv_dlfcn}" = x"yes";then + LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o" +fi -- case "$LIBS" in -- *-lrt*) -- ;; -- *) -- LIBS="-lrt $LIBS" -- ;; -- esac +LIBDL="$LIBS" -+LIBS="$save_LIBS" - -+ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass" -+if test "x$ac_cv_func_getpass" = x""yes; then : -+ libreplace_cv_HAVE_GETPASS=yes - fi - -+ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase" -+if test "x$ac_cv_func_getpassphrase" = x""yes; then : -+ libreplace_cv_HAVE_GETPASSPHRASE=yes - fi --done - -+if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then - --for ac_func in utimensat +-for ac_func in syslog vsyslog timegm -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -43857,23 +43611,29 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -+$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h ++LIBS="$save_LIBS" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ ++ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass" ++if test "x$ac_cv_func_getpass" = x""yes; then : ++ libreplace_cv_HAVE_GETPASS=yes ++fi -#ifdef __STDC__ -# include -#else -# include -#endif -+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h ++ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase" ++if test "x$ac_cv_func_getpassphrase" = x""yes; then : ++ libreplace_cv_HAVE_GETPASSPHRASE=yes ++fi -#undef $ac_func -+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o" -+else ++if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -43888,6 +43648,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h ++ ++ ++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h ++ ++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o" ++else ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5 +$as_echo_n "checking whether getpass should be replaced... " >&6; } +if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then : @@ -43964,89 +43732,53 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "$libreplace_cv_REPLACE_GETPASS" >&6; } +if test x"$libreplace_cv_REPLACE_GETPASS" = x"yes"; then -+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h -+ -+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o" - fi +-fi -done ++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h + ++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o" ++fi +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5 -+$as_echo_n "checking whether strptime is available and works... " >&6; } -+if test "${libreplace_cv_STRPTIME_OK+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - -+ if test "$cross_compiling" = yes; then : -+ libreplace_cv_STRPTIME_OK="assuming not" -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME -+ #include "$libreplacedir/test/strptime.c" - --for ac_func in mlock munlock mlockall munlockall +-for ac_func in setlocale nl_langinfo -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ libreplace_cv_STRPTIME_OK=yes ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5 ++$as_echo_n "checking whether strptime is available and works... " >&6; } ++if test "${libreplace_cv_STRPTIME_OK+set}" = set; then : + $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+ libreplace_cv_STRPTIME_OK=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5 -+$as_echo "$libreplace_cv_STRPTIME_OK" >&6; } -+if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then -+ -+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h -+ -+ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o" -+fi -+ -+for ac_header in direct.h windows.h winsock2.h ws2tcpip.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+fi - +- -#ifdef __STDC__ -# include -#else -# include -#endif -+done -#undef $ac_func ++ if test "$cross_compiling" = yes; then : ++ libreplace_cv_STRPTIME_OK="assuming not" ++else ++ 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 @@ -44061,15 +43793,138 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++ #define LIBREPLACE_CONFIGURE_TEST_STRPTIME ++ #include "$libreplacedir/test/strptime.c" + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_run "$LINENO"; then : ++ libreplace_cv_STRPTIME_OK=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ libreplace_cv_STRPTIME_OK=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ + +- eval "$as_ac_var=no" + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_STRPTIME_OK" >&5 ++$as_echo "$libreplace_cv_STRPTIME_OK" >&6; } ++if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then ++ ++$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext ++ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o" + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++ ++for ac_header in direct.h windows.h winsock2.h ws2tcpip.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + + fi ++ + done + + +-for ac_func in nanosleep +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +####################################### +# Check for mkdir mode +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5 +$as_echo_n "checking whether mkdir supports mode... " >&6; } +if test "${libreplace_cv_mkdir_has_mode+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $ac_func +- +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + #include + #ifdef HAVE_DIRECT_H @@ -44149,44 +44004,24 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#define HAVE_TIMEGM 1 _ACEOF -+else + else + LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o" - fi - done - - -- -- --for ac_func in memalign posix_memalign hstrerror --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++fi ++done ++ ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5 +$as_echo_n "checking for broken readdir... " >&6; } +if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ++ $as_echo_n "(cached) " >&6 ++else + + if test "$cross_compiling" = yes; then : + libreplace_cv_READDIR_NEEDED="assuming not" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func ++/* end confdefs.h. */ --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ +#define test_readdir_os2_delete main +#include "$libreplacedir/test/os2_delete.c" +_ACEOF @@ -44199,30 +44034,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi --#ifdef __STDC__ --# include --#else --# include --#endif +-ac_check_lib_ext_save_LIBS=$LIBS +-LIBS="-lrt $LIBS $LIBS" --#undef $ac_func +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_NEEDED" >&5 +$as_echo "$libreplace_cv_READDIR_NEEDED" >&6; } --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif +for ac_func in dirfd +do : + ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd" @@ -44230,24 +44048,40 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + cat >>confdefs.h <<_ACEOF +#define HAVE_DIRFD 1 +_ACEOF -+ + +fi +done -+ + +- { $as_echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5 +-$as_echo_n "checking for nanosleep in -lrt... " >&6; } +-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5 +$as_echo_n "checking for dirfd declaration... " >&6; } +if test "${ac_cv_have_dirfd_decl+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* 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 nanosleep (); + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { --return $ac_func (); +-return nanosleep (); +int i = (int)dirfd ; return 0; @@ -44274,37 +44108,42 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- eval "$as_ac_var=yes" +- ac_cv_lib_ext_rt_nanosleep=yes; +- ac_cv_lib_ext_rt=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_have_dirfd_decl=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_var=no" +- ac_cv_lib_ext_rt_nanosleep=no; +- ac_cv_lib_ext_rt=no + ac_cv_have_dirfd_decl=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_rt_nanosleep" >&5 +-$as_echo "$ac_cv_lib_ext_rt_nanosleep" >&6; } +- if test $ac_cv_lib_ext_rt_nanosleep = yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_NANOSLEEP 1 +-_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_dirfd_decl" >&5 +$as_echo "$ac_cv_have_dirfd_decl" >&6; } + if test x"$ac_cv_have_dirfd_decl" = x"yes"; then -+ + +-fi +$as_echo "#define HAVE_DIRFD_DECL 1" >>confdefs.h -+ + +-LIBS=$ac_check_lib_ext_save_LIBS + fi -+ + +-if test $ac_cv_lib_ext_rt = yes; then + +# +# try to replace with getdirentries() if needed @@ -44315,53 +44154,98 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries" +if test "x$ac_cv_func_getdirentries" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-#define HAVE_LIBRT 1 +#define HAVE_GETDIRENTRIES 1 _ACEOF +- case "$LIBS" in +- *-lrt*) +- ;; +- *) +- LIBS="-lrt $LIBS" +- ;; +- esac +- +- +-fi +- fi done - --for ac_header in sys/mman.h +-for ac_func in utimensat -do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5 +$as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; } +if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then : $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF +- cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++ $ac_includes_default + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++ #include + +-#undef $ac_func ++ long telldir(const DIR *dir) ++ { + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++ return 0; ++ ++ } + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 +- (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 @@ -44370,142 +44254,57 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no --fi -+ $ac_includes_default - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+ #include - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err +- } && test -s conftest$ac_exeext && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext - }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ long telldir(const DIR *dir) -+ { - -- ac_header_preproc=no --fi -+ return 0; - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+ } -+ -+_ACEOF +- eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------------------- ## --## Report this to samba-technical@samba.org ## --## ---------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 ++ else -- eval "$as_ac_Header=\$ac_header_preproc" +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" -fi --ac_res=`eval 'as_val=${'$as_ac_Header'} ++ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+ -+ ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} +-as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +-done +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5 +$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; } +if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then : --done --# setbuffer, shmget, shm_open are needed for smbtorture +$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h --for ac_func in shmget shm_open ++fi + +-for ac_func in mlock munlock mlockall munlockall -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+fi -+ + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5 +$as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; } @@ -44624,13 +44423,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h --for ac_func in gettext dgettext + +-for ac_func in memalign posix_memalign hstrerror -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5 @@ -44771,19 +44570,27 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done - -- --for ac_func in bindtextdomain textdomain +-for ac_header in sys/mman.h -do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5 +$as_echo_n "checking for replacing readdir using getdents()... " >&6; } +if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then : $as_echo_n "(cached) " >&6 +-fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } else -- cat >conftest.$ac_ext <<_ACEOF +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext @@ -44797,75 +44604,24 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ +-$ac_includes_default +-#include <$ac_header> ++ +#define _LIBREPLACE_REPLACE_H +#error _donot_use_getdents_replacement_anymore +#include "$libreplacedir/repdir_getdents.c" +#define test_readdir_os2_delete main +#include "$libreplacedir/test/os2_delete.c" -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ libreplace_cv_READDIR_GETDENTS=yes -+else -+ libreplace_cv_READDIR_GETDENTS=no -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi - --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef $ac_func -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5 -+$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; } -+fi -+if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then -+ -+$as_echo "#define REPLACE_READDIR 1" >>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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 +- (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 @@ -44874,24 +44630,110 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext +- } && test -s conftest.$ac_objext; then +- ac_header_compiler=yes ++if ac_fn_c_try_run "$LINENO"; then : ++ libreplace_cv_READDIR_GETDENTS=yes + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ libreplace_cv_READDIR_GETDENTS=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ + +- ac_header_compiler=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDENTS" >&5 ++$as_echo "$libreplace_cv_READDIR_GETDENTS" >&6; } ++fi ++if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } ++$as_echo "#define REPLACE_READDIR 1" >>confdefs.h + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err - }; then -- eval "$as_ac_var=yes" +- ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_preproc=no +-fi +$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h -- eval "$as_ac_var=no" +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } + LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o" + libreplace_cv_READDIR_NEEDED=no - fi ++fi --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------- ## +-## Report this to samba-technical@samba.org ## +-## ---------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking a usable readdir()" >&5 +$as_echo_n "checking a usable readdir()... " >&6; } +if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then @@ -44899,18 +44741,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the provided readdir() is broken" >&5 +$as_echo "$as_me: WARNING: the provided readdir() is broken" >&2;} -+else + else +- eval "$as_ac_Header=\$ac_header_preproc" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi --ac_res=`eval 'as_val=${'$as_ac_var'} +-ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ +############################################### +# test for where we get crypt() from +for ac_header in crypt.h @@ -44918,16 +44762,18 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default" +if test "x$ac_cv_header_crypt_h" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_CRYPT_H 1 _ACEOF fi --done -+done + done --for ac_func in strupr +-# setbuffer, shmget, shm_open are needed for smbtorture +- +- +-for ac_func in shmget shm_open -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -44947,27 +44793,51 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef $ac_func +ac_func_search_ext_save_LIBS=$LIBS +ac_cv_search_ext_crypt=no +cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + +-#ifdef __STDC__ +-# include +-#else +-# include ++/* 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 +- +-#undef $ac_func ++char crypt (); ++int ++main () ++{ ++return crypt (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_ext_crypt="none required" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++if test "$ac_cv_search_ext_crypt" = no; then ++ for ac_lib in crypt; do ++ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_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 -@@ -42461,216 +10894,170 @@ +@@ -42301,1380 +10919,665 @@ #ifdef __cplusplus extern "C" #endif @@ -45014,33 +44884,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_ext_crypt="none required" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test "$ac_cv_search_ext_crypt" = no; then -+ for ac_lib in crypt; do -+ LIBS="-l$ac_lib $CRYPT_LIBS $ac_func_search_save_ext_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - +- - eval "$as_ac_var=no" -+/* 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 crypt (); -+int -+main () -+{ -+return crypt (); -+ ; -+ return 0; -+} -+_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_ext_crypt="-l$ac_lib" +break @@ -45048,19 +44893,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done -+fi -+LIBS=$ac_func_search_ext_save_LIBS fi ++LIBS=$ac_func_search_ext_save_LIBS ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_crypt" >&5 +$as_echo "$ac_cv_search_ext_crypt" >&6; } +if test "$ac_cv_search_ext_crypt" != no; then : + test "$ac_cv_search_ext_crypt" = "none required" || CRYPT_LIBS="$ac_cv_search_ext_crypt $CRYPT_LIBS" -+ -+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext ++$as_echo "#define HAVE_CRYPT 1" >>confdefs.h ++ +else + LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o" fi @@ -45089,51 +44934,71 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done --# Find a method of generating a stack trace -- +echo "LIBREPLACE_BROKEN_CHECKS: END" +-for ac_func in gettext dgettext +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +for ac_func in syslog +do : + ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog" +if test "x$ac_cv_func_syslog" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYSLOG 1 -+_ACEOF - --for ac_header in execinfo.h libexc.h libunwind.h --do --as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } - else -- # Is the header compilable? --{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 --$as_echo_n "checking $ac_header usability... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++else + as_fn_error "Required function not found" "$LINENO" 5 +fi +done -+ -+ + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func +echo "LIBREPLACE_NETWORK_CHECKS: START" -+ -+ + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif + +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +$as_echo "#define LIBREPLACE_NETWORK_CHECKS 1" >>confdefs.h + +LIBREPLACE_NETWORK_OBJS="" @@ -45148,236 +45013,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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_header_compiler=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --$as_echo "$ac_header_compiler" >&6; } -+done - --# Is the header present? --{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 --$as_echo_n "checking $ac_header presence... " >&6; } --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> -+for ac_header in netinet/in_systm.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default" -+if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_NETINET_IN_SYSTM_H 1 - _ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then -- ac_header_preproc=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no - fi - --rm -f conftest.err conftest.$ac_ext --{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --$as_echo "$ac_header_preproc" >&6; } -+done -+ -+for ac_header in netinet/ip.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" " -+ #include -+ #ifdef HAVE_NETINET_IN_H -+ #include -+ #endif -+ #ifdef HAVE_NETINET_IN_SYSTM_H -+ #include -+ #endif -+ -+" -+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_NETINET_IP_H 1 -+_ACEOF - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( cat <<\_ASBOX --## ---------------------------------------- ## --## Report this to samba-technical@samba.org ## --## ---------------------------------------- ## --_ASBOX -- ) | sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 --$as_echo_n "checking for $ac_header... " >&6; } --if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -+ -+done -+ -+for ac_header in netinet/tcp.h netinet/in_ip.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+ -+done -+ -+for ac_header in sys/sockio.h sys/un.h -+do : -+ 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" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -42679,857 +11066,519 @@ - - done - --# libexecinfo provides backtrace_symbols on FreeBSD --{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5 --$as_echo_n "checking for library containing backtrace_symbols... " >&6; } --if test "${ac_cv_search_backtrace_symbols+set}" = set; then -+for ac_header in sys/uio.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_uio_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_UIO_H 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5 -+$as_echo_n "checking for usable net/if.h... " >&6; } -+if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- ac_func_search_save_LIBS=$LIBS --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ -+ 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 backtrace_symbols (); --int --main () --{ --return backtrace_symbols (); -- ; -- return 0; --} -+ $ac_includes_default -+ #if HAVE_SYS_SOCKET_H -+ # include -+ #endif -+ #include -+ int main(void) {return 0;} - _ACEOF --for ac_lib in '' execinfo; 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 -- rm -f conftest.$ac_objext conftest$ac_exeext +-rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -45398,84 +45034,98 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_search_backtrace_symbols=$ac_res -+if ac_fn_c_try_compile "$LINENO"; then : -+ libreplace_cv_USABLE_NET_IF_H=yes - else +- eval "$as_ac_var=yes" +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -+ libreplace_cv_USABLE_NET_IF_H=no +- eval "$as_ac_var=no" fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext -- if test "${ac_cv_search_backtrace_symbols+set}" = set; then -- break +- conftest$ac_exeext conftest.$ac_ext -fi --done --if test "${ac_cv_search_backtrace_symbols+set}" = set; then -- : --else -- ac_cv_search_backtrace_symbols=no --fi --rm conftest.$ac_ext --LIBS=$ac_func_search_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5 --$as_echo "$ac_cv_search_backtrace_symbols" >&6; } --ac_res=$ac_cv_search_backtrace_symbols --if test "$ac_res" != no; then -- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5 -+$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; } -+if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++done + -+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h ++for ac_header in netinet/in_systm.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default" ++if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_NETINET_IN_SYSTM_H 1 + _ACEOF fi +-done ++done --for ac_func in backtrace_symbols ++for ac_header in netinet/ip.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" " ++ #include ++ #ifdef HAVE_NETINET_IN_H ++ #include ++ #endif ++ #ifdef HAVE_NETINET_IN_SYSTM_H ++ #include ++ #endif + +-for ac_func in bindtextdomain textdomain -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ -+cv=`echo "socklen_t" | sed 'y%./+- %__p__%'` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 -+$as_echo_n "checking for socklen_t... " >&6; } -+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++" ++if test "x$ac_cv_header_netinet_ip_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_NETINET_IP_H 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -- ++fi + -#ifdef __STDC__ -# include -#else -# include -#endif -- ++done + -#undef $ac_func -- ++for ac_header in netinet/tcp.h netinet/in_ip.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + -/* 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. */ @@ -45489,7 +45139,164 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif ++fi +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} +-_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++done ++ ++for ac_header in sys/sockio.h sys/un.h ++do : ++ 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" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +- eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then ++done ++ ++for ac_header in sys/uio.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default" ++if test "x$ac_cv_header_sys_uio_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#define HAVE_SYS_UIO_H 1 + _ACEOF + + fi ++ + done + + +-for ac_func in strupr +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5 ++$as_echo_n "checking for usable net/if.h... " >&6; } ++if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++ $ac_includes_default ++ #if HAVE_SYS_SOCKET_H ++ # include ++ #endif ++ #include ++ int main(void) {return 0;} ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ libreplace_cv_USABLE_NET_IF_H=yes ++else ++ libreplace_cv_USABLE_NET_IF_H=no + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-#undef $ac_func ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_USABLE_NET_IF_H" >&5 ++$as_echo "$libreplace_cv_USABLE_NET_IF_H" >&6; } ++if test x"$libreplace_cv_USABLE_NET_IF_H" = x"yes";then + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h + ++fi ++ ++ ++ ++cv=`echo "socklen_t" | sed 'y%./+- %__p__%'` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5 ++$as_echo_n "checking for socklen_t... " >&6; } ++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ +$ac_includes_default +#include int @@ -45528,10 +45335,25 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" + eval "ac_cv_type_$cv=no" -+fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +ac_foo=`eval echo \\$ac_cv_type_$cv` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 +$as_echo "$ac_foo" >&6; } @@ -45543,286 +45365,33 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + +cat >>confdefs.h <<_ACEOF +#define HAVE_SOCKLEN_T 1 -+_ACEOF -+ - -- eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+ -+cat >>confdefs.h <<_ACEOF -+#define $ac_tr_hdr 1 _ACEOF ++ fi -done - --{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5 --$as_echo_n "checking for trace_back_stack in -lexc... " >&6; } --if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then -+ -+cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5 -+$as_echo_n "checking for sa_family_t... " >&6; } -+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lexc $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ 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 trace_back_stack (); -+$ac_includes_default -+#include - int - main () - { --return trace_back_stack (); -+sa_family_t foo; - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- ac_cv_lib_exc_trace_back_stack=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "ac_cv_type_$cv=yes" - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_lib_exc_trace_back_stack=no -+ eval "ac_cv_type_$cv=no" - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5 --$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; } --if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBEXC 1 -+ac_foo=`eval echo \\$ac_cv_type_$cv` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 -+$as_echo "$ac_foo" >&6; } -+if test "$ac_foo" = yes; then -+ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` -+if false; then -+ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default" -+if test "x$ac_cv_type_sa_family_t" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_SA_FAMILY_T 1 - _ACEOF - -- LIBS="-lexc $LIBS" - - fi - +fi --# check for sysctlbyname for BSD systems -- --for ac_func in sysctlbyname --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ +-# Find a method of generating a stack trace +cat >>confdefs.h <<_ACEOF +#define $ac_tr_hdr 1 - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+fi - --#ifdef __STDC__ --# include --#else --# include --#endif - --#undef $ac_func - --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -+cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5 -+$as_echo_n "checking for struct addrinfo... " >&6; } -+if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+$ac_includes_default -+#include - int - main () - { --return $ac_func (); -+struct addrinfo foo; - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "ac_cv_type_$cv=yes" - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ eval "ac_cv_type_$cv=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ac_foo=`eval echo \\$ac_cv_type_$cv` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 -+$as_echo "$ac_foo" >&6; } -+if test "$ac_foo" = yes; then -+ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` -+if false; then -+ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default" -+if test "x$ac_cv_type_struct_addrinfo" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_ADDRINFO 1 +_ACEOF + - -- eval "$as_ac_var=no" - fi - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+ -+cat >>confdefs.h <<_ACEOF -+#define $ac_tr_hdr 1 - _ACEOF - - fi --done ++fi --############################# --# check if building with gpfs --for ac_header in gpfs_gpl.h +-for ac_header in execinfo.h libexc.h libunwind.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5 -+$as_echo_n "checking for struct sockaddr... " >&6; } ++cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5 ++$as_echo_n "checking for sa_family_t... " >&6; } +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 -fi @@ -45848,7 +45417,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +int +main () +{ -+struct sockaddr foo; ++sa_family_t foo; + ; + return 0; +} @@ -45890,31 +45459,23 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 +$as_echo "$ac_foo" >&6; } +if test "$ac_foo" = yes; then -+ ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` ++ ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` +if false; then -+ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default" -+if test "x$ac_cv_type_struct_sockaddr" = x""yes; then : ++ ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default" ++if test "x$ac_cv_type_sa_family_t" = x""yes; then : -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_SOCKADDR 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ -+ -+fi -+ -+fi -+ +cat >>confdefs.h <<_ACEOF -+#define $ac_tr_hdr 1 ++#define HAVE_SA_FAMILY_T 1 _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in @@ -45937,9 +45498,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_preproc=no - fi +-fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 @@ -45978,6 +45539,285 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + + fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++ ++cat >>confdefs.h <<_ACEOF ++#define $ac_tr_hdr 1 + _ACEOF + + fi + +-done + +-# libexecinfo provides backtrace_symbols on FreeBSD +-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace_symbols" >&5 +-$as_echo_n "checking for library containing backtrace_symbols... " >&6; } +-if test "${ac_cv_search_backtrace_symbols+set}" = set; then ++ ++cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5 ++$as_echo_n "checking for struct addrinfo... " >&6; } ++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else +- ac_func_search_save_LIBS=$LIBS +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++ 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 backtrace_symbols (); ++$ac_includes_default ++#include + int + main () + { +-return backtrace_symbols (); ++struct addrinfo foo; + ; + return 0; + } + _ACEOF +-for ac_lib in '' execinfo; 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 +- 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_search_backtrace_symbols=$ac_res ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "ac_cv_type_$cv=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ eval "ac_cv_type_$cv=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_foo=`eval echo \\$ac_cv_type_$cv` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 ++$as_echo "$ac_foo" >&6; } ++if test "$ac_foo" = yes; then ++ ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` ++if false; then ++ ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default" ++if test "x$ac_cv_type_struct_addrinfo" = x""yes; then : + ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_ADDRINFO 1 ++_ACEOF + +-fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext +- if test "${ac_cv_search_backtrace_symbols+set}" = set; then +- break +-fi +-done +-if test "${ac_cv_search_backtrace_symbols+set}" = set; then +- : +-else +- ac_cv_search_backtrace_symbols=no +-fi +-rm conftest.$ac_ext +-LIBS=$ac_func_search_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_backtrace_symbols" >&5 +-$as_echo "$ac_cv_search_backtrace_symbols" >&6; } +-ac_res=$ac_cv_search_backtrace_symbols +-if test "$ac_res" != no; then +- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + fi + +- +-for ac_func in backtrace_symbols +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ ++cat >>confdefs.h <<_ACEOF ++#define $ac_tr_hdr 1 + _ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func + +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ ++fi + +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5 ++$as_echo_n "checking for struct sockaddr... " >&6; } ++if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + ++$ac_includes_default ++#include + int + main () + { +-return $ac_func (); ++struct sockaddr foo; + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "ac_cv_type_$cv=yes" + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++ eval "ac_cv_type_$cv=no" ++fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_foo=`eval echo \\$ac_cv_type_$cv` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 ++$as_echo "$ac_foo" >&6; } ++if test "$ac_foo" = yes; then ++ ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'` ++if false; then ++ ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default" ++if test "x$ac_cv_type_struct_sockaddr" = x""yes; then : ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_SOCKADDR 1 ++_ACEOF ++ + +- eval "$as_ac_var=no" + fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++ ++cat >>confdefs.h <<_ACEOF ++#define $ac_tr_hdr 1 + _ACEOF + + fi +-done + + +-{ $as_echo "$as_me:$LINENO: checking for trace_back_stack in -lexc" >&5 +-$as_echo_n "checking for trace_back_stack in -lexc... " >&6; } +-if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then + +cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 @@ -45985,41 +45825,69 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else -- eval "$as_ac_Header=\$ac_header_preproc" +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lexc $LIBS" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ + /* 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 trace_back_stack (); +$ac_includes_default + +#include +#include +#include + -+int -+main () -+{ + int + main () + { +-return trace_back_stack (); +struct sockaddr_storage foo; -+ ; -+ return 0; -+} -+_ACEOF + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- ac_cv_lib_exc_trace_back_stack=yes +if ac_fn_c_try_compile "$LINENO"; then : + eval "ac_cv_type_$cv=yes" -+else + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + eval "ac_cv_type_$cv=no" - fi --ac_res=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } -- ++fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --as_val=`eval 'as_val=${'$as_ac_Header'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++fi +ac_foo=`eval echo \\$ac_cv_type_$cv` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 +$as_echo "$ac_foo" >&6; } @@ -46031,57 +45899,92 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_STORAGE 1 - _ACEOF ++_ACEOF ++ --fi - --done -+fi - --if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then -+fi - --cat >>confdefs.h <<\_ACEOF --#define HAVE_GPFS 1 -+cat >>confdefs.h <<_ACEOF -+#define $ac_tr_hdr 1 - _ACEOF - -- default_shared_modules="$default_shared_modules vfs_gpfs" +- ac_cv_lib_exc_trace_back_stack=no fi --############################################# --# check if building on Isilon OneFS --printf "%s" "checking for Isilon OneFS... " --save_LIBS="$LIBS" --LIBS="$LIBS -lisi_version" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exc_trace_back_stack" >&5 +-$as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; } +-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBEXC 1 -_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ -+ + +- LIBS="-lexc $LIBS" ++cat >>confdefs.h <<_ACEOF ++#define $ac_tr_hdr 1 ++_ACEOF + + fi + + +-# check for sysctlbyname for BSD systems + +-for ac_func in sysctlbyname +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5 +$as_echo_n "checking for struct sockaddr_in6... " >&6; } +if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --#include -+ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func +$ac_includes_default -+ + +-/* 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +#include +#include +#include -+ + int main () { --get_isilon_copyright() +-return $ac_func (); +struct sockaddr_in6 foo; ; return 0; @@ -46108,16 +46011,32 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- samba_cv_HAVE_ONEFS=yes +- eval "$as_ac_var=yes" +if ac_fn_c_try_compile "$LINENO"; then : + eval "ac_cv_type_$cv=yes" else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +- +- eval "$as_ac_var=no" + eval "ac_cv_type_$cv=no" -+fi + fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +ac_foo=`eval echo \\$ac_cv_type_$cv` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5 +$as_echo "$ac_foo" >&6; } @@ -46126,27 +46045,275 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +if false; then + ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default" +if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then : -+ + +-fi +-done +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_IN6 1 +_ACEOF + + +-############################# +-# check if building with gpfs ++fi + +-for ac_header in gpfs_gpl.h +-do +-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-else +- # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +-$as_echo_n "checking $ac_header usability... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-#include <$ac_header> + ++cat >>confdefs.h <<_ACEOF ++#define $ac_tr_hdr 1 + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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_header_compiler=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_header_compiler=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-$as_echo "$ac_header_compiler" >&6; } + +-# Is the header present? +-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +-$as_echo_n "checking $ac_header presence... " >&6; } +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <$ac_header> +-_ACEOF +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then +- ac_header_preproc=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then ++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" " ++#include ++#include ++#include + +- ac_header_preproc=no +-fi ++" ++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then : + +-rm -f conftest.err conftest.$ac_ext +-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-$as_echo "$ac_header_preproc" >&6; } ++$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h + +-# So? What about this header? +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} +- ( cat <<\_ASBOX +-## ---------------------------------------- ## +-## Report this to samba-technical@samba.org ## +-## ---------------------------------------- ## +-_ASBOX +- ) | sed "s/^/$as_me: WARNING: /" >&2 +- ;; +-esac +-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +-$as_echo_n "checking for $ac_header... " >&6; } +-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- eval "$as_ac_Header=\$ac_header_preproc" + fi +-ac_res=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } + +-fi +-as_val=`eval 'as_val=${'$as_ac_Header'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF + +-fi ++if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then ++ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" " ++#include ++#include ++#include + +-done ++" ++if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then : + +-if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then ++$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h + +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_GPFS 1 +-_ACEOF ++fi + +- default_shared_modules="$default_shared_modules vfs_gpfs" ++fi + fi + +-############################################# +-# check if building on Isilon OneFS +-printf "%s" "checking for Isilon OneFS... " +-save_LIBS="$LIBS" +-LIBS="$LIBS -lisi_version" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5 ++$as_echo_n "checking for sin_len in sock... " >&6; } ++if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ ++#include ++#include ++#include ++ + int + main () + { +-get_isilon_copyright() ++ ++struct sockaddr_in sock; sock.sin_len = sizeof(sock); ++ + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- samba_cv_HAVE_ONEFS=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 ++if ac_fn_c_try_compile "$LINENO"; then : - samba_cv_HAVE_ONEFS=no - fi +-fi ++ libreplace_cv_HAVE_SOCK_SIN_LEN=yes -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -echo $samba_cv_HAVE_ONEFS -if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then -+fi ++else -cat >>confdefs.h <<\_ACEOF -#define HAVE_ONEFS 1 -+cat >>confdefs.h <<_ACEOF -+#define $ac_tr_hdr 1 - _ACEOF +-_ACEOF ++ libreplace_cv_HAVE_SOCK_SIN_LEN=no - default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs" - default_static_modules="$default_static_modules" @@ -46154,8 +46321,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - # Need to also add general libs for oplocks support - save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat" fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -LIBS="$save_LIBS" ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5 ++$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; } ++if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then -# Note that all the libunwind symbols in the API are defined to internal -# platform-specific version, so we must include libunwind.h before checking @@ -46163,16 +46335,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5 -$as_echo_n "checking for libunwind... " >&6; } -save_LIBS=$LIBS -+if test x"$ac_cv_type_struct_sockaddr_storage" = x"yes"; then -+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "ss_family" "ac_cv_member_struct_sockaddr_storage_ss_family" " -+#include -+#include -+#include -+ -+" -+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then : -+ -+$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h ++$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h -UNWIND_ARCH="unknown" -if test x"$UNAME_I" != x"unknown"; then @@ -46199,34 +46362,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH" - ;; -esac ++############################################ ++# check for unix domain sockets ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5 ++$as_echo_n "checking for unix domain sockets... " >&6; } ++if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+if test x"$ac_cv_member_struct_sockaddr_storage_ss_family" != x"yes"; then -+ac_fn_c_check_member "$LINENO" "struct sockaddr_storage" "__ss_family" "ac_cv_member_struct_sockaddr_storage___ss_family" " -+#include -+#include -+#include -+ -+" -+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then : -+ -+$as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h -+ -+fi -+ -+fi -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5 -+$as_echo_n "checking for sin_len in sock... " >&6; } -+if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -46234,8 +46382,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#include -#endif +#include ++#include ++#include +#include -+#include ++#include int main () @@ -46245,7 +46395,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - char buf[256]; unw_word_t off; - unw_getcontext(&ctx); unw_init_local(&cur, &ctx); - unw_get_proc_name(&cur, buf, sizeof(buf), &off); -+struct sockaddr_in sock; sock.sin_len = sizeof(sock); ++struct sockaddr_un sunaddr; ++sunaddr.sun_family = AF_UNIX; ; return 0; @@ -46272,24 +46423,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_compile "$LINENO"; then : - +- - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -+ libreplace_cv_HAVE_SOCK_SIN_LEN=yes - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_LIBUNWIND 1 -_ACEOF -+else - -+ libreplace_cv_HAVE_SOCK_SIN_LEN=no +- ++if ac_fn_c_try_compile "$LINENO"; then : - # If we have libunwind, test whether we also have libunwind-ptrace - # which would let us unwind arbitrary processes. - save_LIBS=$LIBS -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ libreplace_cv_HAVE_UNIXSOCKET=yes -for ac_header in libunwind-ptrace.h -do @@ -46299,7 +46446,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -46336,29 +46483,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes --else + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_SOCK_SIN_LEN" >&5 -+$as_echo "$libreplace_cv_HAVE_SOCK_SIN_LEN" >&6; } -+if test x"$libreplace_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then -+ -+$as_echo "#define HAVE_SOCK_SIN_LEN 1" >>confdefs.h - ac_header_compiler=no - fi +-fi ++ libreplace_cv_HAVE_UNIXSOCKET=no --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+############################################ -+# check for unix domain sockets -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5 -+$as_echo_n "checking for unix domain sockets... " >&6; } -+if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -46367,27 +46504,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include <$ac_header> -+ -+#include -+#include -+#include -+#include -+#include -+ -+int -+main () -+{ -+ -+struct sockaddr_un sunaddr; -+sunaddr.sun_family = AF_UNIX; -+ -+ ; -+ return 0; -+} - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -46406,23 +46525,20 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - test ! -s conftest.err - }; then - ac_header_preproc=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+ libreplace_cv_HAVE_UNIXSOCKET=yes -+ - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no --fi -+ libreplace_cv_HAVE_UNIXSOCKET=no + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5 ++$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; } ++if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -46465,17 +46581,11 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_UNIXSOCKET" >&5 -+$as_echo "$libreplace_cv_HAVE_UNIXSOCKET" >&6; } -+if test x"$libreplace_cv_HAVE_UNIXSOCKET" = x"yes"; then -+ -+$as_echo "#define HAVE_UNIXSOCKET 1" >>confdefs.h - fi +-fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ +for ac_func in connect +do : + ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" @@ -46516,7 +46626,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -43538,349 +11587,197 @@ +@@ -43683,349 +11586,286 @@ #ifdef __cplusplus extern "C" #endif @@ -46756,7 +46866,6 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no --fi + case "$LIBREPLACE_NETWORK_LIBS" in + *-lnsl*) + ;; @@ -46764,6 +46873,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS" + ;; + esac ++ ++ + fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 @@ -46802,40 +46914,97 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++ac_check_lib_ext_save_LIBS=$LIBS ++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS" ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 ++$as_echo_n "checking for connect in -lsocket... " >&6; } ++if test "${ac_cv_lib_ext_socket_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - eval "$as_ac_Header=\$ac_header_preproc" ++ 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 connect (); ++int ++main () ++{ ++return connect (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_ext_socket_connect=yes; ++ ac_cv_lib_ext_socket=yes ++else ++ ac_cv_lib_ext_socket_connect=no; ++ ac_cv_lib_ext_socket=no fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext --fi + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5 ++$as_echo "$ac_cv_lib_ext_socket_connect" >&6; } ++ if test $ac_cv_lib_ext_socket_connect = yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF ++#define HAVE_CONNECT 1 + _ACEOF --fi -+ac_check_lib_ext_save_LIBS=$LIBS -+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS" + fi ++LIBS=$ac_check_lib_ext_save_LIBS -done - +- - { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5 -$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++if test $ac_cv_lib_ext_socket = yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBSOCKET 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -+$as_echo_n "checking for connect in -lsocket... " >&6; } -+if test "${ac_cv_lib_ext_socket_connect+set}" = set; then : ++ case "$LIBREPLACE_NETWORK_LIBS" in ++ *-lsocket*) ++ ;; ++ *) ++ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS" ++ ;; ++ esac ++ ++ ++fi ++ ++ ++ac_check_lib_ext_save_LIBS=$LIBS ++LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS" ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5 ++$as_echo_n "checking for connect in -linet... " >&6; } ++if test "${ac_cv_lib_ext_inet_connect+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -46892,192 +47061,41 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LINUX_PTRACE 1 --_ACEOF -- -- -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_ext_socket_connect=yes; -+ ac_cv_lib_ext_socket=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- -- { $as_echo "$as_me:$LINENO: result: no" >&5 --$as_echo "no" >&6; } -- LIBUNWIND_PTRACE="" -- -+ ac_cv_lib_ext_socket_connect=no; -+ ac_cv_lib_ext_socket=no - fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_connect" >&5 -+$as_echo "$ac_cv_lib_ext_socket_connect" >&6; } -+ if test $ac_cv_lib_ext_socket_connect = yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_CONNECT 1 -+_ACEOF - -+fi -+LIBS=$ac_check_lib_ext_save_LIBS - -+if test $ac_cv_lib_ext_socket = yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBSOCKET 1 -+_ACEOF - -+ case "$LIBREPLACE_NETWORK_LIBS" in -+ *-lsocket*) -+ ;; -+ *) -+ LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS" -+ ;; -+ esac - - -+fi -+ -+ -+ac_check_lib_ext_save_LIBS=$LIBS -+LIBS="-linet $LIBREPLACE_NETWORK_LIBS $LIBS" - - - -- -- --for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5 -+$as_echo_n "checking for connect in -linet... " >&6; } -+if test "${ac_cv_lib_ext_inet_connect+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ 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 -@@ -43888,106 +11785,88 @@ - #ifdef __cplusplus - extern "C" - #endif --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif -- -+char connect (); - int - main () - { --return $ac_func (); -+return connect (); - ; - return 0; - } - _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ext_inet_connect=yes; + ac_cv_lib_ext_inet=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 ++else + ac_cv_lib_ext_inet_connect=no; + ac_cv_lib_ext_inet=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -- eval "$as_ac_var=no" - fi +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_LINUX_PTRACE 1 ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_inet_connect" >&5 +$as_echo "$ac_cv_lib_ext_inet_connect" >&6; } + if test $ac_cv_lib_ext_inet_connect = yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CONNECT 1 -+_ACEOF - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+LIBS=$ac_check_lib_ext_save_LIBS -+ -+if test $ac_cv_lib_ext_inet = yes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define HAVE_LIBINET 1 _ACEOF ++fi ++LIBS=$ac_check_lib_ext_save_LIBS + +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- ++if test $ac_cv_lib_ext_inet = yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBINET 1 ++_ACEOF + +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- LIBUNWIND_PTRACE="" + case "$LIBREPLACE_NETWORK_LIBS" in + *-linet*) + ;; @@ -47085,10 +47103,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS" + ;; + esac -+ -+ + +-fi + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext fi --done + if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" || + test x"$ac_cv_lib_ext_nsl_connect" = x"yes" || + test x"$ac_cv_lib_ext_socket_connect" = x"yes" || @@ -47096,10 +47117,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + then +$as_echo "#define HAVE_CONNECT 1" >>confdefs.h -+ + + fi +fi -+ + +for ac_func in gethostbyname +do : + ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" @@ -47119,7 +47140,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure --for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir +-for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -47156,7 +47177,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -43995,101 +11874,65 @@ +@@ -44033,106 +11873,65 @@ #ifdef __cplusplus extern "C" #endif @@ -47211,9 +47232,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - -- eval "$as_ac_var=no" - fi ++ ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_gethostbyname" >&5 +$as_echo "$ac_cv_lib_ext_nsl_s_gethostbyname" >&6; } + if test $ac_cv_lib_ext_nsl_s_gethostbyname = yes; then : @@ -47221,10 +47241,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#define HAVE_GETHOSTBYNAME 1 +_ACEOF +- eval "$as_ac_var=no" + fi ++LIBS=$ac_check_lib_ext_save_LIBS + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -47232,14 +47256,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+LIBS=$ac_check_lib_ext_save_LIBS -+ +if test $ac_cv_lib_ext_nsl_s = yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_LIBNSL_S 1 _ACEOF +-fi +-done +- + case "$LIBREPLACE_NETWORK_LIBS" in + *-lnsl_s*) + ;; @@ -47247,23 +47272,22 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS" + ;; + esac -+ -+ - fi --done + + ++fi +ac_check_lib_ext_save_LIBS=$LIBS +LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS $LIBS" --for ac_func in __getcwd _getcwd + + +-for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ -+ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } +if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then : @@ -47295,7 +47319,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -44097,102 +11940,65 @@ +@@ -44140,101 +11939,65 @@ #ifdef __cplusplus extern "C" #endif @@ -47394,15 +47418,15 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +ac_check_lib_ext_save_LIBS=$LIBS +LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS $LIBS" -+ - --for ac_func in __xstat __fxstat __lxstat +-for ac_func in __getcwd _getcwd -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5 +$as_echo_n "checking for gethostbyname in -lsocket... " >&6; } +if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then : @@ -47434,7 +47458,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -44200,105 +12006,87 @@ +@@ -44242,102 +12005,87 @@ #ifdef __cplusplus extern "C" #endif @@ -47484,14 +47508,21 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" + ac_cv_lib_ext_socket_gethostbyname=no; + ac_cv_lib_ext_socket=no - fi ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +- eval "$as_ac_var=no" + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5 ++$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; } ++ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETHOSTBYNAME 1 ++_ACEOF + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -47503,23 +47534,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_socket_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_ext_socket_gethostbyname" >&6; } -+ if test $ac_cv_lib_ext_socket_gethostbyname = yes; then : ++LIBS=$ac_check_lib_ext_save_LIBS ++ ++if test $ac_cv_lib_ext_socket = yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define HAVE_GETHOSTBYNAME 1 - _ACEOF - - fi --done -+LIBS=$ac_check_lib_ext_save_LIBS - -+if test $ac_cv_lib_ext_socket = yes; then : -+ cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSOCKET 1 +_ACEOF - ++ + case "$LIBREPLACE_NETWORK_LIBS" in + *-lsocket*) + ;; @@ -47527,29 +47549,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS" + ;; + esac - - ++ ++ +fi + if test x"$ac_cv_lib_ext_nsl_s_gethostbyname" = x"yes" || + test x"$ac_cv_lib_ext_nsl_gethostbyname" = x"yes" || + test x"$ac_cv_lib_ext_socket_gethostbyname" = x"yes" + then - ++ +$as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h - ++ + fi +fi - --for ac_func in _stat _lstat _fstat __stat __lstat __fstat --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ ++ +for ac_func in if_nametoindex +do : + ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex" @@ -47557,45 +47569,56 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + cat >>confdefs.h <<_ACEOF +#define HAVE_IF_NAMETOINDEX 1 _ACEOF + + fi + done + ++if test x"$ac_cv_func_if_nametoindex" = x"no"; then ++ + ++ac_check_lib_ext_save_LIBS=$LIBS ++LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS" + + +-for ac_func in __xstat __fxstat __lxstat +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5 ++$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; } ++if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+fi -+done -+ -+if test x"$ac_cv_func_if_nametoindex" = x"no"; then -+ -+ -+ac_check_lib_ext_save_LIBS=$LIBS -+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS $LIBS" - +- -#ifdef __STDC__ -# include -#else -# include -#endif - +- -#undef $ac_func -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5 -+$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; } -+if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ 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 -@@ -44306,2754 +12094,2283 @@ +@@ -44345,2860 +12093,2377 @@ #ifdef __cplusplus extern "C" #endif @@ -47699,64 +47722,58 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + fi +fi -+# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}" -+old_LIBS=$LIBS -+LIBS="${LIBREPLACE_NETWORK_LIBS}" -+libreplace_SAVE_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS -I$libreplacedir" - -+for ac_func in socketpair -+do : -+ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" -+if test "x$ac_cv_func_socketpair" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SOCKETPAIR 1 -+_ACEOF - --for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir +-for ac_func in _stat _lstat _fstat __stat __lstat __fstat -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 - else +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++# The following tests need LIBS="${LIBREPLACE_NETWORK_LIBS}" ++old_LIBS=$LIBS ++LIBS="${LIBREPLACE_NETWORK_LIBS}" ++libreplace_SAVE_CPPFLAGS="$CPPFLAGS" ++CPPFLAGS="$CPPFLAGS -I$libreplacedir" ++ ++for ac_func in socketpair ++do : ++ ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair" ++if test "x$ac_cv_func_socketpair" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SOCKETPAIR 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -+ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o" -+fi -+done -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ ++else ++ LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o" ++fi ++done -#ifdef __STDC__ -# include -#else -# include -#endif + +-#undef $ac_func +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5 +$as_echo_n "checking for broken inet_ntoa... " >&6; } +if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then : + $as_echo_n "(cached) " >&6 +else --#undef $ac_func -+if test "$cross_compiling" = yes; then : -+ libreplace_cv_REPLACE_INET_NTOA=cross -+else -+ 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. */ @@ -47769,14 +47786,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -+#include -+#include -+#include -+#include -+#ifdef HAVE_ARPA_INET_H -+#include - #endif -- +-#endif ++if test "$cross_compiling" = yes; then : ++ libreplace_cv_REPLACE_INET_NTOA=cross ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + -int -main () -{ @@ -47784,6 +47800,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - ; - return 0; -} ++#include ++#include ++#include ++#include ++#ifdef HAVE_ARPA_INET_H ++#include ++#endif +main() { struct in_addr ip; ip.s_addr = 0x12345678; +if (strcmp(inet_ntoa(ip),"18.52.86.120") && + strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } @@ -47853,7 +47876,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done +if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then -+ + +$as_echo "#define REPLACE_INET_NTOA 1" >>confdefs.h + LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o" @@ -47881,7 +47904,8 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +#define HAVE_INET_NTOP 1 +_ACEOF --for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl +- +-for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -48013,13 +48037,13 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETADDRINFO" >&5 +$as_echo "$libreplace_cv_HAVE_GETADDRINFO" >&6; } +if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then -+ -+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h -+ -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext ++$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h ++ ++ +$as_echo "#define HAVE_GETNAMEINFO 1" >>confdefs.h + + @@ -48067,7 +48091,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +fi --for ac_func in getdents __getdents _lseek __lseek _read __read +-for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -48087,7 +48111,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since @@ -48098,7 +48122,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#else -# include -#endif -- + -#undef $ac_func +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ @@ -48163,79 +48187,41 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure - eval "$as_ac_var=yes" +if ac_fn_c_try_link "$LINENO"; then : + libreplace_cv_HAVE_GETIFADDRS=yes - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- eval "$as_ac_var=no" ++else + libreplace_cv_HAVE_GETIFADDRS=no - fi -- --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_var'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_GETIFADDRS" >&5 +$as_echo "$libreplace_cv_HAVE_GETIFADDRS" >&6; } +if test x"$libreplace_cv_HAVE_GETIFADDRS" = x"yes"; then - --fi --done ++ +$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h - - ++ ++ +$as_echo "#define HAVE_FREEIFADDRS 1" >>confdefs.h - - ++ ++ +$as_echo "#define HAVE_STRUCT_IFADDRS 1" >>confdefs.h - ++ +fi - --for ac_func in getdirentries _write __write _fork __fork --do --as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 --$as_echo_n "checking for $ac_func... " >&6; } --if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ +################## +# look for a method of finding the list of network interfaces +iface=no; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5 +$as_echo_n "checking for iface getifaddrs... " >&6; } +if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF ++ $as_echo_n "(cached) " >&6 ++else + +if test "$cross_compiling" = yes; then : + libreplace_cv_HAVE_IFACE_GETIFADDRS=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ ++/* end confdefs.h. */ ++ +#define HAVE_IFACE_GETIFADDRS 1 +#define NO_CONFIG_H 1 +#define AUTOCONF_TEST 1 @@ -48255,68 +48241,19 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - --#ifdef __STDC__ --# include --#else --# include --#endif ++ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_GETIFADDRS" >&5 +$as_echo "$libreplace_cv_HAVE_IFACE_GETIFADDRS" >&6; } +if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then + iface=yes; +$as_echo "#define HAVE_IFACE_GETIFADDRS 1" >>confdefs.h - --#undef $ac_func ++ +else + LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o" +fi - --/* 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 $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined __stub_$ac_func || defined __stub___$ac_func --choke me --#endif - --int --main () --{ --return $ac_func (); -- ; -- return 0; --} --_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$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 -- $as_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 && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -- eval "$as_ac_var=yes" ++ ++ +if test $iface = no; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5 +$as_echo_n "checking for iface AIX... " >&6; } @@ -48422,7 +48359,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +fi +fi --for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64 +-for ac_func in getdents __getdents _lseek __lseek _read __read -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -48502,9 +48439,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5 -+$as_echo_n "checking for ipv6 support... " >&6; } -+if test "${libreplace_cv_HAVE_IPV6+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY support" >&5 ++$as_echo_n "checking for IPV6_V6ONLY support... " >&6; } ++if test "${libreplace_cv_HAVE_IPV6_V6ONLY+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + @@ -48522,6 +48459,264 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure { -return $ac_func (); + ++#ifndef IPV6_V6ONLY ++#error no IPV6_V6ONLY ++#endif ++ + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++ libreplace_cv_HAVE_IPV6_V6ONLY=yes ++ + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" +-fi ++ libreplace_cv_HAVE_IPV6_V6ONLY=no + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-done +- +- +- +- +- +- +-for ac_func in getdirentries _write __write _fork __fork +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IPV6_V6ONLY" >&5 ++$as_echo "$libreplace_cv_HAVE_IPV6_V6ONLY" >&6; } ++if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY in linux/in6.h" >&5 ++$as_echo_n "checking for IPV6_V6ONLY in linux/in6.h... " >&6; } ++if test "${libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func ++ 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++ #include + + int + main () + { +-return $ac_func (); ++ ++ #if (IPV6_V6ONLY != 26) ++ #error no linux IPV6_V6ONLY ++ #endif ++ + ; + return 0; + } + _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$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 +- $as_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 && { +- test "$cross_compiling" = yes || +- $as_test_x conftest$ac_exeext +- }; then +- eval "$as_ac_var=yes" ++if ac_fn_c_try_compile "$LINENO"; then : ++ ++ libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes ++ + else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 + +- eval "$as_ac_var=no" +-fi ++ libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no + +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext + fi +-ac_res=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} +- $as_echo "$as_val"'` +- if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi +-done +- +- +- +- ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&5 ++$as_echo "$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" >&6; } ++ if test x"$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" = x"yes"; then + ++$as_echo "#define HAVE_LINUX_IPV6_V6ONLY_26 1" >>confdefs.h + ++ fi ++fi + +-for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64 +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5 ++$as_echo_n "checking for ipv6 support... " >&6; } ++if test "${libreplace_cv_HAVE_IPV6+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case declares $ac_func. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif + +-#undef $ac_func ++ 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 $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif ++#include /* for NULL */ ++#include ++#include ++#include ++#include + + int + main () + { +-return $ac_func (); ++ +struct sockaddr_storage sa_store; +struct addrinfo *ai = NULL; +struct in6_addr in6addr; @@ -48532,6 +48727,14 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + const char *es = gai_strerror(ret); +} +freeaddrinfo(ai); ++{ ++ int val = 1; ++ #ifdef HAVE_LINUX_IPV6_V6ONLY_26 ++ #define IPV6_V6ONLY 26 ++ #endif ++ ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, ++ (const void *)&val, sizeof(val)); ++} + ; return 0; @@ -52006,7 +52209,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -47061,100 +14378,41 @@ +@@ -47206,100 +14471,41 @@ #ifdef __cplusplus extern "C" #endif @@ -52127,7 +52330,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -47163,111 +14421,106 @@ +@@ -47308,111 +14514,106 @@ #ifdef __cplusplus extern "C" #endif @@ -52308,7 +52511,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -47275,100 +14528,41 @@ +@@ -47420,100 +14621,41 @@ #ifdef __cplusplus extern "C" #endif @@ -52429,7 +52632,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -47377,112 +14571,68 @@ +@@ -47522,112 +14664,68 @@ #ifdef __cplusplus extern "C" #endif @@ -52577,7 +52780,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -47490,100 +14640,54 @@ +@@ -47635,100 +14733,54 @@ #ifdef __cplusplus extern "C" #endif @@ -52706,7 +52909,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -47592,111 +14696,43 @@ +@@ -47737,111 +14789,43 @@ #ifdef __cplusplus extern "C" #endif @@ -52836,7 +53039,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -47704,316 +14740,299 @@ +@@ -47849,316 +14833,299 @@ #ifdef __cplusplus extern "C" #endif @@ -53376,7 +53579,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -48022,112 +15041,179 @@ +@@ -48167,112 +15134,179 @@ #ifdef __cplusplus extern "C" #endif @@ -53625,7 +53828,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -48135,100 +15221,66 @@ +@@ -48280,100 +15314,66 @@ #ifdef __cplusplus extern "C" #endif @@ -53768,7 +53971,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -48237,212 +15289,191 @@ +@@ -48382,212 +15382,191 @@ #ifdef __cplusplus extern "C" #endif @@ -54114,7 +54317,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -48451,969 +15482,594 @@ +@@ -48596,969 +15575,594 @@ #ifdef __cplusplus extern "C" #endif @@ -55468,7 +55671,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -49421,85 +16077,43 @@ +@@ -49566,85 +16170,43 @@ #ifdef __cplusplus extern "C" #endif @@ -55574,7 +55777,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -49508,108 +16122,44 @@ +@@ -49653,108 +16215,44 @@ #ifdef __cplusplus extern "C" #endif @@ -55705,7 +55908,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -49617,103 +16167,80 @@ +@@ -49762,103 +16260,80 @@ #ifdef __cplusplus extern "C" #endif @@ -55860,7 +56063,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -49721,183 +16248,89 @@ +@@ -49866,183 +16341,89 @@ #ifdef __cplusplus extern "C" #endif @@ -56099,7 +56302,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -49906,109 +16339,91 @@ +@@ -50051,109 +16432,91 @@ #ifdef __cplusplus extern "C" #endif @@ -56269,7 +56472,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50016,105 +16431,90 @@ +@@ -50161,105 +16524,90 @@ #ifdef __cplusplus extern "C" #endif @@ -56434,7 +56637,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50122,105 +16522,92 @@ +@@ -50267,105 +16615,92 @@ #ifdef __cplusplus extern "C" #endif @@ -56601,7 +56804,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50228,103 +16615,91 @@ +@@ -50373,103 +16708,91 @@ #ifdef __cplusplus extern "C" #endif @@ -56766,7 +56969,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50332,102 +16707,90 @@ +@@ -50477,102 +16800,90 @@ #ifdef __cplusplus extern "C" #endif @@ -56930,7 +57133,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50435,103 +16798,91 @@ +@@ -50580,103 +16891,91 @@ #ifdef __cplusplus extern "C" #endif @@ -57096,7 +57299,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50539,103 +16890,90 @@ +@@ -50684,103 +16983,90 @@ #ifdef __cplusplus extern "C" #endif @@ -57260,7 +57463,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50643,107 +16981,91 @@ +@@ -50788,107 +17074,91 @@ #ifdef __cplusplus extern "C" #endif @@ -57431,7 +57634,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50751,190 +17073,90 @@ +@@ -50896,190 +17166,90 @@ #ifdef __cplusplus extern "C" #endif @@ -57671,7 +57874,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -50942,102 +17164,77 @@ +@@ -51087,102 +17257,77 @@ #ifdef __cplusplus extern "C" #endif @@ -57823,7 +58026,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -51045,62 +17242,53 @@ +@@ -51190,62 +17335,53 @@ #ifdef __cplusplus extern "C" #endif @@ -57922,7 +58125,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -51108,39 +17296,40 @@ +@@ -51253,39 +17389,40 @@ fi done @@ -57990,7 +58193,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC -@@ -51148,62 +17337,118 @@ +@@ -51293,62 +17430,118 @@ #ifdef __cplusplus extern "C" #endif @@ -58153,7 +58356,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -51211,102 +17456,141 @@ +@@ -51356,102 +17549,141 @@ fi done @@ -58370,7 +58573,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -51318,7 +17602,7 @@ +@@ -51463,7 +17695,7 @@ esac # Check whether --enable-static was given. @@ -58379,7 +58582,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -51340,7 +17624,7 @@ +@@ -51485,7 +17717,7 @@ fi # Check whether --enable-shared was given. @@ -58388,7 +58591,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -51367,16 +17651,16 @@ +@@ -51512,16 +17744,16 @@ PIE_CFLAGS="" PIE_LDFLAGS="" # Check whether --enable-pie was given. @@ -58408,7 +58611,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -51385,11 +17669,11 @@ +@@ -51530,11 +17762,11 @@ main () { return 0;} EOF if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5' @@ -58423,7 +58626,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure then samba_cv_fpie=yes else -@@ -51398,7 +17682,7 @@ +@@ -51543,7 +17775,7 @@ rm -f conftest* fi @@ -58432,7 +58635,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_fpie" >&6; } if test x"${samba_cv_fpie}" = x"yes" then -@@ -51410,16 +17694,16 @@ +@@ -51555,16 +17787,16 @@ # Set defaults RELRO_LDFLAGS="" # Check whether --enable-relro was given. @@ -58452,7 +58655,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -51428,11 +17712,11 @@ +@@ -51573,11 +17805,11 @@ main () { return 0;} EOF if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5' @@ -58467,7 +58670,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure then samba_cv_relro=yes else -@@ -51441,7 +17725,7 @@ +@@ -51586,7 +17818,7 @@ rm -f conftest* fi @@ -58476,7 +58679,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_relro" >&6; } if test x"${samba_cv_relro}" = x"yes" then -@@ -51470,7 +17754,7 @@ +@@ -51615,7 +17847,7 @@ # You need to specify how to create a shared library and # how to compile C code to produce PIC object files @@ -58485,7 +58688,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking ability to build shared libraries... " >&6; } # and these are for particular systems -@@ -51478,14 +17762,10 @@ +@@ -51623,14 +17855,10 @@ *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*) case "$host_os" in *linux*) @@ -58502,7 +58705,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac BLDSHARED="true" -@@ -51496,15 +17776,11 @@ +@@ -51641,15 +17869,11 @@ DYNEXP="-Wl,--export-dynamic" PICFLAG="-fPIC" SONAMEFLAG="-Wl,-soname=" @@ -58519,9 +58722,9 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure +$as_echo "#define SUNOS5 1" >>confdefs.h BLDSHARED="true" - LDSHFLAGS="-G" -@@ -51522,33 +17798,23 @@ - LDSHFLAGS="-G \${CFLAGS}" + if test "${GCC}" = "yes"; then +@@ -51672,33 +17896,23 @@ + SONAMEFLAG="-Wl,-h," fi -cat >>confdefs.h <<\_ACEOF @@ -58559,7 +58762,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; *netbsd* | *freebsd* | *dragonfly* ) -@@ -51558,14 +17824,10 @@ +@@ -51708,14 +17922,10 @@ SONAMEFLAG="-Wl,-soname," PICFLAG="-fPIC -DPIC" @@ -58576,7 +58779,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; *openbsd*) BLDSHARED="true" -@@ -51574,26 +17836,18 @@ +@@ -51724,26 +17934,18 @@ SONAMEFLAG="-Wl,-soname," PICFLAG="-fPIC" @@ -58607,7 +58810,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac -@@ -51607,15 +17861,11 @@ +@@ -51757,15 +17959,11 @@ PICFLAG="-KPIC" fi @@ -58625,7 +58828,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure BLDSHARED="true" # use expfull to export underscored symbols -@@ -51631,25 +17881,17 @@ +@@ -51781,25 +17979,17 @@ fi @@ -58655,7 +58858,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure # Use special PIC flags for the native HP-UX compiler. BLDSHARED="true" -@@ -51671,74 +17913,52 @@ +@@ -51821,74 +18011,52 @@ DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib" fi @@ -58743,7 +58946,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else if test -n "$ROFF"; then -@@ -51749,91 +17969,71 @@ +@@ -51899,91 +18067,71 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -58850,7 +59053,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure BLDSHARED="true" LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress" -@@ -51847,16 +18047,12 @@ +@@ -51997,16 +18145,12 @@ # actually support the PIE stuff. PIE_LDFLAGS= PIE_CFLAGS= @@ -58869,7 +59072,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac -@@ -51873,19 +18069,15 @@ +@@ -52023,19 +18167,15 @@ LDFLAGS="$LDFLAGS -L./bin" fi @@ -58892,7 +59095,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ int -@@ -51896,42 +18088,17 @@ +@@ -52046,42 +18186,17 @@ return 0; } _ACEOF @@ -58940,7 +59143,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags" test x"$ld_as_needed_flag_found" = xyes && break done -@@ -51944,14 +18111,10 @@ +@@ -52094,14 +18209,10 @@ for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do saved_ldflags="$LDFLAGS" @@ -58957,7 +59160,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ int -@@ -51962,94 +18125,69 @@ +@@ -52112,94 +18223,69 @@ return 0; } _ACEOF @@ -59077,7 +59280,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -52065,7 +18203,7 @@ +@@ -52215,7 +18301,7 @@ fi @@ -59086,7 +59289,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_cv_shlib_works" >&6; } if test $ac_cv_shlib_works = no; then BLDSHARED=false -@@ -52082,9 +18220,9 @@ +@@ -52232,9 +18318,9 @@ merged_build_possible=no fi @@ -59098,7 +59301,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$PICFLAG" >&6; } -@@ -52156,10 +18294,10 @@ +@@ -52306,10 +18392,10 @@ USESHARED=false @@ -59111,7 +59314,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_shared_libs; enable_shared_libs=$enableval else enable_shared_libs=yes -@@ -52170,11 +18308,11 @@ +@@ -52320,11 +18406,11 @@ USESHARED=$BLDSHARED fi @@ -59125,7 +59328,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;} fi -@@ -52202,14 +18340,13 @@ +@@ -52352,14 +18438,13 @@ # Check whether --with-static-libs was given. @@ -59142,7 +59345,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -52231,7 +18368,7 @@ +@@ -52381,7 +18466,7 @@ # be extracted from their respective source directories # # Check whether --enable-external_libtalloc was given. @@ -59151,7 +59354,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_external_libtalloc; enable_external_libtalloc=$enableval else enable_external_libtalloc=auto -@@ -52246,9 +18383,9 @@ +@@ -52396,9 +18481,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 @@ -59163,7 +59366,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -52261,14 +18398,14 @@ +@@ -52411,14 +18496,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -59181,7 +59384,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -52276,10 +18413,10 @@ +@@ -52426,10 +18511,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -59194,7 +59397,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -52289,9 +18426,9 @@ +@@ -52439,9 +18524,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -59206,7 +59409,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in -@@ -52304,14 +18441,14 @@ +@@ -52454,14 +18539,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -59224,7 +59427,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -52319,10 +18456,10 @@ +@@ -52469,10 +18554,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then @@ -59237,7 +59440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -52331,7 +18468,7 @@ +@@ -52481,7 +18566,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -59246,7 +59449,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -52344,13 +18481,13 @@ +@@ -52494,13 +18579,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 @@ -59263,7 +59466,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } PKG_CONFIG="" fi -@@ -52358,7 +18495,7 @@ +@@ -52508,7 +18593,7 @@ fi pkg_failed=no @@ -59272,7 +59475,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking for LIBTALLOC... " >&6; } if test -n "$PKG_CONFIG"; then -@@ -52366,11 +18503,11 @@ +@@ -52516,11 +18601,11 @@ pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS" else if test -n "$PKG_CONFIG" && \ @@ -59287,7 +59490,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null` else pkg_failed=yes -@@ -52384,11 +18521,11 @@ +@@ -52534,11 +18619,11 @@ pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -59302,7 +59505,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null` else pkg_failed=yes -@@ -52415,768 +18552,112 @@ +@@ -52565,768 +18650,112 @@ # Put the nasty error message in config.log where it belongs echo "$LIBTALLOC_PKG_ERRORS" >&5 @@ -60141,7 +60344,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_cv_sizeof_void_p" >&6; } -@@ -53188,17 +18669,15 @@ +@@ -53338,17 +18767,15 @@ if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then @@ -60164,7 +60367,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi if test x"$VERSIONSCRIPT" != "x"; then -@@ -53233,16 +18712,16 @@ +@@ -53383,16 +18810,16 @@ @@ -60184,7 +60387,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -53268,7 +18747,7 @@ +@@ -53418,7 +18845,7 @@ if eval $BLDSHARED = true; then LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET @@ -60193,7 +60396,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then enable_static=yes -@@ -53281,12 +18760,12 @@ +@@ -53431,12 +18858,12 @@ enable_static=yes LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET @@ -60208,7 +60411,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -53312,7 +18791,7 @@ +@@ -53462,7 +18889,7 @@ # Check whether --enable-external_libtdb was given. @@ -60217,7 +60420,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_external_libtdb; enable_external_libtalloc=$enableval else enable_external_libtalloc=auto -@@ -53323,7 +18802,7 @@ +@@ -53473,7 +18900,7 @@ then pkg_failed=no @@ -60226,7 +60429,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking for LIBTDB... " >&6; } if test -n "$PKG_CONFIG"; then -@@ -53331,11 +18810,11 @@ +@@ -53481,11 +18908,11 @@ pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS" else if test -n "$PKG_CONFIG" && \ @@ -60241,7 +60444,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.2.1" 2>/dev/null` else pkg_failed=yes -@@ -53349,11 +18828,11 @@ +@@ -53499,11 +18926,11 @@ pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS" else if test -n "$PKG_CONFIG" && \ @@ -60256,7 +60459,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.2.1" 2>/dev/null` else pkg_failed=yes -@@ -53380,13 +18859,11 @@ +@@ -53530,13 +18957,11 @@ # Put the nasty error message in config.log where it belongs echo "$LIBTDB_PKG_ERRORS" >&5 @@ -60272,7 +60475,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else enable_external_libtdb=no fi -@@ -53394,9 +18871,7 @@ +@@ -53544,9 +18969,7 @@ elif test $pkg_failed = untried; then if test x$enable_external_libtdb = xyes; then @@ -60283,7 +60486,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else enable_external_libtdb=no fi -@@ -53404,7 +18879,7 @@ +@@ -53554,7 +18977,7 @@ else LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS @@ -60292,7 +60495,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } enable_external_libtdb=yes fi -@@ -53423,9 +18898,7 @@ +@@ -53573,9 +18996,7 @@ fi done if test x"$tdbdir" = "x"; then @@ -60303,7 +60506,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o" -@@ -53438,104 +18911,12 @@ +@@ -53588,104 +19009,12 @@ TDB_CFLAGS="-I$tdbdir/include" @@ -60413,7 +60616,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -53543,151 +18924,12 @@ +@@ -53693,151 +19022,12 @@ fi done @@ -60570,7 +60773,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -53698,17 +18940,13 @@ +@@ -53848,17 +19038,13 @@ @@ -60591,7 +60794,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -53719,56 +18957,29 @@ +@@ -53869,56 +19055,29 @@ return 0; } _ACEOF @@ -60655,7 +60858,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -53779,41 +18990,18 @@ +@@ -53929,41 +19088,18 @@ return 0; } _ACEOF @@ -60701,7 +60904,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -53850,16 +19038,16 @@ +@@ -54000,16 +19136,16 @@ @@ -60721,7 +60924,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -53885,7 +19073,7 @@ +@@ -54035,7 +19171,7 @@ if eval $BLDSHARED = true; then LIBTDB_SHARED=$LIBTDB_SHARED_TARGET LIBTDB_TARGET=$LIBTDB_SHARED_TARGET @@ -60730,7 +60933,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then enable_static=yes -@@ -53898,12 +19086,12 @@ +@@ -54048,12 +19184,12 @@ enable_static=yes LIBTDB_TARGET=$LIBTDB_STATIC_TARGET LIBTDB_LIBS=$LIBTDB_STATIC_TARGET @@ -60745,7 +60948,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -53959,16 +19147,16 @@ +@@ -54109,16 +19245,16 @@ @@ -60765,7 +60968,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -53994,7 +19182,7 @@ +@@ -54144,7 +19280,7 @@ if eval $BLDSHARED = true; then LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET @@ -60774,7 +60977,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then enable_static=yes -@@ -54007,12 +19195,12 @@ +@@ -54157,12 +19293,12 @@ enable_static=yes LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET @@ -60789,7 +60992,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -54050,16 +19238,16 @@ +@@ -54200,16 +19336,16 @@ @@ -60809,7 +61012,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -54085,7 +19273,7 @@ +@@ -54235,7 +19371,7 @@ if eval $BLDSHARED = true; then LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET @@ -60818,7 +61021,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then enable_static=yes -@@ -54098,12 +19286,12 @@ +@@ -54248,12 +19384,12 @@ enable_static=yes LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET @@ -60833,7 +61036,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -54141,16 +19329,16 @@ +@@ -54291,16 +19427,16 @@ @@ -60853,7 +61056,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -54176,7 +19364,7 @@ +@@ -54326,7 +19462,7 @@ if eval $BLDSHARED = true; then LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET @@ -60862,7 +61065,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then enable_static=yes -@@ -54189,12 +19377,12 @@ +@@ -54339,12 +19475,12 @@ enable_static=yes LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET @@ -60877,7 +61080,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -54232,19 +19420,19 @@ +@@ -54382,19 +19518,19 @@ @@ -60900,7 +61103,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no ;; -@@ -54253,7 +19441,7 @@ +@@ -54403,7 +19539,7 @@ else # if unspecified, default is not to build @@ -60909,7 +61112,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } build_lib=no -@@ -54269,7 +19457,7 @@ +@@ -54419,7 +19555,7 @@ if eval $BLDSHARED = true; then LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET @@ -60918,7 +61121,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then enable_static=yes -@@ -54282,12 +19470,12 @@ +@@ -54432,12 +19568,12 @@ enable_static=yes LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET @@ -60933,7 +61136,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared library not selected" >&6; } fi if test $enable_static = yes; then -@@ -54304,165 +19492,39 @@ +@@ -54454,165 +19590,39 @@ ################ @@ -61111,7 +61314,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else cat >>confdefs.h <<_ACEOF -@@ -54472,102 +19534,9 @@ +@@ -54622,102 +19632,9 @@ fi else @@ -61216,7 +61419,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else cat >>confdefs.h <<_ACEOF -@@ -54582,17 +19551,13 @@ +@@ -54732,17 +19649,13 @@ # Check if the compiler supports the LL prefix on long long integers. # AIX needs this. @@ -61237,7 +61440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -54603,190 +19568,97 @@ +@@ -54753,190 +19666,97 @@ return 0; } _ACEOF @@ -61458,7 +61661,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -54796,67 +19668,34 @@ +@@ -54946,67 +19766,34 @@ #include main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } _ACEOF @@ -61536,7 +61739,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -54866,67 +19705,34 @@ +@@ -55016,67 +19803,34 @@ #include main() { exit((sizeof(ino_t) == 8) ? 0 : 1); } _ACEOF @@ -61614,7 +61817,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -54936,67 +19742,34 @@ +@@ -55086,67 +19840,34 @@ #include main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } _ACEOF @@ -61692,7 +61895,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55006,67 +19779,34 @@ +@@ -55156,67 +19877,34 @@ #include main() { exit((sizeof(dev_t) == 8) ? 0 : 1); } _ACEOF @@ -61770,7 +61973,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55076,64 +19816,31 @@ +@@ -55226,64 +19914,31 @@ #include main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } _ACEOF @@ -61844,7 +62047,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55149,55 +19856,28 @@ +@@ -55299,55 +19954,28 @@ return 0; } _ACEOF @@ -61907,7 +62110,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55213,58 +19893,31 @@ +@@ -55363,58 +19991,31 @@ return 0; } _ACEOF @@ -61974,7 +62177,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55273,67 +19926,34 @@ +@@ -55423,67 +20024,34 @@ #include main() { dev_t dev; int i = major(dev); return 0; } _ACEOF @@ -62052,7 +62255,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55342,67 +19962,34 @@ +@@ -55492,67 +20060,34 @@ #include main() { dev_t dev; int i = minor(dev); return 0; } _ACEOF @@ -62130,7 +62333,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -55411,129 +19998,63 @@ +@@ -55561,129 +20096,63 @@ #include main() { dev_t dev = makedev(1,2); return 0; } _ACEOF @@ -62279,7 +62482,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -55546,55 +20067,28 @@ +@@ -55696,55 +20165,28 @@ return 0; } _ACEOF @@ -62342,7 +62545,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -55605,55 +20099,28 @@ +@@ -55755,55 +20197,28 @@ return 0; } _ACEOF @@ -62405,7 +62608,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -55666,46 +20133,19 @@ +@@ -55816,46 +20231,19 @@ return 0; } _ACEOF @@ -62458,7 +62661,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -55717,120 +20157,24 @@ +@@ -55867,120 +20255,24 @@ # which rely on signals. @@ -62587,7 +62790,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -55854,58 +20198,27 @@ +@@ -56004,58 +20296,27 @@ return 0; } _ACEOF @@ -62654,7 +62857,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -55929,58 +20242,27 @@ +@@ -56079,58 +20340,27 @@ return 0; } _ACEOF @@ -62721,7 +62924,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -56004,49 +20286,22 @@ +@@ -56154,49 +20384,22 @@ return 0; } _ACEOF @@ -62777,7 +62980,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -56064,18 +20319,14 @@ +@@ -56214,18 +20417,14 @@ ;; *) # clock_gettime was not found, try adding librt @@ -62799,7 +63002,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -56093,60 +20344,29 @@ +@@ -56243,60 +20442,29 @@ return 0; } _ACEOF @@ -62869,7 +63072,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -56170,58 +20390,27 @@ +@@ -56320,58 +20488,27 @@ return 0; } _ACEOF @@ -62936,7 +63139,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -56245,58 +20434,27 @@ +@@ -56395,58 +20532,27 @@ return 0; } _ACEOF @@ -63003,7 +63206,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if TIME_WITH_SYS_TIME -@@ -56320,49 +20478,22 @@ +@@ -56470,49 +20576,22 @@ return 0; } _ACEOF @@ -63059,7 +63262,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -56387,20 +20518,16 @@ +@@ -56537,20 +20616,16 @@ fi @@ -63084,7 +63287,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56408,216 +20535,67 @@ +@@ -56558,216 +20633,67 @@ if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && di->d_name[0] == 0) exit(0); exit(1);} _ACEOF @@ -63342,7 +63545,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -56626,17 +20604,13 @@ +@@ -56776,17 +20702,13 @@ done @@ -63363,7 +63566,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56648,55 +20622,28 @@ +@@ -56798,55 +20720,28 @@ return 0; } _ACEOF @@ -63426,7 +63629,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56708,55 +20655,28 @@ +@@ -56858,55 +20753,28 @@ return 0; } _ACEOF @@ -63489,7 +63692,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56768,55 +20688,28 @@ +@@ -56918,55 +20786,28 @@ return 0; } _ACEOF @@ -63552,7 +63755,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56828,55 +20721,28 @@ +@@ -56978,55 +20819,28 @@ return 0; } _ACEOF @@ -63615,7 +63818,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56888,55 +20754,28 @@ +@@ -57038,55 +20852,28 @@ return 0; } _ACEOF @@ -63678,7 +63881,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -56948,55 +20787,28 @@ +@@ -57098,55 +20885,28 @@ return 0; } _ACEOF @@ -63741,7 +63944,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57008,55 +20820,28 @@ +@@ -57158,55 +20918,28 @@ return 0; } _ACEOF @@ -63804,7 +64007,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57068,55 +20853,28 @@ +@@ -57218,55 +20951,28 @@ return 0; } _ACEOF @@ -63867,7 +64070,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57128,55 +20886,28 @@ +@@ -57278,55 +20984,28 @@ return 0; } _ACEOF @@ -63930,7 +64133,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57188,55 +20919,28 @@ +@@ -57338,55 +21017,28 @@ return 0; } _ACEOF @@ -63993,7 +64196,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57248,56 +20952,29 @@ +@@ -57398,56 +21050,29 @@ return 0; } _ACEOF @@ -64057,7 +64260,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57309,56 +20986,29 @@ +@@ -57459,56 +21084,29 @@ return 0; } _ACEOF @@ -64121,7 +64324,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57370,41 +21020,18 @@ +@@ -57520,41 +21118,18 @@ return 0; } _ACEOF @@ -64167,7 +64370,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -57415,12 +21042,10 @@ +@@ -57565,12 +21140,10 @@ ICONV_LOOK_DIRS="/usr /usr/local /sw /opt" # Check whether --with-libiconv was given. @@ -64182,7 +64385,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else if test "$withval" != "yes" ; then ICONV_PATH_SPEC=yes -@@ -57466,7 +21091,7 @@ +@@ -57616,7 +21189,7 @@ export LDFLAGS LIBS CPPFLAGS # Try to find iconv(3) @@ -64191,7 +64394,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking for iconv in $i/$l... " >&6; } jm_cv_func_iconv="no" jm_cv_lib_iconv="" -@@ -57474,11 +21099,7 @@ +@@ -57624,11 +21197,7 @@ jm_save_LIBS="$LIBS" if test "$jm_cv_func_iconv" != yes; then @@ -64204,7 +64407,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57492,48 +21113,17 @@ +@@ -57642,48 +21211,17 @@ return 0; } _ACEOF @@ -64257,7 +64460,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57547,49 +21137,18 @@ +@@ -57697,49 +21235,18 @@ return 0; } _ACEOF @@ -64311,7 +64514,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57603,53 +21162,22 @@ +@@ -57753,53 +21260,22 @@ return 0; } _ACEOF @@ -64369,7 +64572,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57663,50 +21191,19 @@ +@@ -57813,50 +21289,19 @@ return 0; } _ACEOF @@ -64424,7 +64627,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -57720,42 +21217,15 @@ +@@ -57870,42 +21315,15 @@ return 0; } _ACEOF @@ -64470,7 +64673,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$jm_save_LIBS" fi -@@ -57766,36 +21236,30 @@ +@@ -57916,36 +21334,30 @@ if test "$jm_cv_func_iconv" = yes; then if test "$jm_cv_giconv" = yes; then @@ -64514,7 +64717,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -57833,16 +21297,12 @@ +@@ -57983,16 +21395,12 @@ # check for default dos charset name for j in CP850 IBM850 ; do @@ -64534,7 +64737,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include <$jm_cv_include> -@@ -57855,43 +21315,16 @@ +@@ -58005,43 +21413,16 @@ } _ACEOF @@ -64583,7 +64786,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ICONV_CHARSET" >&6; } default_dos_charset="$ICONV_CHARSET" -@@ -57903,16 +21336,12 @@ +@@ -58053,16 +21434,12 @@ # check for default display charset name for j in ASCII 646 ; do @@ -64603,7 +64806,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include <$jm_cv_include> -@@ -57925,43 +21354,16 @@ +@@ -58075,43 +21452,16 @@ } _ACEOF @@ -64652,7 +64855,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ICONV_CHARSET" >&6; } default_display_charset="$ICONV_CHARSET" -@@ -57973,16 +21375,12 @@ +@@ -58123,16 +21473,12 @@ # check for default unix charset name for j in UTF-8 UTF8 ; do @@ -64672,7 +64875,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include <$jm_cv_include> -@@ -57995,43 +21393,16 @@ +@@ -58145,43 +21491,16 @@ } _ACEOF @@ -64721,7 +64924,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ICONV_CHARSET" >&6; } default_unix_charset="$ICONV_CHARSET" -@@ -58070,9 +21441,9 @@ +@@ -58220,9 +21539,9 @@ default_display_charset="ASCII" default_unix_charset="UTF-8" samba_cv_HAVE_NATIVE_ICONV=yes @@ -64733,7 +64936,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;} fi -@@ -58096,9 +21467,7 @@ +@@ -58246,9 +21565,7 @@ default_unix_charset="\"$default_unix_charset\"" @@ -64744,7 +64947,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF -@@ -58132,7 +21501,7 @@ +@@ -58282,7 +21599,7 @@ if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then @@ -64753,7 +64956,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&5 $as_echo "$as_me: WARNING: Sufficient support for iconv function was not found. Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!" >&2;} -@@ -58154,20 +21523,16 @@ +@@ -58304,20 +21621,16 @@ fi @@ -64778,7 +64981,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -58181,67 +21546,34 @@ +@@ -58331,67 +21644,34 @@ } _ACEOF @@ -64856,7 +65059,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -58255,204 +21587,36 @@ +@@ -58405,204 +21685,36 @@ } _ACEOF @@ -65074,7 +65277,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -58460,120 +21624,26 @@ +@@ -58610,120 +21722,26 @@ fi done @@ -65204,7 +65407,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -58584,54 +21654,29 @@ +@@ -58734,54 +21752,29 @@ return 0; } _ACEOF @@ -65265,7 +65468,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -58640,157 +21685,18 @@ +@@ -58790,157 +21783,18 @@ # http://oss.sgi.com/projects/fam/ # http://savannah.nongnu.org/projects/fam/ # Check whether --enable-fam was given. @@ -65429,7 +65632,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF samba_cv_HAVE_FAM_H=yes else -@@ -58802,18 +21708,14 @@ +@@ -58952,18 +21806,14 @@ if test x"$samba_cv_HAVE_FAM_H" = x"yes"; then # On IRIX, libfam requires libC, but other FAM implementations # might not need it. @@ -65451,7 +65654,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -58831,43 +21733,18 @@ +@@ -58981,43 +21831,18 @@ return 0; } _ACEOF @@ -65501,7 +65704,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam" else samba_cv_HAVE_LIBFAM=no -@@ -58878,23 +21755,17 @@ +@@ -59028,23 +21853,17 @@ samba_fam_xtra=-lC @@ -65528,7 +65731,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -58912,72 +21783,41 @@ +@@ -59062,72 +21881,41 @@ return 0; } _ACEOF @@ -65609,7 +65812,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -58988,43 +21828,16 @@ +@@ -59138,43 +21926,16 @@ return 0; } _ACEOF @@ -65656,7 +65859,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -59037,18 +21850,14 @@ +@@ -59187,18 +21948,14 @@ samba_dmapi_libs="" if test x"$samba_dmapi_libs" = x"" ; then @@ -65678,7 +65881,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -59066,61 +21875,32 @@ +@@ -59216,61 +21973,32 @@ return 0; } _ACEOF @@ -65749,7 +65952,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -59138,61 +21918,32 @@ +@@ -59288,61 +22016,32 @@ return 0; } _ACEOF @@ -65820,7 +66023,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -59210,61 +21961,32 @@ +@@ -59360,61 +22059,32 @@ return 0; } _ACEOF @@ -65891,7 +66094,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -59282,43 +22004,18 @@ +@@ -59432,43 +22102,18 @@ return 0; } _ACEOF @@ -65941,7 +66144,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure samba_dmapi_libs="-lxdsm" fi -@@ -59327,153 +22024,12 @@ +@@ -59477,153 +22122,12 @@ # Only bother to test ehaders if we have a candidate DMAPI library if test x"$samba_dmapi_libs" != x"" ; then @@ -66101,7 +66304,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -59487,11 +22043,7 @@ +@@ -59637,11 +22141,7 @@ if test x"$samba_dmapi_libs" != x"" ; then samba_dmapi_save_LIBS="$LIBS" LIBS="$LIBS $samba_dmapi_libs" @@ -66114,7 +66317,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include /* needed by Tru64 */ -@@ -59526,50 +22078,25 @@ +@@ -59676,50 +22176,25 @@ return 0; } _ACEOF @@ -66169,7 +66372,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: DMAPI support not present" >&6;} # DMAPI detection failure actions end -@@ -59577,11 +22104,9 @@ +@@ -59727,11 +22202,9 @@ # DMAPI detection success actions start @@ -66183,7 +66386,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;} # DMAPI detection success actions end -@@ -59595,20 +22120,16 @@ +@@ -59745,20 +22218,16 @@ default_shared_modules="$default_shared_modules vfs_tsmsm" fi @@ -66208,7 +66411,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -59624,65 +22145,32 @@ +@@ -59774,65 +22243,32 @@ } _ACEOF @@ -66283,7 +66486,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -59694,185 +22182,29 @@ +@@ -59844,185 +22280,29 @@ return 0; } _ACEOF @@ -66476,7 +66679,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -59882,110 +22214,18 @@ +@@ -60032,110 +22312,18 @@ ac_save_LIBS=$LIBS @@ -66593,7 +66796,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -60002,18 +22242,14 @@ +@@ -60152,18 +22340,14 @@ ;; *) # cap_get_proc was not found, try adding libcap @@ -66615,7 +66818,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -60031,50 +22267,23 @@ +@@ -60181,50 +22365,23 @@ return 0; } _ACEOF @@ -66673,7 +66876,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -60096,20 +22305,16 @@ +@@ -60246,20 +22403,16 @@ @@ -66698,7 +66901,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -60125,52 +22330,23 @@ +@@ -60275,52 +22428,23 @@ exit(0); } _ACEOF @@ -66757,7 +66960,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else LIBS=$ac_save_LIBS -@@ -60183,17 +22359,13 @@ +@@ -60333,17 +22457,13 @@ # This is *really* broken but some systems (DEC OSF1) do this.... JRA. # @@ -66778,7 +66981,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #if defined(HAVE_RPC_RPC_H) -@@ -60207,55 +22379,28 @@ +@@ -60357,55 +22477,28 @@ return 0; } _ACEOF @@ -66841,7 +67044,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #if defined(HAVE_RPC_RPC_H) -@@ -60269,55 +22414,28 @@ +@@ -60419,55 +22512,28 @@ return 0; } _ACEOF @@ -66904,7 +67107,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #if defined(HAVE_RPC_RPC_H) -@@ -60331,55 +22449,28 @@ +@@ -60481,55 +22547,28 @@ return 0; } _ACEOF @@ -66968,7 +67171,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #if defined(HAVE_RPC_RPC_H) -@@ -60393,56 +22484,29 @@ +@@ -60543,56 +22582,29 @@ return 0; } _ACEOF @@ -67032,7 +67235,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_SECURITY_H -@@ -60460,238 +22524,112 @@ +@@ -60610,238 +22622,112 @@ return 0; } _ACEOF @@ -67307,7 +67510,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -60702,63 +22640,32 @@ +@@ -60852,63 +22738,32 @@ return 0; } _ACEOF @@ -67380,7 +67583,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -60769,63 +22676,32 @@ +@@ -60919,63 +22774,32 @@ return 0; } _ACEOF @@ -67453,7 +67656,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -60836,63 +22712,32 @@ +@@ -60986,63 +22810,32 @@ return 0; } _ACEOF @@ -67526,7 +67729,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -60903,147 +22748,30 @@ +@@ -61053,147 +22846,30 @@ return 0; } _ACEOF @@ -67684,7 +67887,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -61055,20 +22783,16 @@ +@@ -61205,20 +22881,16 @@ seteuid=no; if test $seteuid = no; then @@ -67709,7 +67912,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define AUTOCONF_TEST 1 -@@ -61076,50 +22800,21 @@ +@@ -61226,50 +22898,21 @@ #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" _ACEOF @@ -67766,7 +67969,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -61127,20 +22822,16 @@ +@@ -61277,20 +22920,16 @@ # we check for setresuid second as it conflicts with AIO on Linux. # see http://samba.org/~tridge/junkcode/aio_uid.c if test $seteuid = no; then @@ -67791,7 +67994,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define AUTOCONF_TEST 1 -@@ -61148,69 +22839,36 @@ +@@ -61298,69 +22937,36 @@ #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" _ACEOF @@ -67871,7 +68074,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define AUTOCONF_TEST 1 -@@ -61218,69 +22876,36 @@ +@@ -61368,69 +22974,36 @@ #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" _ACEOF @@ -67951,7 +68154,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define AUTOCONF_TEST 1 -@@ -61288,64 +22913,31 @@ +@@ -61438,64 +23011,31 @@ #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" _ACEOF @@ -68025,7 +68228,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -61359,195 +22951,98 @@ +@@ -61509,195 +23049,98 @@ return 0; } _ACEOF @@ -68251,7 +68454,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -61571,67 +23066,34 @@ +@@ -61721,67 +23164,34 @@ #endif } _ACEOF @@ -68328,7 +68531,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define _XOPEN_SOURCE 600 -@@ -61649,56 +23111,29 @@ +@@ -61799,56 +23209,29 @@ return 0; } _ACEOF @@ -68392,7 +68595,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -61711,141 +23146,24 @@ +@@ -61861,141 +23244,24 @@ return 0; } _ACEOF @@ -68541,7 +68744,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_BLKSIZE_T 1 -@@ -61853,103 +23171,9 @@ +@@ -62003,103 +23269,9 @@ fi @@ -68648,7 +68851,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_BLKCNT_T 1 -@@ -61959,17 +23183,13 @@ +@@ -62109,17 +23281,13 @@ fi @@ -68669,7 +68872,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -61982,55 +23202,28 @@ +@@ -62132,55 +23300,28 @@ return 0; } _ACEOF @@ -68732,7 +68935,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -62043,57 +23236,30 @@ +@@ -62193,57 +23334,30 @@ return 0; } _ACEOF @@ -68797,7 +69000,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -62109,58 +23275,31 @@ +@@ -62259,58 +23373,31 @@ return 0; } _ACEOF @@ -68864,7 +69067,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -62179,74 +23318,45 @@ +@@ -62329,74 +23416,45 @@ } _ACEOF @@ -68950,7 +69153,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -62255,24 +23365,24 @@ +@@ -62405,24 +23463,24 @@ #################################################### # check for Linux-specific AFS fake-kaserver support samba_cv_WITH_FAKE_KASERVER=no @@ -68980,7 +69183,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -62284,18 +23394,14 @@ +@@ -62434,18 +23492,14 @@ test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then # see if this box has the OpenSSL DES libraries @@ -69002,7 +69205,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -62313,208 +23419,43 @@ +@@ -62463,208 +23517,43 @@ return 0; } _ACEOF @@ -69227,7 +69430,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -62526,12 +23467,10 @@ +@@ -62676,12 +23565,10 @@ if test x"$ac_cv_header_afs_h" = x"no" && test x"$ac_cv_header_afs_afs_h" = x"no"; then if test x"$samba_cv_WITH_FAKE_KASERVER" = x"auto" || test x"$samba_cv_WITH_AFS" = x"auto"; then @@ -69242,7 +69445,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi else have_afs_headers=yes -@@ -62541,9 +23480,7 @@ +@@ -62691,9 +23578,7 @@ FAKE_KASERVER_OBJ="" if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then @@ -69253,7 +69456,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure FAKE_KASERVER_OBJ="utils/net_afs.o" fi -@@ -62552,24 +23489,24 @@ +@@ -62702,24 +23587,24 @@ ################################################# # check whether to compile AFS/NT ACL mapping module samba_cv_WITH_VFS_AFSACL=no @@ -69283,7 +69486,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -62581,36 +23518,32 @@ +@@ -62731,36 +23616,32 @@ if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then @@ -69327,7 +69530,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -62620,12 +23553,12 @@ +@@ -62770,12 +23651,12 @@ # Compile with LDAP support? with_ldap_support=auto @@ -69342,7 +69545,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_ldap; case "$withval" in yes|no) with_ldap_support=$withval -@@ -62634,7 +23567,7 @@ +@@ -62784,7 +23665,7 @@ fi @@ -69351,7 +69554,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$with_ldap_support" >&6; } SMBLDAP="" -@@ -62649,150 +23582,12 @@ +@@ -62799,150 +23680,12 @@ ################################################################## # first test for ldap.h and lber.h # (ldap.h is required for this test) @@ -69508,7 +69711,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -62804,11 +23599,9 @@ +@@ -62954,11 +23697,9 @@ if test x"$ac_cv_header_ldap_h" != x"yes"; then if test x"$with_ldap_support" = x"yes"; then @@ -69522,7 +69725,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;} fi -@@ -62820,117 +23613,24 @@ +@@ -62970,117 +23711,24 @@ # unsigned int in include/includes.h case $host_os in *hpux*) @@ -69647,7 +69850,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;} fi with_ldap_support=no -@@ -62947,23 +23647,17 @@ +@@ -63097,23 +23745,17 @@ # this test must be before the libldap test @@ -69674,7 +69877,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -62981,54 +23675,28 @@ +@@ -63131,54 +23773,28 @@ return 0; } _ACEOF @@ -69736,7 +69939,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBLBER 1 _ACEOF -@@ -63044,25 +23712,19 @@ +@@ -63194,25 +23810,19 @@ fi @@ -69765,7 +69968,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ber_sockbuf_add_io to an innocuous variant, in case declares ber_sockbuf_add_io. For example, HP-UX 11i declares gettimeofday. */ -@@ -63103,61 +23765,31 @@ +@@ -63253,61 +23863,31 @@ return 0; } _ACEOF @@ -69836,7 +70039,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -63168,59 +23800,32 @@ +@@ -63318,59 +23898,32 @@ return 0; } _ACEOF @@ -69903,7 +70106,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -63231,42 +23836,19 @@ +@@ -63381,42 +23934,19 @@ return 0; } _ACEOF @@ -69950,7 +70153,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -63274,23 +23856,17 @@ +@@ -63424,23 +23954,17 @@ # now see if we can find the ldap libs in standard paths @@ -69977,7 +70180,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -63308,54 +23884,28 @@ +@@ -63458,54 +23982,28 @@ return 0; } _ACEOF @@ -70039,7 +70242,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF -@@ -63371,25 +23921,19 @@ +@@ -63521,25 +24019,19 @@ fi @@ -70068,7 +70271,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ldap_set_rebind_proc to an innocuous variant, in case declares ldap_set_rebind_proc. For example, HP-UX 11i declares gettimeofday. */ -@@ -63430,62 +23974,32 @@ +@@ -63580,62 +24072,32 @@ return 0; } _ACEOF @@ -70140,7 +70343,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -63498,37 +24012,16 @@ +@@ -63648,37 +24110,16 @@ return 0; } _ACEOF @@ -70181,7 +70384,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; } -@@ -63539,19 +24032,14 @@ +@@ -63689,19 +24130,14 @@ @@ -70204,7 +70407,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ldap_initialize to an innocuous variant, in case declares ldap_initialize. For example, HP-UX 11i declares gettimeofday. */ -@@ -63592,55 +24080,27 @@ +@@ -63742,55 +24178,27 @@ return 0; } _ACEOF @@ -70267,7 +70470,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED" default_static_modules="$default_static_modules pdb_ldap idmap_ldap"; -@@ -63648,17 +24108,15 @@ +@@ -63798,17 +24206,15 @@ SMBLDAP="lib/smbldap.o" SMBLDAPUTIL="lib/smbldap_util.o" with_ldap_support=yes @@ -70289,7 +70492,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;} fi -@@ -63673,12 +24131,12 @@ +@@ -63823,12 +24229,12 @@ # active directory support with_ads_support=auto @@ -70304,7 +70507,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_ads; case "$withval" in yes|no) with_ads_support="$withval" -@@ -63687,7 +24145,7 @@ +@@ -63837,7 +24243,7 @@ fi @@ -70313,7 +70516,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$with_ads_support" >&6; } FOUND_KRB5=no -@@ -63696,11 +24154,9 @@ +@@ -63846,11 +24252,9 @@ if test x"$with_ldap_support" != x"yes"; then if test x"$with_ads_support" = x"yes"; then @@ -70327,7 +70530,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;} with_ads_support=no fi -@@ -63715,19 +24171,14 @@ +@@ -63865,19 +24269,14 @@ *hpux*) @@ -70350,7 +70553,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ldap_init to an innocuous variant, in case declares ldap_init. For example, HP-UX 11i declares gettimeofday. */ -@@ -63768,57 +24219,29 @@ +@@ -63918,57 +24317,29 @@ return 0; } _ACEOF @@ -70416,7 +70619,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;} with_ads_support=no fi -@@ -63827,19 +24250,14 @@ +@@ -63977,19 +24348,14 @@ *) @@ -70439,7 +70642,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ldap_initialize to an innocuous variant, in case declares ldap_initialize. For example, HP-UX 11i declares gettimeofday. */ -@@ -63880,57 +24298,29 @@ +@@ -64030,57 +24396,29 @@ return 0; } _ACEOF @@ -70505,7 +70708,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;} with_ads_support=no fi -@@ -63941,19 +24331,14 @@ +@@ -64091,19 +24429,14 @@ @@ -70528,7 +70731,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define ldap_add_result_entry to an innocuous variant, in case declares ldap_add_result_entry. For example, HP-UX 11i declares gettimeofday. */ -@@ -63994,57 +24379,29 @@ +@@ -64144,57 +24477,29 @@ return 0; } _ACEOF @@ -70594,7 +70797,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;} with_ads_support=no fi -@@ -64060,23 +24417,23 @@ +@@ -64210,23 +24515,23 @@ if test x$FOUND_KRB5 = x"no"; then ################################################# # check for location of Kerberos 5 install @@ -70623,7 +70826,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$withval" >&6; } KRB5_CFLAGS="-I$withval/include" KRB5_CPPFLAGS="-I$withval/include" -@@ -64088,7 +24445,7 @@ +@@ -64238,7 +24543,7 @@ ;; esac else @@ -70632,7 +70835,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no krb5-path given" >&6; } fi -@@ -64099,9 +24456,9 @@ +@@ -64249,9 +24554,9 @@ # check for krb5-config from recent MIT and Heimdal kerberos 5 # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 @@ -70644,7 +70847,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $KRB5CONFIG in -@@ -64114,14 +24471,14 @@ +@@ -64264,14 +24569,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -70662,7 +70865,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -64129,15 +24486,15 @@ +@@ -64279,15 +24584,15 @@ fi KRB5CONFIG=$ac_cv_path_KRB5CONFIG if test -n "$KRB5CONFIG"; then @@ -70681,7 +70884,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking for working krb5-config... " >&6; } if test -x "$KRB5CONFIG" && $KRB5CONFIG --libs gssapi > /dev/null ; then ac_save_CFLAGS=$CFLAGS -@@ -64151,17 +24508,17 @@ +@@ -64301,17 +24606,17 @@ CFLAGS=$ac_save_CFLAGS;export CFLAGS LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS FOUND_KRB5=yes @@ -70702,7 +70905,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking for /usr/include/heimdal... " >&6; } if test -d /usr/include/heimdal; then if test -f /usr/lib/heimdal/lib/libkrb5.a; then -@@ -64169,17 +24526,17 @@ +@@ -64319,17 +24624,17 @@ KRB5_CPPFLAGS="-I/usr/include/heimdal" KRB5_LDFLAGS="-L/usr/lib/heimdal/lib" FOUND_KRB5=yes @@ -70723,7 +70926,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi fi -@@ -64187,17 +24544,17 @@ +@@ -64337,17 +24642,17 @@ if test x$FOUND_KRB5 = x"no"; then ################################################# # see if this box has the RedHat location for kerberos @@ -70744,7 +70947,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi fi -@@ -64205,16 +24562,16 @@ +@@ -64355,16 +24660,16 @@ if test x$FOUND_KRB5 = x"no"; then ################################################# # see if this box has the OpenBSD location for heimdal krb5 @@ -70764,7 +70967,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi fi -@@ -64259,193 +24616,54 @@ +@@ -64409,193 +24714,54 @@ KRB5_LIBS=$ac_new_flags @@ -71003,7 +71206,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -64459,11 +24677,9 @@ +@@ -64609,11 +24775,9 @@ # i.e with_ads_support = auto, otherwise die with an error. if test x"$with_ads_support" = x"yes"; then @@ -71017,7 +71220,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;} fi -@@ -64475,65 +24691,16 @@ +@@ -64625,65 +24789,16 @@ CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS fi @@ -71089,7 +71292,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -64550,17 +24717,13 @@ +@@ -64700,17 +24815,13 @@ # check for new heimdal KRB5_DEPRECATED handling @@ -71110,7 +71313,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define KRB5_DEPRECATED 1 #include -@@ -64572,42 +24735,19 @@ +@@ -64722,42 +24833,19 @@ return 0; } _ACEOF @@ -71157,7 +71360,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -64621,152 +24761,12 @@ +@@ -64771,152 +24859,12 @@ # now check for gssapi headers. This is also done here to allow for # different kerberos include paths @@ -71316,7 +71519,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -64780,23 +24780,17 @@ +@@ -64930,23 +24878,17 @@ # we might need the k5crypto and com_err libraries on some systems @@ -71343,7 +71546,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -64814,54 +24808,28 @@ +@@ -64964,54 +24906,28 @@ return 0; } _ACEOF @@ -71405,7 +71608,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBCOM_ERR 1 _ACEOF -@@ -64878,24 +24846,17 @@ +@@ -65028,24 +24944,17 @@ fi @@ -71433,7 +71636,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -64913,54 +24874,28 @@ +@@ -65063,54 +24972,28 @@ return 0; } _ACEOF @@ -71495,7 +71698,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBK5CRYPTO 1 _ACEOF -@@ -64976,27 +24911,20 @@ +@@ -65126,27 +25009,20 @@ fi @@ -71526,7 +71729,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65014,54 +24942,28 @@ +@@ -65164,54 +25040,28 @@ return 0; } _ACEOF @@ -71588,7 +71791,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPTO 1 _ACEOF -@@ -65078,24 +24980,17 @@ +@@ -65228,24 +25078,17 @@ fi @@ -71616,7 +71819,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65113,54 +25008,28 @@ +@@ -65263,54 +25106,28 @@ return 0; } _ACEOF @@ -71678,7 +71881,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBASN1 1 _ACEOF -@@ -65177,24 +25046,17 @@ +@@ -65327,24 +25144,17 @@ fi @@ -71706,7 +71909,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65212,54 +25074,28 @@ +@@ -65362,54 +25172,28 @@ return 0; } _ACEOF @@ -71768,7 +71971,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBROKEN 1 _ACEOF -@@ -65275,27 +25111,20 @@ +@@ -65425,27 +25209,20 @@ fi @@ -71799,7 +72002,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65313,54 +25142,28 @@ +@@ -65463,54 +25240,28 @@ return 0; } _ACEOF @@ -71861,7 +72064,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBGSSAPI 1 _ACEOF -@@ -65376,29 +25179,22 @@ +@@ -65526,29 +25277,22 @@ fi @@ -71894,7 +72097,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65416,54 +25212,28 @@ +@@ -65566,54 +25310,28 @@ return 0; } _ACEOF @@ -71956,7 +72159,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBKRB5 1 _ACEOF -@@ -65480,24 +25250,17 @@ +@@ -65630,24 +25348,17 @@ fi @@ -71984,7 +72187,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65515,54 +25278,28 @@ +@@ -65665,54 +25376,28 @@ return 0; } _ACEOF @@ -72046,7 +72249,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBKRB5 1 _ACEOF -@@ -65578,29 +25315,22 @@ +@@ -65728,29 +25413,22 @@ fi @@ -72079,7 +72282,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -65618,54 +25348,28 @@ +@@ -65768,54 +25446,28 @@ return 0; } _ACEOF @@ -72141,7 +72344,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBGSSAPI_KRB5 1 _ACEOF -@@ -65680,24 +25384,18 @@ +@@ -65830,24 +25482,18 @@ have_gssapi=yes fi @@ -72169,7 +72372,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_set_real_time to an innocuous variant, in case declares krb5_set_real_time. For example, HP-UX 11i declares gettimeofday. */ -@@ -65738,43 +25436,18 @@ +@@ -65888,43 +25534,18 @@ return 0; } _ACEOF @@ -72219,7 +72422,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_SET_REAL_TIME 1 _ACEOF -@@ -65782,20 +25455,14 @@ +@@ -65932,20 +25553,14 @@ fi @@ -72243,7 +72446,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_set_default_in_tkt_etypes to an innocuous variant, in case declares krb5_set_default_in_tkt_etypes. For example, HP-UX 11i declares gettimeofday. */ -@@ -65836,43 +25503,18 @@ +@@ -65986,43 +25601,18 @@ return 0; } _ACEOF @@ -72293,7 +72496,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1 _ACEOF -@@ -65880,20 +25522,14 @@ +@@ -66030,20 +25620,14 @@ fi @@ -72317,7 +72520,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_set_default_tgs_enctypes to an innocuous variant, in case declares krb5_set_default_tgs_enctypes. For example, HP-UX 11i declares gettimeofday. */ -@@ -65934,43 +25570,18 @@ +@@ -66084,43 +25668,18 @@ return 0; } _ACEOF @@ -72367,7 +72570,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1 _ACEOF -@@ -65978,20 +25589,14 @@ +@@ -66128,20 +25687,14 @@ fi @@ -72391,7 +72594,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_set_default_tgs_ktypes to an innocuous variant, in case declares krb5_set_default_tgs_ktypes. For example, HP-UX 11i declares gettimeofday. */ -@@ -66032,43 +25637,18 @@ +@@ -66182,43 +25735,18 @@ return 0; } _ACEOF @@ -72441,7 +72644,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1 _ACEOF -@@ -66076,20 +25656,14 @@ +@@ -66226,20 +25754,14 @@ fi @@ -72465,7 +72668,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_principal2salt to an innocuous variant, in case declares krb5_principal2salt. For example, HP-UX 11i declares gettimeofday. */ -@@ -66130,43 +25704,18 @@ +@@ -66280,43 +25802,18 @@ return 0; } _ACEOF @@ -72515,7 +72718,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_PRINCIPAL2SALT 1 _ACEOF -@@ -66174,20 +25723,14 @@ +@@ -66324,20 +25821,14 @@ fi @@ -72539,7 +72742,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_use_enctype to an innocuous variant, in case declares krb5_use_enctype. For example, HP-UX 11i declares gettimeofday. */ -@@ -66228,43 +25771,18 @@ +@@ -66378,43 +25869,18 @@ return 0; } _ACEOF @@ -72589,7 +72792,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_USE_ENCTYPE 1 _ACEOF -@@ -66272,20 +25790,14 @@ +@@ -66422,20 +25888,14 @@ fi @@ -72613,7 +72816,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_string_to_key to an innocuous variant, in case declares krb5_string_to_key. For example, HP-UX 11i declares gettimeofday. */ -@@ -66326,43 +25838,18 @@ +@@ -66476,43 +25936,18 @@ return 0; } _ACEOF @@ -72663,7 +72866,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_STRING_TO_KEY 1 _ACEOF -@@ -66370,20 +25857,14 @@ +@@ -66520,20 +25955,14 @@ fi @@ -72687,7 +72890,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_pw_salt to an innocuous variant, in case declares krb5_get_pw_salt. For example, HP-UX 11i declares gettimeofday. */ -@@ -66424,43 +25905,18 @@ +@@ -66574,43 +26003,18 @@ return 0; } _ACEOF @@ -72737,7 +72940,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_PW_SALT 1 _ACEOF -@@ -66468,20 +25924,14 @@ +@@ -66618,20 +26022,14 @@ fi @@ -72761,7 +72964,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_string_to_key_salt to an innocuous variant, in case declares krb5_string_to_key_salt. For example, HP-UX 11i declares gettimeofday. */ -@@ -66522,43 +25972,18 @@ +@@ -66672,43 +26070,18 @@ return 0; } _ACEOF @@ -72811,7 +73014,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_STRING_TO_KEY_SALT 1 _ACEOF -@@ -66566,20 +25991,14 @@ +@@ -66716,20 +26089,14 @@ fi @@ -72835,7 +73038,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_auth_con_setkey to an innocuous variant, in case declares krb5_auth_con_setkey. For example, HP-UX 11i declares gettimeofday. */ -@@ -66620,43 +26039,18 @@ +@@ -66770,43 +26137,18 @@ return 0; } _ACEOF @@ -72885,7 +73088,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_AUTH_CON_SETKEY 1 _ACEOF -@@ -66664,20 +26058,14 @@ +@@ -66814,20 +26156,14 @@ fi @@ -72909,7 +73112,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_auth_con_setuseruserkey to an innocuous variant, in case declares krb5_auth_con_setuseruserkey. For example, HP-UX 11i declares gettimeofday. */ -@@ -66718,43 +26106,18 @@ +@@ -66868,43 +26204,18 @@ return 0; } _ACEOF @@ -72959,7 +73162,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1 _ACEOF -@@ -66762,20 +26125,14 @@ +@@ -66912,20 +26223,14 @@ fi @@ -72983,7 +73186,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_locate_kdc to an innocuous variant, in case declares krb5_locate_kdc. For example, HP-UX 11i declares gettimeofday. */ -@@ -66816,43 +26173,18 @@ +@@ -66966,43 +26271,18 @@ return 0; } _ACEOF @@ -73033,7 +73236,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_LOCATE_KDC 1 _ACEOF -@@ -66860,20 +26192,14 @@ +@@ -67010,20 +26290,14 @@ fi @@ -73057,7 +73260,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_permitted_enctypes to an innocuous variant, in case declares krb5_get_permitted_enctypes. For example, HP-UX 11i declares gettimeofday. */ -@@ -66914,43 +26240,18 @@ +@@ -67064,43 +26338,18 @@ return 0; } _ACEOF @@ -73107,7 +73310,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1 _ACEOF -@@ -66958,20 +26259,14 @@ +@@ -67108,20 +26357,14 @@ fi @@ -73131,7 +73334,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_default_in_tkt_etypes to an innocuous variant, in case declares krb5_get_default_in_tkt_etypes. For example, HP-UX 11i declares gettimeofday. */ -@@ -67012,43 +26307,18 @@ +@@ -67162,43 +26405,18 @@ return 0; } _ACEOF @@ -73181,7 +73384,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1 _ACEOF -@@ -67056,20 +26326,14 @@ +@@ -67206,20 +26424,14 @@ fi @@ -73205,7 +73408,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_free_data_contents to an innocuous variant, in case declares krb5_free_data_contents. For example, HP-UX 11i declares gettimeofday. */ -@@ -67110,43 +26374,18 @@ +@@ -67260,43 +26472,18 @@ return 0; } _ACEOF @@ -73255,7 +73458,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_FREE_DATA_CONTENTS 1 _ACEOF -@@ -67154,20 +26393,14 @@ +@@ -67304,20 +26491,14 @@ fi @@ -73279,7 +73482,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_principal_get_comp_string to an innocuous variant, in case declares krb5_principal_get_comp_string. For example, HP-UX 11i declares gettimeofday. */ -@@ -67208,43 +26441,18 @@ +@@ -67358,43 +26539,18 @@ return 0; } _ACEOF @@ -73329,7 +73532,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1 _ACEOF -@@ -67252,20 +26460,14 @@ +@@ -67402,20 +26558,14 @@ fi @@ -73353,7 +73556,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_free_unparsed_name to an innocuous variant, in case declares krb5_free_unparsed_name. For example, HP-UX 11i declares gettimeofday. */ -@@ -67306,43 +26508,18 @@ +@@ -67456,43 +26606,18 @@ return 0; } _ACEOF @@ -73403,7 +73606,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_FREE_UNPARSED_NAME 1 _ACEOF -@@ -67350,20 +26527,14 @@ +@@ -67500,20 +26625,14 @@ fi @@ -73427,7 +73630,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_free_keytab_entry_contents to an innocuous variant, in case declares krb5_free_keytab_entry_contents. For example, HP-UX 11i declares gettimeofday. */ -@@ -67404,43 +26575,18 @@ +@@ -67554,43 +26673,18 @@ return 0; } _ACEOF @@ -73477,7 +73680,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1 _ACEOF -@@ -67448,20 +26594,14 @@ +@@ -67598,20 +26692,14 @@ fi @@ -73501,7 +73704,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_kt_free_entry to an innocuous variant, in case declares krb5_kt_free_entry. For example, HP-UX 11i declares gettimeofday. */ -@@ -67502,43 +26642,18 @@ +@@ -67652,43 +26740,18 @@ return 0; } _ACEOF @@ -73551,7 +73754,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_KT_FREE_ENTRY 1 _ACEOF -@@ -67546,20 +26661,14 @@ +@@ -67696,20 +26759,14 @@ fi @@ -73575,7 +73778,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_krbhst_init to an innocuous variant, in case declares krb5_krbhst_init. For example, HP-UX 11i declares gettimeofday. */ -@@ -67600,43 +26709,18 @@ +@@ -67750,43 +26807,18 @@ return 0; } _ACEOF @@ -73625,7 +73828,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_KRBHST_INIT 1 _ACEOF -@@ -67644,20 +26728,14 @@ +@@ -67794,20 +26826,14 @@ fi @@ -73649,7 +73852,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_krbhst_get_addrinfo to an innocuous variant, in case declares krb5_krbhst_get_addrinfo. For example, HP-UX 11i declares gettimeofday. */ -@@ -67698,43 +26776,18 @@ +@@ -67848,43 +26874,18 @@ return 0; } _ACEOF @@ -73699,7 +73902,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_KRBHST_GET_ADDRINFO 1 _ACEOF -@@ -67742,20 +26795,14 @@ +@@ -67892,20 +26893,14 @@ fi @@ -73723,7 +73926,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_c_enctype_compare to an innocuous variant, in case declares krb5_c_enctype_compare. For example, HP-UX 11i declares gettimeofday. */ -@@ -67796,43 +26843,18 @@ +@@ -67946,43 +26941,18 @@ return 0; } _ACEOF @@ -73773,7 +73976,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_C_ENCTYPE_COMPARE 1 _ACEOF -@@ -67840,20 +26862,14 @@ +@@ -67990,20 +26960,14 @@ fi @@ -73797,7 +74000,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_enctypes_compatible_keys to an innocuous variant, in case declares krb5_enctypes_compatible_keys. For example, HP-UX 11i declares gettimeofday. */ -@@ -67894,43 +26910,18 @@ +@@ -68044,43 +27008,18 @@ return 0; } _ACEOF @@ -73847,7 +74050,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1 _ACEOF -@@ -67938,20 +26929,14 @@ +@@ -68088,20 +27027,14 @@ fi @@ -73871,7 +74074,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_crypto_init to an innocuous variant, in case declares krb5_crypto_init. For example, HP-UX 11i declares gettimeofday. */ -@@ -67992,43 +26977,18 @@ +@@ -68142,43 +27075,18 @@ return 0; } _ACEOF @@ -73921,7 +74124,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_CRYPTO_INIT 1 _ACEOF -@@ -68036,20 +26996,14 @@ +@@ -68186,20 +27094,14 @@ fi @@ -73945,7 +74148,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_crypto_destroy to an innocuous variant, in case declares krb5_crypto_destroy. For example, HP-UX 11i declares gettimeofday. */ -@@ -68090,43 +27044,18 @@ +@@ -68240,43 +27142,18 @@ return 0; } _ACEOF @@ -73995,7 +74198,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_CRYPTO_DESTROY 1 _ACEOF -@@ -68134,20 +27063,14 @@ +@@ -68284,20 +27161,14 @@ fi @@ -74019,7 +74222,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_decode_ap_req to an innocuous variant, in case declares krb5_decode_ap_req. For example, HP-UX 11i declares gettimeofday. */ -@@ -68188,43 +27111,18 @@ +@@ -68338,43 +27209,18 @@ return 0; } _ACEOF @@ -74069,7 +74272,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_DECODE_AP_REQ 1 _ACEOF -@@ -68232,20 +27130,14 @@ +@@ -68382,20 +27228,14 @@ fi @@ -74093,7 +74296,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define free_AP_REQ to an innocuous variant, in case declares free_AP_REQ. For example, HP-UX 11i declares gettimeofday. */ -@@ -68286,43 +27178,18 @@ +@@ -68436,43 +27276,18 @@ return 0; } _ACEOF @@ -74143,7 +74346,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_FREE_AP_REQ 1 _ACEOF -@@ -68330,20 +27197,14 @@ +@@ -68480,20 +27295,14 @@ fi @@ -74167,7 +74370,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_verify_checksum to an innocuous variant, in case declares krb5_verify_checksum. For example, HP-UX 11i declares gettimeofday. */ -@@ -68384,43 +27245,18 @@ +@@ -68534,43 +27343,18 @@ return 0; } _ACEOF @@ -74217,7 +74420,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_VERIFY_CHECKSUM 1 _ACEOF -@@ -68428,20 +27264,14 @@ +@@ -68578,20 +27362,14 @@ fi @@ -74241,7 +74444,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_c_verify_checksum to an innocuous variant, in case declares krb5_c_verify_checksum. For example, HP-UX 11i declares gettimeofday. */ -@@ -68482,43 +27312,18 @@ +@@ -68632,43 +27410,18 @@ return 0; } _ACEOF @@ -74291,7 +74494,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_C_VERIFY_CHECKSUM 1 _ACEOF -@@ -68526,20 +27331,14 @@ +@@ -68676,20 +27429,14 @@ fi @@ -74315,7 +74518,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_principal_compare_any_realm to an innocuous variant, in case declares krb5_principal_compare_any_realm. For example, HP-UX 11i declares gettimeofday. */ -@@ -68580,43 +27379,18 @@ +@@ -68730,43 +27477,18 @@ return 0; } _ACEOF @@ -74365,7 +74568,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1 _ACEOF -@@ -68624,20 +27398,14 @@ +@@ -68774,20 +27496,14 @@ fi @@ -74389,7 +74592,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_parse_name_norealm to an innocuous variant, in case declares krb5_parse_name_norealm. For example, HP-UX 11i declares gettimeofday. */ -@@ -68678,43 +27446,18 @@ +@@ -68828,43 +27544,18 @@ return 0; } _ACEOF @@ -74439,7 +74642,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_PARSE_NAME_NOREALM 1 _ACEOF -@@ -68722,20 +27465,14 @@ +@@ -68872,20 +27563,14 @@ fi @@ -74463,7 +74666,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_princ_size to an innocuous variant, in case declares krb5_princ_size. For example, HP-UX 11i declares gettimeofday. */ -@@ -68776,43 +27513,18 @@ +@@ -68926,43 +27611,18 @@ return 0; } _ACEOF @@ -74513,7 +74716,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_PRINC_SIZE 1 _ACEOF -@@ -68820,20 +27532,14 @@ +@@ -68970,20 +27630,14 @@ fi @@ -74537,7 +74740,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_init_creds_opt_set_pac_request to an innocuous variant, in case declares krb5_get_init_creds_opt_set_pac_request. For example, HP-UX 11i declares gettimeofday. */ -@@ -68874,43 +27580,18 @@ +@@ -69024,43 +27678,18 @@ return 0; } _ACEOF @@ -74587,7 +74790,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1 _ACEOF -@@ -68918,20 +27599,14 @@ +@@ -69068,20 +27697,14 @@ fi @@ -74611,7 +74814,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_renewed_creds to an innocuous variant, in case declares krb5_get_renewed_creds. For example, HP-UX 11i declares gettimeofday. */ -@@ -68972,43 +27647,18 @@ +@@ -69122,43 +27745,18 @@ return 0; } _ACEOF @@ -74661,7 +74864,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_RENEWED_CREDS 1 _ACEOF -@@ -69016,20 +27666,14 @@ +@@ -69166,20 +27764,14 @@ fi @@ -74685,7 +74888,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_kdc_cred to an innocuous variant, in case declares krb5_get_kdc_cred. For example, HP-UX 11i declares gettimeofday. */ -@@ -69070,43 +27714,18 @@ +@@ -69220,43 +27812,18 @@ return 0; } _ACEOF @@ -74735,7 +74938,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_KDC_CRED 1 _ACEOF -@@ -69114,20 +27733,14 @@ +@@ -69264,20 +27831,14 @@ fi @@ -74759,7 +74962,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_free_error_contents to an innocuous variant, in case declares krb5_free_error_contents. For example, HP-UX 11i declares gettimeofday. */ -@@ -69168,43 +27781,18 @@ +@@ -69318,43 +27879,18 @@ return 0; } _ACEOF @@ -74809,7 +75012,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_FREE_ERROR_CONTENTS 1 _ACEOF -@@ -69212,20 +27800,14 @@ +@@ -69362,20 +27898,14 @@ fi @@ -74833,7 +75036,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define initialize_krb5_error_table to an innocuous variant, in case declares initialize_krb5_error_table. For example, HP-UX 11i declares gettimeofday. */ -@@ -69266,43 +27848,18 @@ +@@ -69416,43 +27946,18 @@ return 0; } _ACEOF @@ -74883,7 +75086,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1 _ACEOF -@@ -69310,20 +27867,14 @@ +@@ -69460,20 +27965,14 @@ fi @@ -74907,7 +75110,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_init_creds_opt_alloc to an innocuous variant, in case declares krb5_get_init_creds_opt_alloc. For example, HP-UX 11i declares gettimeofday. */ -@@ -69364,43 +27915,18 @@ +@@ -69514,43 +28013,18 @@ return 0; } _ACEOF @@ -74957,7 +75160,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1 _ACEOF -@@ -69408,20 +27934,14 @@ +@@ -69558,20 +28032,14 @@ fi @@ -74981,7 +75184,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_init_creds_opt_free to an innocuous variant, in case declares krb5_get_init_creds_opt_free. For example, HP-UX 11i declares gettimeofday. */ -@@ -69462,43 +27982,18 @@ +@@ -69612,43 +28080,18 @@ return 0; } _ACEOF @@ -75031,7 +75234,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1 _ACEOF -@@ -69506,20 +28001,14 @@ +@@ -69656,20 +28099,14 @@ fi @@ -75055,7 +75258,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_init_creds_opt_get_error to an innocuous variant, in case declares krb5_get_init_creds_opt_get_error. For example, HP-UX 11i declares gettimeofday. */ -@@ -69551,52 +28040,27 @@ +@@ -69701,52 +28138,27 @@ #if defined __stub_krb5_get_init_creds_opt_get_error || defined __stub___krb5_get_init_creds_opt_get_error choke me #endif @@ -75123,7 +75326,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1 _ACEOF -@@ -69604,20 +28068,14 @@ +@@ -69754,20 +28166,14 @@ fi @@ -75147,7 +75350,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_enctype_to_string to an innocuous variant, in case declares krb5_enctype_to_string. For example, HP-UX 11i declares gettimeofday. */ -@@ -69658,43 +28116,18 @@ +@@ -69808,43 +28214,18 @@ return 0; } _ACEOF @@ -75197,7 +75400,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_ENCTYPE_TO_STRING 1 _ACEOF -@@ -69702,20 +28135,14 @@ +@@ -69852,20 +28233,14 @@ fi @@ -75221,7 +75424,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_fwd_tgt_creds to an innocuous variant, in case declares krb5_fwd_tgt_creds. For example, HP-UX 11i declares gettimeofday. */ -@@ -69756,43 +28183,18 @@ +@@ -69906,43 +28281,18 @@ return 0; } _ACEOF @@ -75271,7 +75474,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_FWD_TGT_CREDS 1 _ACEOF -@@ -69800,20 +28202,14 @@ +@@ -69950,20 +28300,14 @@ fi @@ -75295,7 +75498,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_auth_con_set_req_cksumtype to an innocuous variant, in case declares krb5_auth_con_set_req_cksumtype. For example, HP-UX 11i declares gettimeofday. */ -@@ -69854,43 +28250,18 @@ +@@ -70004,43 +28348,18 @@ return 0; } _ACEOF @@ -75345,7 +75548,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1 _ACEOF -@@ -69898,20 +28269,14 @@ +@@ -70048,20 +28367,14 @@ fi @@ -75369,7 +75572,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_creds_opt_alloc to an innocuous variant, in case declares krb5_get_creds_opt_alloc. For example, HP-UX 11i declares gettimeofday. */ -@@ -69952,43 +28317,18 @@ +@@ -70102,43 +28415,18 @@ return 0; } _ACEOF @@ -75419,7 +75622,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1 _ACEOF -@@ -69996,20 +28336,14 @@ +@@ -70146,20 +28434,14 @@ fi @@ -75443,7 +75646,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_creds_opt_set_impersonate to an innocuous variant, in case declares krb5_get_creds_opt_set_impersonate. For example, HP-UX 11i declares gettimeofday. */ -@@ -70050,43 +28384,18 @@ +@@ -70200,43 +28482,18 @@ return 0; } _ACEOF @@ -75493,7 +75696,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1 _ACEOF -@@ -70094,20 +28403,14 @@ +@@ -70244,20 +28501,14 @@ fi @@ -75517,7 +75720,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_creds to an innocuous variant, in case declares krb5_get_creds. For example, HP-UX 11i declares gettimeofday. */ -@@ -70148,43 +28451,18 @@ +@@ -70298,43 +28549,18 @@ return 0; } _ACEOF @@ -75567,7 +75770,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_CREDS 1 _ACEOF -@@ -70192,20 +28470,14 @@ +@@ -70342,20 +28568,14 @@ fi @@ -75591,7 +75794,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_credentials_for_user to an innocuous variant, in case declares krb5_get_credentials_for_user. For example, HP-UX 11i declares gettimeofday. */ -@@ -70246,43 +28518,18 @@ +@@ -70396,43 +28616,18 @@ return 0; } _ACEOF @@ -75641,7 +75844,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1 _ACEOF -@@ -70290,20 +28537,14 @@ +@@ -70440,20 +28635,14 @@ fi @@ -75665,7 +75868,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_get_host_realm to an innocuous variant, in case declares krb5_get_host_realm. For example, HP-UX 11i declares gettimeofday. */ -@@ -70344,43 +28585,18 @@ +@@ -70494,43 +28683,18 @@ return 0; } _ACEOF @@ -75715,7 +75918,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_KRB5_GET_HOST_REALM 1 _ACEOF -@@ -70388,20 +28604,14 @@ +@@ -70538,20 +28702,14 @@ fi @@ -75739,7 +75942,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define krb5_free_host_realm to an innocuous variant, in case declares krb5_free_host_realm. For example, HP-UX 11i declares gettimeofday. */ -@@ -70442,208 +28652,62 @@ +@@ -70592,208 +28750,62 @@ return 0; } _ACEOF @@ -75969,7 +76172,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -70663,57 +28727,30 @@ +@@ -70813,57 +28825,30 @@ return 0; } _ACEOF @@ -76034,7 +76237,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -70729,58 +28766,31 @@ +@@ -70879,58 +28864,31 @@ return 0; } _ACEOF @@ -76100,7 +76303,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -70792,36 +28802,15 @@ +@@ -70942,36 +28900,15 @@ return 0; } _ACEOF @@ -76140,7 +76343,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$smb_krb5_cv_verify_checksum" >&6; } cat >>confdefs.h <<_ACEOF -@@ -70829,17 +28818,13 @@ +@@ -70979,17 +28916,13 @@ _ACEOF @@ -76161,7 +76364,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -70850,56 +28835,29 @@ +@@ -71000,56 +28933,29 @@ return 0; } _ACEOF @@ -76225,7 +76428,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -70910,56 +28868,29 @@ +@@ -71060,56 +28966,29 @@ return 0; } _ACEOF @@ -76289,7 +76492,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -70970,56 +28901,29 @@ +@@ -71120,56 +28999,29 @@ return 0; } _ACEOF @@ -76353,7 +76556,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71030,56 +28934,29 @@ +@@ -71180,56 +29032,29 @@ return 0; } _ACEOF @@ -76417,7 +76620,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71090,56 +28967,29 @@ +@@ -71240,56 +29065,29 @@ return 0; } _ACEOF @@ -76481,7 +76684,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71150,56 +29000,29 @@ +@@ -71300,56 +29098,29 @@ return 0; } _ACEOF @@ -76545,7 +76748,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71210,56 +29033,29 @@ +@@ -71360,56 +29131,29 @@ return 0; } _ACEOF @@ -76609,7 +76812,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71270,55 +29066,28 @@ +@@ -71420,55 +29164,28 @@ return 0; } _ACEOF @@ -76672,7 +76875,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71329,56 +29098,29 @@ +@@ -71479,56 +29196,29 @@ return 0; } _ACEOF @@ -76736,7 +76939,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71389,56 +29131,29 @@ +@@ -71539,56 +29229,29 @@ return 0; } _ACEOF @@ -76800,7 +77003,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71449,56 +29164,29 @@ +@@ -71599,56 +29262,29 @@ return 0; } _ACEOF @@ -76864,7 +77067,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71509,56 +29197,29 @@ +@@ -71659,56 +29295,29 @@ return 0; } _ACEOF @@ -76928,7 +77131,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71569,47 +29230,22 @@ +@@ -71719,47 +29328,22 @@ return 0; } _ACEOF @@ -76982,7 +77185,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71620,58 +29256,31 @@ +@@ -71770,58 +29354,31 @@ return 0; } _ACEOF @@ -77048,7 +77251,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71682,56 +29291,29 @@ +@@ -71832,56 +29389,29 @@ return 0; } _ACEOF @@ -77112,7 +77315,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71742,56 +29324,29 @@ +@@ -71892,56 +29422,29 @@ return 0; } _ACEOF @@ -77176,7 +77379,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71802,56 +29357,29 @@ +@@ -71952,56 +29455,29 @@ return 0; } _ACEOF @@ -77240,7 +77443,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71862,56 +29390,29 @@ +@@ -72012,56 +29488,29 @@ return 0; } _ACEOF @@ -77304,7 +77507,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71922,61 +29423,30 @@ +@@ -72072,61 +29521,30 @@ return 0; } _ACEOF @@ -77375,7 +77578,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -71987,56 +29457,29 @@ +@@ -72137,56 +29555,29 @@ return 0; } _ACEOF @@ -77439,7 +77642,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72047,56 +29490,29 @@ +@@ -72197,56 +29588,29 @@ return 0; } _ACEOF @@ -77503,7 +77706,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72107,65 +29523,35 @@ +@@ -72257,65 +29621,35 @@ return 0; } _ACEOF @@ -77580,7 +77783,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -72178,65 +29564,32 @@ +@@ -72328,65 +29662,32 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); } _ACEOF @@ -77655,7 +77858,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72247,56 +29600,29 @@ +@@ -72397,56 +29698,29 @@ return 0; } _ACEOF @@ -77719,7 +77922,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72310,56 +29636,29 @@ +@@ -72460,56 +29734,29 @@ return 0; } _ACEOF @@ -77783,7 +77986,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72370,56 +29669,29 @@ +@@ -72520,56 +29767,29 @@ return 0; } _ACEOF @@ -77847,7 +78050,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72431,49 +29703,26 @@ +@@ -72581,49 +29801,26 @@ return 0; } _ACEOF @@ -77903,7 +78106,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -72487,20 +29736,13 @@ +@@ -72637,20 +29834,13 @@ old_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS"; export LDFLAGS; @@ -77929,7 +78132,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -72514,42 +29756,15 @@ +@@ -72664,42 +29854,15 @@ } _ACEOF @@ -77976,7 +78179,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$old_CFLAGS"; old_CFLAGS=""; export CFLAGS; -@@ -72561,20 +29776,18 @@ +@@ -72711,20 +29874,18 @@ export LDFLAGS; fi @@ -78001,7 +78204,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -72588,20 +29801,13 @@ +@@ -72738,20 +29899,13 @@ old_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS"; export LDFLAGS; @@ -78027,7 +78230,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -72612,42 +29818,15 @@ +@@ -72762,42 +29916,15 @@ } _ACEOF @@ -78074,7 +78277,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$old_CFLAGS"; old_CFLAGS=""; export CFLAGS; -@@ -72659,29 +29838,23 @@ +@@ -72809,29 +29936,23 @@ export LDFLAGS; fi @@ -78109,7 +78312,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72692,61 +29865,30 @@ +@@ -72842,61 +29963,30 @@ return 0; } _ACEOF @@ -78180,7 +78383,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -72757,47 +29899,20 @@ +@@ -72907,47 +29997,20 @@ return 0; } _ACEOF @@ -78234,7 +78437,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -72809,7 +29924,7 @@ +@@ -72959,7 +30022,7 @@ # # if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then @@ -78243,7 +78446,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;} use_ads=no fi -@@ -72817,7 +29932,7 @@ +@@ -72967,7 +30030,7 @@ if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \ x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes" then @@ -78252,7 +78455,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;} use_ads=no fi -@@ -72825,7 +29940,7 @@ +@@ -72975,7 +30038,7 @@ if test x"$ac_cv_func_ext_krb5_get_permitted_enctypes" != x"yes" -a \ x"$ac_cv_func_ext_krb5_get_default_in_tkt_etypes" != x"yes" then @@ -78261,7 +78464,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;} use_ads=no fi -@@ -72833,7 +29948,7 @@ +@@ -72983,7 +30046,7 @@ if test x"$ac_cv_func_ext_krb5_kt_free_entry" != x"yes" -a \ x"$ac_cv_func_ext_krb5_free_keytab_entry_contents" != x"yes" then @@ -78270,7 +78473,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;} use_ads=no fi -@@ -72841,7 +29956,7 @@ +@@ -72991,7 +30054,7 @@ if test x"$ac_cv_func_ext_krb5_c_verify_checksum" != x"yes" -a \ x"$ac_cv_func_ext_krb5_verify_checksum" != x"yes" then @@ -78279,7 +78482,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;} use_ads=no fi -@@ -72853,14 +29968,14 @@ +@@ -73003,14 +30066,14 @@ if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes" then @@ -78296,7 +78499,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;} use_ads=no fi -@@ -72869,29 +29984,21 @@ +@@ -73019,29 +30082,21 @@ if test x"$use_ads" = x"yes"; then @@ -78331,7 +78534,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;} fi -@@ -72917,9 +30024,9 @@ +@@ -73067,9 +30122,9 @@ KRB5_LIBS="" with_ads_support=no fi @@ -78343,7 +78546,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$use_ads" >&6; } LIBS="$ac_save_LIBS" -@@ -72931,23 +30038,17 @@ +@@ -73081,23 +30136,17 @@ @@ -78370,7 +78573,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -72965,54 +30066,28 @@ +@@ -73115,54 +30164,28 @@ return 0; } _ACEOF @@ -78432,7 +78635,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSCD 1 _ACEOF -@@ -73027,7 +30102,6 @@ +@@ -73177,7 +30200,6 @@ fi @@ -78440,7 +78643,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS" -@@ -73035,12 +30109,12 @@ +@@ -73185,12 +30207,12 @@ # Compile with DNS Updates support? with_dnsupdate_support=no @@ -78455,7 +78658,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_dnsupdate; case "$withval" in yes|no) with_dnsupdate_support=$withval -@@ -73049,7 +30123,7 @@ +@@ -73199,7 +30221,7 @@ fi @@ -78464,7 +78667,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$with_dnsupdate_support" >&6; } if test x"$with_dnsupdate_support" != x"no"; then -@@ -73063,151 +30137,12 @@ +@@ -73213,151 +30235,12 @@ ################################################################## # then test for uuid.h (necessary to generate unique DNS keynames # (uuid.h is required for this test) @@ -78621,7 +78824,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -73217,11 +30152,9 @@ +@@ -73367,11 +30250,9 @@ if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then if test x"$with_dnsupdate_support" = x"yes"; then @@ -78635,7 +78838,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;} fi with_dnsupdate_support=no -@@ -73237,102 +30170,12 @@ +@@ -73387,102 +30268,12 @@ UUID_LIBS="" @@ -78743,7 +78946,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF # uuid_generate was found in libc or existing $LIBS -@@ -73349,9 +30192,7 @@ +@@ -73499,9 +30290,7 @@ with_dnsupdate_support=yes @@ -78754,7 +78957,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -73364,11 +30205,9 @@ +@@ -73514,11 +30303,9 @@ if test x"$with_dnsupdate_support" = x"yes"; then @@ -78768,7 +78971,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;} fi with_dnsupdate_support=no -@@ -73377,18 +30216,14 @@ +@@ -73527,18 +30314,14 @@ ;; *) # uuid_generate was not found, try adding libuuid @@ -78790,7 +78993,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -73406,43 +30241,18 @@ +@@ -73556,43 +30339,18 @@ return 0; } _ACEOF @@ -78840,7 +79043,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="-luuid $LIBS" -@@ -73458,9 +30268,7 @@ +@@ -73608,9 +30366,7 @@ with_dnsupdate_support=yes @@ -78851,7 +79054,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -@@ -73470,11 +30278,9 @@ +@@ -73620,11 +30376,9 @@ if test x"$with_dnsupdate_support" = x"yes"; then @@ -78865,7 +79068,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;} fi with_dnsupdate_support=no -@@ -73494,28 +30300,26 @@ +@@ -73644,28 +30398,26 @@ ################################################# # check for automount support @@ -78900,7 +79103,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -73526,34 +30330,30 @@ +@@ -73676,34 +30428,30 @@ CIFSMOUNT_PROGS="" INSTALL_CIFSMOUNT="" UNINSTALL_CIFSMOUNT="" @@ -78941,7 +79144,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac ;; -@@ -73561,19 +30361,17 @@ +@@ -73711,19 +30459,17 @@ else case "$host_os" in *linux*) @@ -78964,7 +79167,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; esac -@@ -73584,40 +30382,36 @@ +@@ -73734,40 +30480,36 @@ CIFSUMOUNT_PROGS="" INSTALL_CIFSUMOUNT="" UNINSTALL_CIFSUMOUNT="" @@ -79012,7 +79215,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -73625,151 +30419,12 @@ +@@ -73775,151 +30517,12 @@ ################################################# # check for cifs.upcall support @@ -79168,7 +79371,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF HAVE_KEYUTILS_H=1 else -@@ -73781,34 +30436,28 @@ +@@ -73931,34 +30534,28 @@ CIFSUPCALL_PROGS="" INSTALL_CIFSUPCALL="" UNINSTALL_CIFSUPCALL="" @@ -79210,7 +79413,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CIFSUPCALL_PROGS="bin/cifs.upcall" INSTALL_CIFSUPCALL="installcifsupcall" -@@ -73816,9 +30465,7 @@ +@@ -73966,9 +30563,7 @@ fi ;; *) @@ -79221,7 +79424,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac ;; -@@ -73827,18 +30474,16 @@ +@@ -73977,18 +30572,16 @@ case "$host_os" in *linux*) if test x"$use_ads" != x"yes"; then @@ -79244,7 +79447,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CIFSUPCALL_PROGS="bin/cifs.upcall" INSTALL_CIFSUPCALL="installcifsupcall" -@@ -73846,191 +30491,53 @@ +@@ -73996,191 +30589,53 @@ fi ;; *) @@ -79474,7 +79677,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -74042,9 +30549,7 @@ +@@ -74192,9 +30647,7 @@ if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \ x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then if test x"${try_pam}" = x"yes";then @@ -79485,7 +79688,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi use_pam=no create_pam_modules=no -@@ -74052,23 +30557,17 @@ +@@ -74202,23 +30655,17 @@ @@ -79512,7 +79715,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -74086,54 +30585,28 @@ +@@ -74236,54 +30683,28 @@ return 0; } _ACEOF @@ -79574,7 +79777,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 _ACEOF -@@ -74148,34 +30621,18 @@ +@@ -74298,34 +30719,18 @@ fi @@ -79614,7 +79817,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure #if HAVE_SECURITY_PAM_APPL_H #include #endif -@@ -74183,44 +30640,9 @@ +@@ -74333,44 +30738,9 @@ #include #endif @@ -79662,7 +79865,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -74232,179 +30654,33 @@ +@@ -74382,179 +30752,33 @@ if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \ x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then if test x"${try_pam}" = x"yes";then @@ -79852,7 +80055,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -74413,150 +30689,12 @@ +@@ -74563,150 +30787,12 @@ done @@ -80009,7 +80212,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -74567,19 +30705,14 @@ +@@ -74717,19 +30803,14 @@ @@ -80032,7 +80235,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define pam_vsyslog to an innocuous variant, in case declares pam_vsyslog. For example, HP-UX 11i declares gettimeofday. */ -@@ -74620,72 +30753,42 @@ +@@ -74770,72 +30851,42 @@ return 0; } _ACEOF @@ -80117,7 +80320,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if (!defined(LINUX)) -@@ -74723,36 +30826,11 @@ +@@ -74873,36 +30924,11 @@ return 0; } _ACEOF @@ -80156,7 +80359,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ################################################# -@@ -74762,19 +30840,17 @@ +@@ -74912,19 +30938,17 @@ UNINSTALL_PAM_MODULES="" try_pam_smbpass=auto @@ -80179,7 +80382,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; esac -@@ -74788,16 +30864,12 @@ +@@ -74938,16 +30962,12 @@ # Conditions under which pam_smbpass can't be built. if test x"$BLDSHARED" != xtrue ; then if test x"${try_pam_smbpass}" = xyes ; then @@ -80198,7 +80401,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi use_pam_smbpass=no fi -@@ -74808,7 +30880,7 @@ +@@ -74958,7 +30978,7 @@ UNINSTALL_PAM_MODULES="uninstallpammodules" fi fi @@ -80207,7 +80410,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$use_pam_smbpass" >&6; } -@@ -74819,98 +30891,63 @@ +@@ -74969,98 +30989,63 @@ ## $with_pam_for_crypt variable as above --jerry ## if test $with_pam_for_crypt = no; then @@ -80322,7 +80525,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -74918,28 +30955,26 @@ +@@ -75068,28 +31053,26 @@ ################################################# # check for syslog logging @@ -80357,7 +80560,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -74947,16 +30982,14 @@ +@@ -75097,16 +31080,14 @@ ################################################# # check for custom syslog facility @@ -80377,7 +80580,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else if test "$withval" != "yes" ; then syslog_facility="$withval" -@@ -74981,14 +31014,14 @@ +@@ -75131,14 +31112,14 @@ samba_cv_TRY_SYS_QUOTAS=auto samba_cv_SYSQUOTA_FOUND=no @@ -80395,7 +80598,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } samba_cv_WITH_QUOTAS=yes samba_cv_TRY_QUOTAS=yes -@@ -74997,7 +31030,7 @@ +@@ -75147,7 +31128,7 @@ samba_cv_TRY_SYS_QUOTAS=auto ;; auto) @@ -80404,7 +80607,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "auto" >&6; } samba_cv_WITH_QUOTAS=auto samba_cv_TRY_QUOTAS=auto -@@ -75006,74 +31039,74 @@ +@@ -75156,74 +31137,74 @@ samba_cv_TRY_SYS_QUOTAS=auto ;; no) @@ -80492,7 +80695,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } samba_cv_TRY_SYS_QUOTAS=no ;; -@@ -75084,641 +31117,87 @@ +@@ -75234,641 +31215,87 @@ # only check for quota stuff if --with-quotas if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then @@ -81192,7 +81395,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -75728,17 +31207,13 @@ +@@ -75878,17 +31305,13 @@ if test x"$samba_cv_found_xfs_header" != x"yes"; then # if we have xfs quota support (IRIX) we should use it @@ -81213,7 +81416,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -75758,35 +31233,14 @@ +@@ -75908,35 +31331,14 @@ return 0; } _ACEOF @@ -81252,7 +81455,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_HAVE_SYS_QUOTA_XFS" >&6; } if test "$samba_cv_HAVE_SYS_QUOTA_XFS"x = "yes"x; then samba_cv_found_xfs_header=yes -@@ -75794,17 +31248,13 @@ +@@ -75944,17 +31346,13 @@ fi # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX @@ -81273,7 +81476,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -75822,41 +31272,18 @@ +@@ -75972,41 +31370,18 @@ return 0; } _ACEOF @@ -81319,7 +81522,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -75864,9 +31291,9 @@ +@@ -76014,9 +31389,9 @@ # look for a working quota system if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then @@ -81331,7 +81534,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -75880,14 +31307,10 @@ +@@ -76030,14 +31405,10 @@ old_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS"; export LDFLAGS; @@ -81348,7 +81551,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define HAVE_QUOTACTL_4A 1 -@@ -75895,42 +31318,15 @@ +@@ -76045,42 +31416,15 @@ #include "confdefs.h" #include "${srcdir-.}/../tests/sysquotas.c" _ACEOF @@ -81395,7 +81598,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$old_CFLAGS"; old_CFLAGS=""; export CFLAGS; -@@ -75942,23 +31338,21 @@ +@@ -76092,23 +31436,21 @@ export LDFLAGS; fi @@ -81423,7 +81626,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -75972,14 +31366,10 @@ +@@ -76122,14 +31464,10 @@ old_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS"; export LDFLAGS; @@ -81440,7 +81643,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define HAVE_QUOTACTL_4B 1 -@@ -75987,42 +31377,15 @@ +@@ -76137,42 +31475,15 @@ #include "confdefs.h" #include "${srcdir-.}/../tests/sysquotas.c" _ACEOF @@ -81487,7 +81690,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$old_CFLAGS"; old_CFLAGS=""; export CFLAGS; -@@ -76034,24 +31397,22 @@ +@@ -76184,24 +31495,22 @@ export LDFLAGS; fi @@ -81516,7 +81719,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -76065,14 +31426,10 @@ +@@ -76215,14 +31524,10 @@ old_LDFLAGS="$LDFLAGS"; LDFLAGS="$LDFLAGS"; export LDFLAGS; @@ -81533,7 +81736,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #define HAVE_QUOTACTL_3 1 -@@ -76080,42 +31437,15 @@ +@@ -76230,42 +31535,15 @@ #include "confdefs.h" #include "${srcdir-.}/../tests/sysquotas.c" _ACEOF @@ -81580,7 +81783,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$old_CFLAGS"; old_CFLAGS=""; export CFLAGS; -@@ -76127,15 +31457,13 @@ +@@ -76277,15 +31555,13 @@ export LDFLAGS; fi @@ -81598,7 +81801,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure samba_cv_sysquotas_file="lib/sysquotas_3.c" fi -@@ -76143,151 +31471,12 @@ +@@ -76293,151 +31569,12 @@ ################################################# # check for mntent.h and struct mntent @@ -81754,7 +81957,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -76296,102 +31485,12 @@ +@@ -76446,102 +31583,12 @@ ################################################# # check for setmntent,getmntent,endmntent @@ -81862,7 +82065,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -76402,151 +31501,12 @@ +@@ -76552,151 +31599,12 @@ ################################################# # check for devnm.h and struct mntent @@ -82018,7 +82221,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -76555,102 +31515,12 @@ +@@ -76705,102 +31613,12 @@ ################################################# # check for devnm @@ -82125,7 +82328,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -76673,19 +31543,15 @@ +@@ -76823,19 +31641,15 @@ fi if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then @@ -82148,7 +82351,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -76703,76 +31569,47 @@ +@@ -76853,76 +31667,47 @@ return 0; } _ACEOF @@ -82236,7 +82439,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -76790,62 +31627,35 @@ +@@ -76940,62 +31725,35 @@ return 0; } _ACEOF @@ -82306,7 +82509,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -76861,56 +31671,33 @@ +@@ -77011,56 +31769,33 @@ return 0; } _ACEOF @@ -82371,7 +82574,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi fi -@@ -76922,12 +31709,12 @@ +@@ -77072,12 +31807,12 @@ ################################################# # check for experimental utmp accounting @@ -82386,7 +82589,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_utmp; case "$withval" in no) WITH_UTMP=no -@@ -76950,41 +31737,35 @@ +@@ -77100,41 +31835,35 @@ # Display test results if test x"$WITH_UTMP" = x"yes"; then @@ -82436,7 +82639,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -76998,51 +31779,22 @@ +@@ -77148,51 +31877,22 @@ exit (statvfs64 (".", &fsd)); } _ACEOF @@ -82495,7 +82698,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -77055,16 +31807,12 @@ +@@ -77205,16 +31905,12 @@ # is what it gets when this test fails. if test $space = no; then # SVR4 @@ -82515,7 +82718,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77076,47 +31824,20 @@ +@@ -77226,47 +31922,20 @@ return 0; } _ACEOF @@ -82569,7 +82772,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -77124,17 +31845,13 @@ +@@ -77274,17 +31943,13 @@ # smbd/statvfs.c assumes that statvfs.f_fsid is an integer. # This is not the case on ancient Linux systems. @@ -82590,7 +82793,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77146,57 +31863,30 @@ +@@ -77296,57 +31961,30 @@ return 0; } _ACEOF @@ -82655,7 +82858,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77208,56 +31898,29 @@ +@@ -77358,56 +31996,29 @@ return 0; } _ACEOF @@ -82719,7 +82922,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77269,55 +31932,28 @@ +@@ -77419,55 +32030,28 @@ return 0; } _ACEOF @@ -82782,7 +82985,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77329,59 +31965,32 @@ +@@ -77479,59 +32063,32 @@ return 0; } _ACEOF @@ -82850,7 +83053,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -77394,71 +32003,38 @@ +@@ -77544,71 +32101,38 @@ exit (statfs (".", &fsd, sizeof (struct statfs))); } _ACEOF @@ -82932,7 +83135,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #ifdef HAVE_SYS_PARAM_H -@@ -77477,71 +32053,38 @@ +@@ -77627,71 +32151,38 @@ exit (statfs (".", &fsd)); } _ACEOF @@ -83014,7 +83217,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -77551,71 +32094,38 @@ +@@ -77701,71 +32192,38 @@ exit (statfs (".", &fsd, sizeof fsd, 0)); } _ACEOF @@ -83096,7 +83299,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_PARAM_H -@@ -77631,71 +32141,38 @@ +@@ -77781,71 +32239,38 @@ exit (statfs (".", &fsd)); } _ACEOF @@ -83178,7 +83381,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_PARAM_H -@@ -77715,52 +32192,23 @@ +@@ -77865,52 +32290,23 @@ exit (statfs (".", &fsd) != 1); } _ACEOF @@ -83237,7 +83440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -77773,13 +32221,9 @@ +@@ -77923,13 +32319,9 @@ # If we don't have all of these then disable large # file support. # @@ -83253,7 +83456,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))) -@@ -77796,41 +32240,18 @@ +@@ -77946,41 +32338,18 @@ return 0; } _ACEOF @@ -83299,7 +83502,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; } ################################################# -@@ -77840,10 +32261,10 @@ +@@ -77990,10 +32359,10 @@ # Check whether --with-ctdb was given. @@ -83312,7 +83515,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;} ;; *) -@@ -77857,71 +32278,23 @@ +@@ -78007,71 +32376,23 @@ CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS" ctdb_broken="missing or broken headers" @@ -83394,7 +83597,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -77932,17 +32305,13 @@ +@@ -78082,17 +32403,13 @@ @@ -83415,7 +83618,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include "confdefs.h" -@@ -77963,41 +32332,18 @@ +@@ -78113,41 +32430,18 @@ return 0; } _ACEOF @@ -83461,7 +83664,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -78008,255 +32354,43 @@ +@@ -78158,255 +32452,43 @@ fi # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client @@ -83733,7 +83936,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else -@@ -78266,139 +32400,33 @@ +@@ -78416,139 +32498,33 @@ fi @@ -83883,7 +84086,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_cluster_support; fi -@@ -78409,44 +32437,38 @@ +@@ -78559,44 +32535,38 @@ if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then if test "x$with_cluster_support" = "xyes"; then @@ -83935,7 +84138,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_acl_support; case "$withval" in yes|no) with_acl_support="$withval" -@@ -78459,105 +32481,85 @@ +@@ -78609,105 +32579,85 @@ with_acl_support="auto" fi @@ -84062,7 +84265,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -78575,60 +32577,31 @@ +@@ -78725,60 +32675,31 @@ return 0; } _ACEOF @@ -84132,7 +84335,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -78646,61 +32619,32 @@ +@@ -78796,61 +32717,32 @@ return 0; } _ACEOF @@ -84203,7 +84406,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -78719,64 +32663,33 @@ +@@ -78869,64 +32761,33 @@ return 0; } _ACEOF @@ -84278,7 +84481,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -78794,58 +32707,29 @@ +@@ -78944,58 +32805,29 @@ return 0; } _ACEOF @@ -84345,7 +84548,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi ;; -@@ -78857,31 +32741,27 @@ +@@ -79007,31 +32839,27 @@ ################################################# # check for AIO support @@ -84383,7 +84586,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -78899,58 +32779,29 @@ +@@ -79049,58 +32877,29 @@ return 0; } _ACEOF @@ -84451,7 +84654,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -78968,59 +32819,30 @@ +@@ -79118,59 +32917,30 @@ return 0; } _ACEOF @@ -84520,7 +84723,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -79032,55 +32854,26 @@ +@@ -79182,55 +32952,26 @@ return 0; } _ACEOF @@ -84584,7 +84787,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -79092,716 +32885,317 @@ +@@ -79242,716 +32983,317 @@ return 0; } _ACEOF @@ -85439,7 +85642,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -79818,30 +33212,26 @@ +@@ -79968,30 +33310,26 @@ # check for sendfile support with_sendfile_support=yes @@ -85476,7 +85679,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -79857,53 +33247,24 @@ +@@ -80007,53 +33345,24 @@ return 0; } _ACEOF @@ -85538,7 +85741,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -79919,54 +33280,25 @@ +@@ -80069,54 +33378,25 @@ return 0; } _ACEOF @@ -85601,7 +85804,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64) -@@ -79986,103 +33318,58 @@ +@@ -80136,103 +33416,58 @@ return 0; } _ACEOF @@ -85722,7 +85925,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80109,76 +33396,41 @@ +@@ -80259,76 +33494,41 @@ return 0; } _ACEOF @@ -85811,7 +86014,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80202,73 +33454,38 @@ +@@ -80352,73 +33552,38 @@ return 0; } _ACEOF @@ -85897,7 +86100,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80292,77 +33509,41 @@ +@@ -80442,77 +33607,41 @@ return 0; } _ACEOF @@ -85987,7 +86190,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -80380,43 +33561,18 @@ +@@ -80530,43 +33659,18 @@ return 0; } _ACEOF @@ -86037,7 +86240,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBSENDFILE 1 _ACEOF -@@ -80425,17 +33581,13 @@ +@@ -80575,17 +33679,13 @@ fi @@ -86058,7 +86261,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80466,74 +33618,39 @@ +@@ -80616,74 +33716,39 @@ return 0; } _ACEOF @@ -86145,7 +86348,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80564,75 +33681,40 @@ +@@ -80714,75 +33779,40 @@ return 0; } _ACEOF @@ -86233,7 +86436,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ \ #include -@@ -80660,59 +33742,28 @@ +@@ -80810,59 +33840,28 @@ return 0; } _ACEOF @@ -86302,7 +86505,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; }; fi ;; -@@ -80721,12 +33772,12 @@ +@@ -80871,12 +33870,12 @@ esac ;; *) @@ -86317,7 +86520,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } fi -@@ -80735,17 +33786,13 @@ +@@ -80885,17 +33884,13 @@ ############################################ # See if we have the Linux readahead syscall. @@ -86338,7 +86541,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -80760,62 +33807,31 @@ +@@ -80910,62 +33905,31 @@ return 0; } _ACEOF @@ -86410,7 +86613,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -80826,41 +33842,18 @@ +@@ -80976,41 +33940,18 @@ return 0; } _ACEOF @@ -86456,7 +86659,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -80868,17 +33861,13 @@ +@@ -81018,17 +33959,13 @@ ############################################ # See if we have the posix_fadvise syscall. @@ -86477,7 +86680,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -80893,47 +33882,20 @@ +@@ -81043,47 +33980,20 @@ return 0; } _ACEOF @@ -86532,7 +86735,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -80942,17 +33904,13 @@ +@@ -81092,17 +34002,13 @@ case "$host_os" in *linux*) @@ -86553,7 +86756,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -80967,40 +33925,15 @@ +@@ -81117,40 +34023,15 @@ return 0; } _ACEOF @@ -86599,7 +86802,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; } ;; *) -@@ -81010,24 +33943,18 @@ +@@ -81160,24 +34041,18 @@ if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then @@ -86628,7 +86831,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -81038,41 +33965,18 @@ +@@ -81188,41 +34063,18 @@ return 0; } _ACEOF @@ -86674,7 +86877,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -81080,68 +33984,35 @@ +@@ -81230,68 +34082,35 @@ ############################################ # See if we have the a broken readlink syscall. @@ -86753,7 +86956,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -81149,7 +34020,7 @@ +@@ -81299,7 +34118,7 @@ # Check whether winbind is supported on this platform. If so we need to # build and install client programs, sbin programs and shared libraries @@ -86762,7 +86965,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking whether to build winbind... " >&6; } # Initially, the value of $host_os decides whether winbind is supported -@@ -81161,7 +34032,7 @@ +@@ -81311,7 +34130,7 @@ # We define this here so --with-winbind can override it. # Check whether --with-wbclient was given. @@ -86771,7 +86974,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_wbclient; case "$withval" in no) -@@ -81259,7 +34130,7 @@ +@@ -81409,7 +34228,7 @@ # Check whether --with-winbind was given. @@ -86780,7 +86983,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_winbind; case "$withval" in yes) -@@ -81290,18 +34161,14 @@ +@@ -81440,18 +34259,14 @@ WINBIND_WINS_NSS="" fi if test x"$HAVE_WBCLIENT" = x"yes"; then @@ -86802,7 +87005,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -81319,57 +34186,28 @@ +@@ -81469,57 +34284,28 @@ return 0; } _ACEOF @@ -86869,7 +87072,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)" else -@@ -81398,12 +34236,10 @@ +@@ -81548,12 +34334,10 @@ fi if test x"$HAVE_WINBIND" = x"yes"; then @@ -86884,7 +87087,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)" -@@ -81414,7 +34250,7 @@ +@@ -81564,7 +34348,7 @@ UNINSTALL_PAM_MODULES="uninstallpammodules" fi else @@ -86893,7 +87096,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no$winbind_no_reason" >&6; } fi -@@ -81427,108 +34263,11 @@ +@@ -81577,108 +34361,11 @@ # Solaris 10 does have new member in nss_XbyY_key @@ -87006,7 +87209,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -81536,318 +34275,29 @@ +@@ -81686,318 +34373,29 @@ # Solaris has some extra fields in struct passwd that need to be # initialised otherwise nscd crashes. @@ -87336,7 +87539,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1 -@@ -81856,104 +34306,9 @@ +@@ -82006,104 +34404,9 @@ fi @@ -87444,7 +87647,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1 -@@ -81963,17 +34318,13 @@ +@@ -82113,17 +34416,13 @@ fi @@ -87465,7 +87668,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -81988,41 +34339,18 @@ +@@ -82138,41 +34437,18 @@ return 0; } _ACEOF @@ -87511,7 +87714,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -82032,7 +34360,7 @@ +@@ -82182,7 +34458,7 @@ # Check whether --with-included-popt was given. @@ -87520,7 +87723,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_included_popt; case "$withval" in yes) -@@ -82045,18 +34373,14 @@ +@@ -82195,18 +34471,14 @@ fi if test x"$INCLUDED_POPT" != x"yes"; then @@ -87542,7 +87745,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -82074,43 +34398,18 @@ +@@ -82224,43 +34496,18 @@ return 0; } _ACEOF @@ -87592,7 +87795,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure INCLUDED_POPT=no else INCLUDED_POPT=yes -@@ -82118,16 +34417,16 @@ +@@ -82268,16 +34515,16 @@ fi @@ -87612,7 +87815,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } BUILD_POPT="" POPTLIBS="-lpopt" -@@ -82140,7 +34439,7 @@ +@@ -82290,7 +34537,7 @@ # Check if user wants DNS service discovery support # Check whether --enable-dnssd was given. @@ -87621,7 +87824,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_dnssd; fi -@@ -82149,151 +34448,12 @@ +@@ -82299,151 +34546,12 @@ if test x"$enable_dnssd" = x"yes"; then have_dnssd_support=yes @@ -87778,7 +87981,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -82306,102 +34466,12 @@ +@@ -82456,102 +34564,12 @@ # On Darwin the DNSSD API is in libc, but on other platforms it's # probably in -ldns_sd @@ -87886,7 +88089,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -82409,23 +34479,17 @@ +@@ -82559,23 +34577,17 @@ @@ -87913,7 +88116,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -82438,59 +34502,33 @@ +@@ -82588,59 +34600,33 @@ int main () { @@ -87985,7 +88188,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBDNS_SD 1 _ACEOF -@@ -82505,7 +34543,6 @@ +@@ -82655,7 +34641,6 @@ fi @@ -87993,7 +88196,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if test x"$ac_cv_func_DNSServiceRegister" != x"yes" -a \ x"$ac_cv_lib_ext_dns_sd_DNSServiceRegister" != x"yes"; then have_dnssd_support=no -@@ -82513,15 +34550,11 @@ +@@ -82663,15 +34648,11 @@ if test x"$have_dnssd_support" = x"yes"; then @@ -88011,7 +88214,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -82531,7 +34564,7 @@ +@@ -82681,7 +34662,7 @@ # Check if user wants avahi support # Check whether --enable-avahi was given. @@ -88020,7 +88223,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_avahi; fi -@@ -82539,151 +34572,12 @@ +@@ -82689,151 +34670,12 @@ if test x"$enable_avahi" != x"no"; then have_avahi_support=yes @@ -88177,7 +88380,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -82694,151 +34588,12 @@ +@@ -82844,151 +34686,12 @@ have_avahi_support=no fi @@ -88334,7 +88537,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -82850,18 +34605,14 @@ +@@ -83000,18 +34703,14 @@ fi save_LIBS="$LIBS" @@ -88356,7 +88559,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -82879,58 +34630,29 @@ +@@ -83029,58 +34728,29 @@ return 0; } _ACEOF @@ -88424,7 +88627,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -82948,43 +34670,18 @@ +@@ -83098,43 +34768,18 @@ return 0; } _ACEOF @@ -88474,7 +88677,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure have_avahi_strerror=yes fi -@@ -82999,17 +34696,13 @@ +@@ -83149,17 +34794,13 @@ AVAHI_LIBS="-lavahi-client -lavahi-common" @@ -88494,7 +88697,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi fi -@@ -83024,18 +34717,14 @@ +@@ -83174,18 +34815,14 @@ # If it's error, then the user didn't # define it. if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -88516,7 +88719,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -83053,43 +34742,18 @@ +@@ -83203,43 +34840,18 @@ return 0; } _ACEOF @@ -88566,7 +88769,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" PTHREAD_LDFLAGS="-lpthread" -@@ -83098,18 +34762,14 @@ +@@ -83248,18 +34860,14 @@ fi if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -88588,7 +88791,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -83127,43 +34787,18 @@ +@@ -83277,43 +34885,18 @@ return 0; } _ACEOF @@ -88638,7 +88841,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LDFLAGS="-lpthreads" -@@ -83172,18 +34807,14 @@ +@@ -83322,18 +34905,14 @@ fi if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -88660,7 +88863,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -83201,43 +34832,18 @@ +@@ -83351,43 +34930,18 @@ return 0; } _ACEOF @@ -88710,7 +88913,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread" PTHREAD_LDFLAGS="-pthread" -@@ -83246,92 +34852,8 @@ +@@ -83396,92 +34950,8 @@ fi if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -88805,7 +89008,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREAD_CFLAGS="-D_REENTRANT" PTHREAD_LDFLAGS="-lpthread" -@@ -83342,18 +34864,14 @@ +@@ -83492,18 +34962,14 @@ # especially for HP-UX, where the AC_CHECK_FUNC macro fails to test for # pthread_attr_init. On pthread_mutex_lock it works there... if test "x$PTHREAD_LDFLAGS" = xerror; then @@ -88827,7 +89030,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -83371,43 +34889,18 @@ +@@ -83521,43 +34987,18 @@ return 0; } _ACEOF @@ -88877,7 +89080,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREAD_CFLAGS="-D_REENTRANT" PTHREAD_LDFLAGS="-lpthread" -@@ -83426,151 +34919,12 @@ +@@ -83576,151 +35017,12 @@ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ac_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS" @@ -89034,7 +89237,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -83580,9 +34934,7 @@ +@@ -83730,9 +35032,7 @@ CFLAGS=$ac_save_CFLAGS LDFLAGS=$ac_save_LDFLAGS @@ -89045,7 +89248,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -83590,24 +34942,20 @@ +@@ -83740,24 +35040,20 @@ # Check if user wants pthreadpool support # Check whether --enable-pthreadpool was given. @@ -89073,7 +89276,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure PTHREADPOOL_OBJ="lib/pthreadpool.o" -@@ -83618,7 +34966,7 @@ +@@ -83768,7 +35064,7 @@ # Check whether --with-included-iniparser was given. @@ -89082,7 +89285,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_included_iniparser; case "$withval" in yes) -@@ -83631,18 +34979,14 @@ +@@ -83781,18 +35077,14 @@ fi if test x"$INCLUDED_INIPARSER" != x"yes"; then @@ -89104,7 +89307,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -83660,43 +35004,18 @@ +@@ -83810,43 +35102,18 @@ return 0; } _ACEOF @@ -89154,7 +89357,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure INCLUDED_INIPARSER=no else INCLUDED_INIPARSER=yes -@@ -83704,260 +35023,40 @@ +@@ -83854,260 +35121,40 @@ fi @@ -89440,7 +89643,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -83965,20 +35064,16 @@ +@@ -84115,20 +35162,16 @@ done @@ -89465,7 +89668,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -83990,46 +35085,19 @@ +@@ -84140,46 +35183,19 @@ return statfs (".", &fsd); } _ACEOF @@ -89517,7 +89720,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$vfsfileid_cv_statfs" >&6; } if test x"$ac_cv_func_getmntent" = x"yes" -a \ -@@ -84064,7 +35132,7 @@ +@@ -84214,7 +35230,7 @@ # Check whether --with-static-modules was given. @@ -89526,7 +89729,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_static_modules; if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do -@@ -84076,7 +35144,7 @@ +@@ -84226,7 +35242,7 @@ # Check whether --with-shared-modules was given. @@ -89535,7 +89738,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_shared_modules; if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do -@@ -84093,7 +35161,7 @@ +@@ -84243,7 +35259,7 @@ fi @@ -89544,7 +89747,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build pdb_ldap... " >&6; } if test "$MODULE_pdb_ldap"; then DEST=$MODULE_pdb_ldap -@@ -84105,12 +35173,10 @@ +@@ -84255,12 +35271,10 @@ if test x"$DEST" = xSHARED; then @@ -89559,7 +89762,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules pdb_ldap" -@@ -84121,16 +35187,16 @@ +@@ -84271,16 +35285,16 @@ PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o" PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS" @@ -89579,7 +89782,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build pdb_ads... " >&6; } if test "$MODULE_pdb_ads"; then DEST=$MODULE_pdb_ads -@@ -84142,12 +35208,10 @@ +@@ -84292,12 +35306,10 @@ if test x"$DEST" = xSHARED; then @@ -89594,7 +89797,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules pdb_ads" -@@ -84158,16 +35222,16 @@ +@@ -84308,16 +35320,16 @@ PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)" @@ -89614,7 +89817,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build pdb_smbpasswd... " >&6; } if test "$MODULE_pdb_smbpasswd"; then DEST=$MODULE_pdb_smbpasswd -@@ -84179,12 +35243,10 @@ +@@ -84329,12 +35341,10 @@ if test x"$DEST" = xSHARED; then @@ -89629,7 +89832,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules pdb_smbpasswd" -@@ -84195,16 +35257,16 @@ +@@ -84345,16 +35355,16 @@ PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o" @@ -89649,7 +89852,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build pdb_tdbsam... " >&6; } if test "$MODULE_pdb_tdbsam"; then DEST=$MODULE_pdb_tdbsam -@@ -84216,12 +35278,10 @@ +@@ -84366,12 +35376,10 @@ if test x"$DEST" = xSHARED; then @@ -89664,7 +89867,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules pdb_tdbsam" -@@ -84232,16 +35292,16 @@ +@@ -84382,16 +35390,16 @@ PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o" @@ -89684,7 +89887,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build pdb_wbc_sam... " >&6; } if test "$MODULE_pdb_wbc_sam"; then DEST=$MODULE_pdb_wbc_sam -@@ -84253,12 +35313,10 @@ +@@ -84403,12 +35411,10 @@ if test x"$DEST" = xSHARED; then @@ -89699,7 +89902,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules pdb_wbc_sam" -@@ -84269,11 +35327,11 @@ +@@ -84419,11 +35425,11 @@ PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o" @@ -89713,7 +89916,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -84295,7 +35353,7 @@ +@@ -84445,7 +35451,7 @@ @@ -89722,7 +89925,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_lsarpc... " >&6; } if test "$MODULE_rpc_lsarpc"; then DEST=$MODULE_rpc_lsarpc -@@ -84307,12 +35365,10 @@ +@@ -84457,12 +35463,10 @@ if test x"$DEST" = xSHARED; then @@ -89737,7 +89940,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_lsarpc" -@@ -84323,16 +35379,16 @@ +@@ -84473,16 +35477,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)" @@ -89757,7 +89960,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_winreg... " >&6; } if test "$MODULE_rpc_winreg"; then DEST=$MODULE_rpc_winreg -@@ -84344,12 +35400,10 @@ +@@ -84494,12 +35498,10 @@ if test x"$DEST" = xSHARED; then @@ -89772,7 +89975,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_winreg" -@@ -84360,16 +35414,16 @@ +@@ -84510,16 +35512,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)" @@ -89792,7 +89995,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_initshutdown... " >&6; } if test "$MODULE_rpc_initshutdown"; then DEST=$MODULE_rpc_initshutdown -@@ -84381,12 +35435,10 @@ +@@ -84531,12 +35533,10 @@ if test x"$DEST" = xSHARED; then @@ -89807,7 +90010,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_initshutdown" -@@ -84397,16 +35449,16 @@ +@@ -84547,16 +35547,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)" @@ -89827,7 +90030,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_dssetup... " >&6; } if test "$MODULE_rpc_dssetup"; then DEST=$MODULE_rpc_dssetup -@@ -84418,12 +35470,10 @@ +@@ -84568,12 +35568,10 @@ if test x"$DEST" = xSHARED; then @@ -89842,7 +90045,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_dssetup" -@@ -84434,16 +35484,16 @@ +@@ -84584,16 +35582,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)" @@ -89862,7 +90065,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_wkssvc... " >&6; } if test "$MODULE_rpc_wkssvc"; then DEST=$MODULE_rpc_wkssvc -@@ -84455,12 +35505,10 @@ +@@ -84605,12 +35603,10 @@ if test x"$DEST" = xSHARED; then @@ -89877,7 +90080,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_wkssvc" -@@ -84471,16 +35519,16 @@ +@@ -84621,16 +35617,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)" @@ -89897,7 +90100,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_svcctl... " >&6; } if test "$MODULE_rpc_svcctl"; then DEST=$MODULE_rpc_svcctl -@@ -84492,12 +35540,10 @@ +@@ -84642,12 +35638,10 @@ if test x"$DEST" = xSHARED; then @@ -89912,7 +90115,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_svcctl" -@@ -84508,16 +35554,16 @@ +@@ -84658,16 +35652,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)" @@ -89932,7 +90135,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_ntsvcs... " >&6; } if test "$MODULE_rpc_ntsvcs"; then DEST=$MODULE_rpc_ntsvcs -@@ -84529,12 +35575,10 @@ +@@ -84679,12 +35673,10 @@ if test x"$DEST" = xSHARED; then @@ -89947,7 +90150,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_ntsvcs" -@@ -84545,16 +35589,16 @@ +@@ -84695,16 +35687,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)" @@ -89967,7 +90170,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_netlogon... " >&6; } if test "$MODULE_rpc_netlogon"; then DEST=$MODULE_rpc_netlogon -@@ -84566,12 +35610,10 @@ +@@ -84716,12 +35708,10 @@ if test x"$DEST" = xSHARED; then @@ -89982,7 +90185,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_netlogon" -@@ -84582,16 +35624,16 @@ +@@ -84732,16 +35722,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)" @@ -90002,7 +90205,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_netdfs... " >&6; } if test "$MODULE_rpc_netdfs"; then DEST=$MODULE_rpc_netdfs -@@ -84603,12 +35645,10 @@ +@@ -84753,12 +35743,10 @@ if test x"$DEST" = xSHARED; then @@ -90017,7 +90220,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_netdfs" -@@ -84619,16 +35659,16 @@ +@@ -84769,16 +35757,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)" @@ -90037,7 +90240,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_srvsvc... " >&6; } if test "$MODULE_rpc_srvsvc"; then DEST=$MODULE_rpc_srvsvc -@@ -84640,12 +35680,10 @@ +@@ -84790,12 +35778,10 @@ if test x"$DEST" = xSHARED; then @@ -90052,7 +90255,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_srvsvc" -@@ -84656,16 +35694,16 @@ +@@ -84806,16 +35792,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)" @@ -90072,7 +90275,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_spoolss... " >&6; } if test "$MODULE_rpc_spoolss"; then DEST=$MODULE_rpc_spoolss -@@ -84677,12 +35715,10 @@ +@@ -84827,12 +35813,10 @@ if test x"$DEST" = xSHARED; then @@ -90087,7 +90290,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_spoolss" -@@ -84693,16 +35729,16 @@ +@@ -84843,16 +35827,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)" @@ -90107,7 +90310,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_eventlog... " >&6; } if test "$MODULE_rpc_eventlog"; then DEST=$MODULE_rpc_eventlog -@@ -84714,12 +35750,10 @@ +@@ -84864,12 +35848,10 @@ if test x"$DEST" = xSHARED; then @@ -90122,7 +90325,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_eventlog" -@@ -84730,16 +35764,16 @@ +@@ -84880,16 +35862,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)" @@ -90142,7 +90345,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_samr... " >&6; } if test "$MODULE_rpc_samr"; then DEST=$MODULE_rpc_samr -@@ -84751,12 +35785,10 @@ +@@ -84901,12 +35883,10 @@ if test x"$DEST" = xSHARED; then @@ -90157,7 +90360,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_samr" -@@ -84767,16 +35799,16 @@ +@@ -84917,16 +35897,16 @@ RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)" @@ -90177,7 +90380,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build rpc_rpcecho... " >&6; } if test "$MODULE_rpc_rpcecho"; then DEST=$MODULE_rpc_rpcecho -@@ -84788,12 +35820,10 @@ +@@ -84938,12 +35918,10 @@ if test x"$DEST" = xSHARED; then @@ -90192,7 +90395,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules rpc_rpcecho" -@@ -84804,11 +35834,11 @@ +@@ -84954,11 +35932,11 @@ RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)" @@ -90206,7 +90409,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -84829,7 +35859,7 @@ +@@ -84979,7 +35957,7 @@ @@ -90215,7 +90418,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_ldap... " >&6; } if test "$MODULE_idmap_ldap"; then DEST=$MODULE_idmap_ldap -@@ -84841,12 +35871,10 @@ +@@ -84991,12 +35969,10 @@ if test x"$DEST" = xSHARED; then @@ -90230,7 +90433,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_ldap" -@@ -84857,16 +35885,16 @@ +@@ -85007,16 +35983,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o" @@ -90250,7 +90453,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_tdb... " >&6; } if test "$MODULE_idmap_tdb"; then DEST=$MODULE_idmap_tdb -@@ -84878,12 +35906,10 @@ +@@ -85028,12 +36004,10 @@ if test x"$DEST" = xSHARED; then @@ -90265,7 +90468,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_tdb" -@@ -84894,16 +35920,16 @@ +@@ -85044,16 +36018,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o" @@ -90285,7 +90488,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_tdb2... " >&6; } if test "$MODULE_idmap_tdb2"; then DEST=$MODULE_idmap_tdb2 -@@ -84915,12 +35941,10 @@ +@@ -85065,12 +36039,10 @@ if test x"$DEST" = xSHARED; then @@ -90300,7 +90503,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_tdb2" -@@ -84931,16 +35955,16 @@ +@@ -85081,16 +36053,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o" @@ -90320,7 +90523,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_passdb... " >&6; } if test "$MODULE_idmap_passdb"; then DEST=$MODULE_idmap_passdb -@@ -84952,12 +35976,10 @@ +@@ -85102,12 +36074,10 @@ if test x"$DEST" = xSHARED; then @@ -90335,7 +90538,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_passdb" -@@ -84968,16 +35990,16 @@ +@@ -85118,16 +36088,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o" @@ -90355,7 +90558,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_nss... " >&6; } if test "$MODULE_idmap_nss"; then DEST=$MODULE_idmap_nss -@@ -84989,12 +36011,10 @@ +@@ -85139,12 +36109,10 @@ if test x"$DEST" = xSHARED; then @@ -90370,7 +90573,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_nss" -@@ -85005,16 +36025,16 @@ +@@ -85155,16 +36123,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o" @@ -90390,7 +90593,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_rid... " >&6; } if test "$MODULE_idmap_rid"; then DEST=$MODULE_idmap_rid -@@ -85026,12 +36046,10 @@ +@@ -85176,12 +36144,10 @@ if test x"$DEST" = xSHARED; then @@ -90405,7 +90608,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_rid" -@@ -85042,16 +36060,16 @@ +@@ -85192,16 +36158,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o" @@ -90425,7 +90628,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_ad... " >&6; } if test "$MODULE_idmap_ad"; then DEST=$MODULE_idmap_ad -@@ -85063,12 +36081,10 @@ +@@ -85213,12 +36179,10 @@ if test x"$DEST" = xSHARED; then @@ -90440,7 +90643,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_ad" -@@ -85079,16 +36095,16 @@ +@@ -85229,16 +36193,16 @@ IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o" @@ -90460,7 +90663,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_hash... " >&6; } if test "$MODULE_idmap_hash"; then DEST=$MODULE_idmap_hash -@@ -85100,12 +36116,10 @@ +@@ -85250,12 +36214,10 @@ if test x"$DEST" = xSHARED; then @@ -90475,7 +90678,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_hash" -@@ -85116,16 +36130,16 @@ +@@ -85266,16 +36228,16 @@ IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)" @@ -90495,7 +90698,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build idmap_adex... " >&6; } if test "$MODULE_idmap_adex"; then DEST=$MODULE_idmap_adex -@@ -85137,12 +36151,10 @@ +@@ -85287,12 +36249,10 @@ if test x"$DEST" = xSHARED; then @@ -90510,7 +90713,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules idmap_adex" -@@ -85153,11 +36165,11 @@ +@@ -85303,11 +36263,11 @@ IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)" @@ -90524,7 +90727,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -85178,7 +36190,7 @@ +@@ -85328,7 +36288,7 @@ @@ -90533,7 +90736,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build nss_info_template... " >&6; } if test "$MODULE_nss_info_template"; then DEST=$MODULE_nss_info_template -@@ -85190,12 +36202,10 @@ +@@ -85340,12 +36300,10 @@ if test x"$DEST" = xSHARED; then @@ -90548,7 +90751,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules nss_info_template" -@@ -85206,11 +36216,11 @@ +@@ -85356,11 +36314,11 @@ NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o" @@ -90562,7 +90765,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -85231,7 +36241,7 @@ +@@ -85381,7 +36339,7 @@ @@ -90571,7 +90774,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build charset_weird... " >&6; } if test "$MODULE_charset_weird"; then DEST=$MODULE_charset_weird -@@ -85243,12 +36253,10 @@ +@@ -85393,12 +36351,10 @@ if test x"$DEST" = xSHARED; then @@ -90586,7 +90789,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules charset_weird" -@@ -85259,16 +36267,16 @@ +@@ -85409,16 +36365,16 @@ CHARSET_STATIC="$CHARSET_STATIC modules/weird.o" @@ -90606,7 +90809,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build charset_CP850... " >&6; } if test "$MODULE_charset_CP850"; then DEST=$MODULE_charset_CP850 -@@ -85280,12 +36288,10 @@ +@@ -85430,12 +36386,10 @@ if test x"$DEST" = xSHARED; then @@ -90621,7 +90824,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules charset_CP850" -@@ -85296,16 +36302,16 @@ +@@ -85446,16 +36400,16 @@ CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o" @@ -90641,7 +90844,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build charset_CP437... " >&6; } if test "$MODULE_charset_CP437"; then DEST=$MODULE_charset_CP437 -@@ -85317,12 +36323,10 @@ +@@ -85467,12 +36421,10 @@ if test x"$DEST" = xSHARED; then @@ -90656,7 +90859,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules charset_CP437" -@@ -85333,16 +36337,16 @@ +@@ -85483,16 +36435,16 @@ CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o" @@ -90676,7 +90879,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build charset_macosxfs... " >&6; } if test "$MODULE_charset_macosxfs"; then DEST=$MODULE_charset_macosxfs -@@ -85354,12 +36358,10 @@ +@@ -85504,12 +36456,10 @@ if test x"$DEST" = xSHARED; then @@ -90691,7 +90894,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules charset_macosxfs" -@@ -85370,11 +36372,11 @@ +@@ -85520,11 +36470,11 @@ CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o" @@ -90705,7 +90908,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -85395,7 +36397,7 @@ +@@ -85545,7 +36495,7 @@ @@ -90714,7 +90917,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_sam... " >&6; } if test "$MODULE_auth_sam"; then DEST=$MODULE_auth_sam -@@ -85407,12 +36409,10 @@ +@@ -85557,12 +36507,10 @@ if test x"$DEST" = xSHARED; then @@ -90729,7 +90932,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_sam" -@@ -85423,16 +36423,16 @@ +@@ -85573,16 +36521,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)" @@ -90749,7 +90952,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_unix... " >&6; } if test "$MODULE_auth_unix"; then DEST=$MODULE_auth_unix -@@ -85444,12 +36444,10 @@ +@@ -85594,12 +36542,10 @@ if test x"$DEST" = xSHARED; then @@ -90764,7 +90967,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_unix" -@@ -85460,16 +36458,16 @@ +@@ -85610,16 +36556,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)" @@ -90784,7 +90987,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_winbind... " >&6; } if test "$MODULE_auth_winbind"; then DEST=$MODULE_auth_winbind -@@ -85481,12 +36479,10 @@ +@@ -85631,12 +36577,10 @@ if test x"$DEST" = xSHARED; then @@ -90799,7 +91002,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_winbind" -@@ -85497,16 +36493,16 @@ +@@ -85647,16 +36591,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)" @@ -90819,7 +91022,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_wbc... " >&6; } if test "$MODULE_auth_wbc"; then DEST=$MODULE_auth_wbc -@@ -85518,12 +36514,10 @@ +@@ -85668,12 +36612,10 @@ if test x"$DEST" = xSHARED; then @@ -90834,7 +91037,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_wbc" -@@ -85534,16 +36528,16 @@ +@@ -85684,16 +36626,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)" @@ -90854,7 +91057,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_server... " >&6; } if test "$MODULE_auth_server"; then DEST=$MODULE_auth_server -@@ -85555,12 +36549,10 @@ +@@ -85705,12 +36647,10 @@ if test x"$DEST" = xSHARED; then @@ -90869,7 +91072,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_server" -@@ -85571,16 +36563,16 @@ +@@ -85721,16 +36661,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)" @@ -90889,7 +91092,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_domain... " >&6; } if test "$MODULE_auth_domain"; then DEST=$MODULE_auth_domain -@@ -85592,12 +36584,10 @@ +@@ -85742,12 +36682,10 @@ if test x"$DEST" = xSHARED; then @@ -90904,7 +91107,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_domain" -@@ -85608,16 +36598,16 @@ +@@ -85758,16 +36696,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)" @@ -90924,7 +91127,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_builtin... " >&6; } if test "$MODULE_auth_builtin"; then DEST=$MODULE_auth_builtin -@@ -85629,12 +36619,10 @@ +@@ -85779,12 +36717,10 @@ if test x"$DEST" = xSHARED; then @@ -90939,7 +91142,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_builtin" -@@ -85645,16 +36633,16 @@ +@@ -85795,16 +36731,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)" @@ -90959,7 +91162,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_script... " >&6; } if test "$MODULE_auth_script"; then DEST=$MODULE_auth_script -@@ -85666,12 +36654,10 @@ +@@ -85816,12 +36752,10 @@ if test x"$DEST" = xSHARED; then @@ -90974,7 +91177,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_script" -@@ -85682,16 +36668,16 @@ +@@ -85832,16 +36766,16 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)" @@ -90994,7 +91197,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build auth_netlogond... " >&6; } if test "$MODULE_auth_netlogond"; then DEST=$MODULE_auth_netlogond -@@ -85703,12 +36689,10 @@ +@@ -85853,12 +36787,10 @@ if test x"$DEST" = xSHARED; then @@ -91009,7 +91212,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules auth_netlogond" -@@ -85719,11 +36703,11 @@ +@@ -85869,11 +36801,11 @@ AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)" @@ -91023,7 +91226,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -85744,7 +36728,7 @@ +@@ -85894,7 +36826,7 @@ @@ -91032,7 +91235,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_default... " >&6; } if test "$MODULE_vfs_default"; then DEST=$MODULE_vfs_default -@@ -85756,12 +36740,10 @@ +@@ -85906,12 +36838,10 @@ if test x"$DEST" = xSHARED; then @@ -91047,7 +91250,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_default" -@@ -85772,16 +36754,16 @@ +@@ -85922,16 +36852,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)" @@ -91067,7 +91270,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_recycle... " >&6; } if test "$MODULE_vfs_recycle"; then DEST=$MODULE_vfs_recycle -@@ -85793,12 +36775,10 @@ +@@ -85943,12 +36873,10 @@ if test x"$DEST" = xSHARED; then @@ -91082,7 +91285,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_recycle" -@@ -85809,16 +36789,16 @@ +@@ -85959,16 +36887,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)" @@ -91102,7 +91305,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_audit... " >&6; } if test "$MODULE_vfs_audit"; then DEST=$MODULE_vfs_audit -@@ -85830,12 +36810,10 @@ +@@ -85980,12 +36908,10 @@ if test x"$DEST" = xSHARED; then @@ -91117,7 +91320,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_audit" -@@ -85846,16 +36824,16 @@ +@@ -85996,16 +36922,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)" @@ -91137,7 +91340,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_extd_audit... " >&6; } if test "$MODULE_vfs_extd_audit"; then DEST=$MODULE_vfs_extd_audit -@@ -85867,12 +36845,10 @@ +@@ -86017,12 +36943,10 @@ if test x"$DEST" = xSHARED; then @@ -91152,7 +91355,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_extd_audit" -@@ -85883,16 +36859,16 @@ +@@ -86033,16 +36957,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)" @@ -91172,7 +91375,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_full_audit... " >&6; } if test "$MODULE_vfs_full_audit"; then DEST=$MODULE_vfs_full_audit -@@ -85904,12 +36880,10 @@ +@@ -86054,12 +36978,10 @@ if test x"$DEST" = xSHARED; then @@ -91187,7 +91390,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_full_audit" -@@ -85920,16 +36894,16 @@ +@@ -86070,16 +36992,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)" @@ -91207,7 +91410,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_netatalk... " >&6; } if test "$MODULE_vfs_netatalk"; then DEST=$MODULE_vfs_netatalk -@@ -85941,12 +36915,10 @@ +@@ -86091,12 +37013,10 @@ if test x"$DEST" = xSHARED; then @@ -91222,7 +91425,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_netatalk" -@@ -85957,16 +36929,16 @@ +@@ -86107,16 +37027,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)" @@ -91242,7 +91445,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_fake_perms... " >&6; } if test "$MODULE_vfs_fake_perms"; then DEST=$MODULE_vfs_fake_perms -@@ -85978,12 +36950,10 @@ +@@ -86128,12 +37048,10 @@ if test x"$DEST" = xSHARED; then @@ -91257,7 +91460,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_fake_perms" -@@ -85994,16 +36964,16 @@ +@@ -86144,16 +37062,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)" @@ -91277,7 +91480,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_default_quota... " >&6; } if test "$MODULE_vfs_default_quota"; then DEST=$MODULE_vfs_default_quota -@@ -86015,12 +36985,10 @@ +@@ -86165,12 +37083,10 @@ if test x"$DEST" = xSHARED; then @@ -91292,7 +91495,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_default_quota" -@@ -86031,16 +36999,16 @@ +@@ -86181,16 +37097,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)" @@ -91312,7 +91515,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_readonly... " >&6; } if test "$MODULE_vfs_readonly"; then DEST=$MODULE_vfs_readonly -@@ -86052,12 +37020,10 @@ +@@ -86202,12 +37118,10 @@ if test x"$DEST" = xSHARED; then @@ -91327,7 +91530,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_readonly" -@@ -86068,16 +37034,16 @@ +@@ -86218,16 +37132,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)" @@ -91347,7 +91550,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_cap... " >&6; } if test "$MODULE_vfs_cap"; then DEST=$MODULE_vfs_cap -@@ -86089,12 +37055,10 @@ +@@ -86239,12 +37153,10 @@ if test x"$DEST" = xSHARED; then @@ -91362,7 +91565,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_cap" -@@ -86105,16 +37069,16 @@ +@@ -86255,16 +37167,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)" @@ -91382,7 +91585,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_expand_msdfs... " >&6; } if test "$MODULE_vfs_expand_msdfs"; then DEST=$MODULE_vfs_expand_msdfs -@@ -86126,12 +37090,10 @@ +@@ -86276,12 +37188,10 @@ if test x"$DEST" = xSHARED; then @@ -91397,7 +91600,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_expand_msdfs" -@@ -86142,16 +37104,16 @@ +@@ -86292,16 +37202,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)" @@ -91417,7 +91620,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_shadow_copy... " >&6; } if test "$MODULE_vfs_shadow_copy"; then DEST=$MODULE_vfs_shadow_copy -@@ -86163,12 +37125,10 @@ +@@ -86313,12 +37223,10 @@ if test x"$DEST" = xSHARED; then @@ -91432,7 +91635,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_shadow_copy" -@@ -86179,16 +37139,16 @@ +@@ -86329,16 +37237,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)" @@ -91452,7 +91655,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_shadow_copy2... " >&6; } if test "$MODULE_vfs_shadow_copy2"; then DEST=$MODULE_vfs_shadow_copy2 -@@ -86200,12 +37160,10 @@ +@@ -86350,12 +37258,10 @@ if test x"$DEST" = xSHARED; then @@ -91467,7 +91670,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_shadow_copy2" -@@ -86216,16 +37174,16 @@ +@@ -86366,16 +37272,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)" @@ -91487,7 +91690,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_afsacl... " >&6; } if test "$MODULE_vfs_afsacl"; then DEST=$MODULE_vfs_afsacl -@@ -86237,12 +37195,10 @@ +@@ -86387,12 +37293,10 @@ if test x"$DEST" = xSHARED; then @@ -91502,7 +91705,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_afsacl" -@@ -86253,16 +37209,16 @@ +@@ -86403,16 +37307,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)" @@ -91522,7 +91725,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_xattr_tdb... " >&6; } if test "$MODULE_vfs_xattr_tdb"; then DEST=$MODULE_vfs_xattr_tdb -@@ -86274,12 +37230,10 @@ +@@ -86424,12 +37328,10 @@ if test x"$DEST" = xSHARED; then @@ -91537,7 +91740,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_xattr_tdb" -@@ -86290,16 +37244,16 @@ +@@ -86440,16 +37342,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)" @@ -91557,7 +91760,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_posixacl... " >&6; } if test "$MODULE_vfs_posixacl"; then DEST=$MODULE_vfs_posixacl -@@ -86311,12 +37265,10 @@ +@@ -86461,12 +37363,10 @@ if test x"$DEST" = xSHARED; then @@ -91572,7 +91775,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_posixacl" -@@ -86327,16 +37279,16 @@ +@@ -86477,16 +37377,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)" @@ -91592,7 +91795,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_aixacl... " >&6; } if test "$MODULE_vfs_aixacl"; then DEST=$MODULE_vfs_aixacl -@@ -86348,12 +37300,10 @@ +@@ -86498,12 +37398,10 @@ if test x"$DEST" = xSHARED; then @@ -91607,7 +91810,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_aixacl" -@@ -86364,16 +37314,16 @@ +@@ -86514,16 +37412,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)" @@ -91627,7 +91830,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_aixacl2... " >&6; } if test "$MODULE_vfs_aixacl2"; then DEST=$MODULE_vfs_aixacl2 -@@ -86385,12 +37335,10 @@ +@@ -86535,12 +37433,10 @@ if test x"$DEST" = xSHARED; then @@ -91642,7 +91845,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_aixacl2" -@@ -86401,16 +37349,16 @@ +@@ -86551,16 +37447,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)" @@ -91662,7 +91865,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_solarisacl... " >&6; } if test "$MODULE_vfs_solarisacl"; then DEST=$MODULE_vfs_solarisacl -@@ -86422,12 +37370,10 @@ +@@ -86572,12 +37468,10 @@ if test x"$DEST" = xSHARED; then @@ -91677,7 +91880,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_solarisacl" -@@ -86438,16 +37384,16 @@ +@@ -86588,16 +37482,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)" @@ -91697,7 +91900,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_irixacl... " >&6; } if test "$MODULE_vfs_irixacl"; then DEST=$MODULE_vfs_irixacl -@@ -86459,12 +37405,10 @@ +@@ -86609,12 +37503,10 @@ if test x"$DEST" = xSHARED; then @@ -91712,7 +91915,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_irixacl" -@@ -86475,16 +37419,16 @@ +@@ -86625,16 +37517,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)" @@ -91732,7 +91935,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_hpuxacl... " >&6; } if test "$MODULE_vfs_hpuxacl"; then DEST=$MODULE_vfs_hpuxacl -@@ -86496,12 +37440,10 @@ +@@ -86646,12 +37538,10 @@ if test x"$DEST" = xSHARED; then @@ -91747,7 +91950,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_hpuxacl" -@@ -86512,16 +37454,16 @@ +@@ -86662,16 +37552,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)" @@ -91767,7 +91970,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_tru64acl... " >&6; } if test "$MODULE_vfs_tru64acl"; then DEST=$MODULE_vfs_tru64acl -@@ -86533,12 +37475,10 @@ +@@ -86683,12 +37573,10 @@ if test x"$DEST" = xSHARED; then @@ -91782,7 +91985,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_tru64acl" -@@ -86549,16 +37489,16 @@ +@@ -86699,16 +37587,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)" @@ -91802,7 +92005,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_catia... " >&6; } if test "$MODULE_vfs_catia"; then DEST=$MODULE_vfs_catia -@@ -86570,12 +37510,10 @@ +@@ -86720,12 +37608,10 @@ if test x"$DEST" = xSHARED; then @@ -91817,7 +92020,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_catia" -@@ -86586,16 +37524,16 @@ +@@ -86736,16 +37622,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)" @@ -91837,7 +92040,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_streams_xattr... " >&6; } if test "$MODULE_vfs_streams_xattr"; then DEST=$MODULE_vfs_streams_xattr -@@ -86607,12 +37545,10 @@ +@@ -86757,12 +37643,10 @@ if test x"$DEST" = xSHARED; then @@ -91852,7 +92055,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_streams_xattr" -@@ -86623,16 +37559,16 @@ +@@ -86773,16 +37657,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)" @@ -91872,7 +92075,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_streams_depot... " >&6; } if test "$MODULE_vfs_streams_depot"; then DEST=$MODULE_vfs_streams_depot -@@ -86644,12 +37580,10 @@ +@@ -86794,12 +37678,10 @@ if test x"$DEST" = xSHARED; then @@ -91887,7 +92090,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_streams_depot" -@@ -86660,16 +37594,16 @@ +@@ -86810,16 +37692,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)" @@ -91907,7 +92110,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_cacheprime... " >&6; } if test "$MODULE_vfs_cacheprime"; then DEST=$MODULE_vfs_cacheprime -@@ -86681,12 +37615,10 @@ +@@ -86831,12 +37713,10 @@ if test x"$DEST" = xSHARED; then @@ -91922,7 +92125,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_cacheprime" -@@ -86697,16 +37629,16 @@ +@@ -86847,16 +37727,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)" @@ -91942,7 +92145,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_prealloc... " >&6; } if test "$MODULE_vfs_prealloc"; then DEST=$MODULE_vfs_prealloc -@@ -86718,12 +37650,10 @@ +@@ -86868,12 +37748,10 @@ if test x"$DEST" = xSHARED; then @@ -91957,7 +92160,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_prealloc" -@@ -86734,16 +37664,16 @@ +@@ -86884,16 +37762,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)" @@ -91977,7 +92180,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_commit... " >&6; } if test "$MODULE_vfs_commit"; then DEST=$MODULE_vfs_commit -@@ -86755,12 +37685,10 @@ +@@ -86905,12 +37783,10 @@ if test x"$DEST" = xSHARED; then @@ -91992,7 +92195,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_commit" -@@ -86771,16 +37699,16 @@ +@@ -86921,16 +37797,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)" @@ -92012,7 +92215,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_gpfs... " >&6; } if test "$MODULE_vfs_gpfs"; then DEST=$MODULE_vfs_gpfs -@@ -86792,12 +37720,10 @@ +@@ -86942,12 +37818,10 @@ if test x"$DEST" = xSHARED; then @@ -92027,7 +92230,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_gpfs" -@@ -86808,16 +37734,16 @@ +@@ -86958,16 +37832,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)" @@ -92047,7 +92250,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_readahead... " >&6; } if test "$MODULE_vfs_readahead"; then DEST=$MODULE_vfs_readahead -@@ -86829,12 +37755,10 @@ +@@ -86979,12 +37853,10 @@ if test x"$DEST" = xSHARED; then @@ -92062,7 +92265,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_readahead" -@@ -86845,16 +37769,16 @@ +@@ -86995,16 +37867,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)" @@ -92082,7 +92285,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_tsmsm... " >&6; } if test "$MODULE_vfs_tsmsm"; then DEST=$MODULE_vfs_tsmsm -@@ -86866,12 +37790,10 @@ +@@ -87016,12 +37888,10 @@ if test x"$DEST" = xSHARED; then @@ -92097,7 +92300,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_tsmsm" -@@ -86882,16 +37804,16 @@ +@@ -87032,16 +37902,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)" @@ -92117,7 +92320,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_fileid... " >&6; } if test "$MODULE_vfs_fileid"; then DEST=$MODULE_vfs_fileid -@@ -86903,12 +37825,10 @@ +@@ -87053,12 +37923,10 @@ if test x"$DEST" = xSHARED; then @@ -92132,7 +92335,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_fileid" -@@ -86919,16 +37839,16 @@ +@@ -87069,16 +37937,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)" @@ -92152,7 +92355,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_aio_fork... " >&6; } if test "$MODULE_vfs_aio_fork"; then DEST=$MODULE_vfs_aio_fork -@@ -86940,12 +37860,10 @@ +@@ -87090,12 +37958,10 @@ if test x"$DEST" = xSHARED; then @@ -92167,7 +92370,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_aio_fork" -@@ -86956,16 +37874,16 @@ +@@ -87106,16 +37972,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)" @@ -92187,7 +92390,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_preopen... " >&6; } if test "$MODULE_vfs_preopen"; then DEST=$MODULE_vfs_preopen -@@ -86977,12 +37895,10 @@ +@@ -87127,12 +37993,10 @@ if test x"$DEST" = xSHARED; then @@ -92202,7 +92405,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_preopen" -@@ -86993,16 +37909,16 @@ +@@ -87143,16 +38007,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)" @@ -92222,7 +92425,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_syncops... " >&6; } if test "$MODULE_vfs_syncops"; then DEST=$MODULE_vfs_syncops -@@ -87014,12 +37930,10 @@ +@@ -87164,12 +38028,10 @@ if test x"$DEST" = xSHARED; then @@ -92237,7 +92440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_syncops" -@@ -87030,16 +37944,16 @@ +@@ -87180,16 +38042,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)" @@ -92257,7 +92460,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_zfsacl... " >&6; } if test "$MODULE_vfs_zfsacl"; then DEST=$MODULE_vfs_zfsacl -@@ -87051,12 +37965,10 @@ +@@ -87201,12 +38063,10 @@ if test x"$DEST" = xSHARED; then @@ -92272,7 +92475,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_zfsacl" -@@ -87067,16 +37979,16 @@ +@@ -87217,16 +38077,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)" @@ -92292,7 +92495,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_notify_fam... " >&6; } if test "$MODULE_vfs_notify_fam"; then DEST=$MODULE_vfs_notify_fam -@@ -87088,12 +38000,10 @@ +@@ -87238,12 +38098,10 @@ if test x"$DEST" = xSHARED; then @@ -92307,7 +92510,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_notify_fam" -@@ -87104,16 +38014,16 @@ +@@ -87254,16 +38112,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)" @@ -92327,7 +92530,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_acl_xattr... " >&6; } if test "$MODULE_vfs_acl_xattr"; then DEST=$MODULE_vfs_acl_xattr -@@ -87125,12 +38035,10 @@ +@@ -87275,12 +38133,10 @@ if test x"$DEST" = xSHARED; then @@ -92342,7 +92545,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_acl_xattr" -@@ -87141,16 +38049,16 @@ +@@ -87291,16 +38147,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)" @@ -92362,7 +92565,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_acl_tdb... " >&6; } if test "$MODULE_vfs_acl_tdb"; then DEST=$MODULE_vfs_acl_tdb -@@ -87162,12 +38070,10 @@ +@@ -87312,12 +38168,10 @@ if test x"$DEST" = xSHARED; then @@ -92377,7 +92580,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_acl_tdb" -@@ -87178,16 +38084,16 @@ +@@ -87328,16 +38182,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)" @@ -92397,7 +92600,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_smb_traffic_analyzer... " >&6; } if test "$MODULE_vfs_smb_traffic_analyzer"; then DEST=$MODULE_vfs_smb_traffic_analyzer -@@ -87199,12 +38105,10 @@ +@@ -87349,12 +38203,10 @@ if test x"$DEST" = xSHARED; then @@ -92412,7 +92615,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer" -@@ -87215,16 +38119,16 @@ +@@ -87365,16 +38217,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)" @@ -92432,7 +92635,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_onefs... " >&6; } if test "$MODULE_vfs_onefs"; then DEST=$MODULE_vfs_onefs -@@ -87236,12 +38140,10 @@ +@@ -87386,12 +38238,10 @@ if test x"$DEST" = xSHARED; then @@ -92447,7 +92650,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_onefs" -@@ -87252,16 +38154,16 @@ +@@ -87402,16 +38252,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)" @@ -92467,7 +92670,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_onefs_shadow_copy... " >&6; } if test "$MODULE_vfs_onefs_shadow_copy"; then DEST=$MODULE_vfs_onefs_shadow_copy -@@ -87273,12 +38175,10 @@ +@@ -87423,12 +38273,10 @@ if test x"$DEST" = xSHARED; then @@ -92482,7 +92685,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy" -@@ -87289,16 +38189,16 @@ +@@ -87439,16 +38287,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)" @@ -92502,7 +92705,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_dirsort... " >&6; } if test "$MODULE_vfs_dirsort"; then DEST=$MODULE_vfs_dirsort -@@ -87310,12 +38210,10 @@ +@@ -87460,12 +38308,10 @@ if test x"$DEST" = xSHARED; then @@ -92517,7 +92720,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_dirsort" -@@ -87326,16 +38224,16 @@ +@@ -87476,16 +38322,16 @@ VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)" @@ -92537,7 +92740,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build vfs_scannedonly... " >&6; } if test "$MODULE_vfs_scannedonly"; then DEST=$MODULE_vfs_scannedonly -@@ -87347,12 +38245,10 @@ +@@ -87497,12 +38343,10 @@ if test x"$DEST" = xSHARED; then @@ -92552,7 +92755,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules vfs_scannedonly" -@@ -87363,11 +38259,11 @@ +@@ -87513,11 +38357,11 @@ VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)" @@ -92566,7 +92769,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -87389,7 +38285,7 @@ +@@ -87539,7 +38383,7 @@ @@ -92575,7 +92778,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build perfcount_onefs... " >&6; } if test "$MODULE_perfcount_onefs"; then DEST=$MODULE_perfcount_onefs -@@ -87401,12 +38297,10 @@ +@@ -87551,12 +38395,10 @@ if test x"$DEST" = xSHARED; then @@ -92590,7 +92793,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules perfcount_onefs" -@@ -87417,16 +38311,16 @@ +@@ -87567,16 +38409,16 @@ PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)" @@ -92610,7 +92813,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build perfcount_test... " >&6; } if test "$MODULE_perfcount_test"; then DEST=$MODULE_perfcount_test -@@ -87438,12 +38332,10 @@ +@@ -87588,12 +38430,10 @@ if test x"$DEST" = xSHARED; then @@ -92625,7 +92828,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules perfcount_test" -@@ -87454,11 +38346,11 @@ +@@ -87604,11 +38444,11 @@ PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)" @@ -92639,7 +92842,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -87479,7 +38371,7 @@ +@@ -87629,7 +38469,7 @@ @@ -92648,7 +92851,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build gpext_registry... " >&6; } if test "$MODULE_gpext_registry"; then DEST=$MODULE_gpext_registry -@@ -87491,12 +38383,10 @@ +@@ -87641,12 +38481,10 @@ if test x"$DEST" = xSHARED; then @@ -92663,7 +92866,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules gpext_registry" -@@ -87507,16 +38397,16 @@ +@@ -87657,16 +38495,16 @@ GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o" @@ -92683,7 +92886,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build gpext_scripts... " >&6; } if test "$MODULE_gpext_scripts"; then DEST=$MODULE_gpext_scripts -@@ -87528,12 +38418,10 @@ +@@ -87678,12 +38516,10 @@ if test x"$DEST" = xSHARED; then @@ -92698,7 +92901,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules gpext_scripts" -@@ -87544,16 +38432,16 @@ +@@ -87694,16 +38530,16 @@ GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o" @@ -92718,7 +92921,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking how to build gpext_security... " >&6; } if test "$MODULE_gpext_security"; then DEST=$MODULE_gpext_security -@@ -87565,12 +38453,10 @@ +@@ -87715,12 +38551,10 @@ if test x"$DEST" = xSHARED; then @@ -92733,7 +92936,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "shared" >&6; } string_shared_modules="$string_shared_modules gpext_security" -@@ -87581,11 +38467,11 @@ +@@ -87731,11 +38565,11 @@ GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o" @@ -92747,7 +92950,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "not" >&6; } fi -@@ -87621,18 +38507,16 @@ +@@ -87771,18 +38605,16 @@ ################################################# # If run from the build farm, enable NASTY hacks ################################################# @@ -92770,7 +92973,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -87649,11 +38533,11 @@ +@@ -87799,11 +38631,11 @@ rt_signal_lease_works=yes rt_signal_aio_works=yes @@ -92785,7 +92988,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "cross" >&6; } # cross compiling, I hope you know what you are doing -@@ -87661,11 +38545,7 @@ +@@ -87811,11 +38643,7 @@ else @@ -92798,7 +93001,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -87724,41 +38604,16 @@ +@@ -87874,41 +38702,16 @@ } _ACEOF @@ -92844,7 +93047,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ int -@@ -87769,61 +38624,31 @@ +@@ -87919,61 +38722,31 @@ return 0; } _ACEOF @@ -92913,7 +93116,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } case "$ac_status" in 1|11|101|111) rt_signal_lease_ok=no ;; -@@ -87837,13 +38662,9 @@ +@@ -87987,13 +38760,9 @@ # no RT_SIGNAL bug, we are golden @@ -92929,7 +93132,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ int -@@ -87854,65 +38675,39 @@ +@@ -88004,65 +38773,39 @@ return 0; } _ACEOF @@ -93004,7 +93207,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_merged_build; enable_merged_build=$enableval else enable_merged_build=auto -@@ -87921,9 +38716,7 @@ +@@ -88071,9 +38814,7 @@ if test x"$enable_merged_build" = x"yes" -a \ x"$merged_build_possible" = x"no" ; then @@ -93015,7 +93218,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -87946,9 +38739,9 @@ +@@ -88096,9 +38837,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -93027,7 +93230,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON in -@@ -87961,14 +38754,14 @@ +@@ -88111,14 +38852,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93045,7 +93248,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -87976,10 +38769,10 @@ +@@ -88126,10 +38867,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then @@ -93058,7 +93261,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -87990,9 +38783,9 @@ +@@ -88140,9 +38881,9 @@ else # Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args. set dummy python$PYTHON_VER; ac_word=$2 @@ -93070,7 +93273,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON in -@@ -88005,14 +38798,14 @@ +@@ -88155,14 +38896,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93088,7 +93291,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88020,10 +38813,10 @@ +@@ -88170,10 +38911,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then @@ -93101,7 +93304,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88031,7 +38824,7 @@ +@@ -88181,7 +38922,7 @@ fi if test -z "$PYTHON"; then working_python=no @@ -93110,7 +93313,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: No python found" >&2;} fi -@@ -88042,9 +38835,9 @@ +@@ -88192,9 +38933,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -93122,7 +93325,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON_CONFIG in -@@ -88057,14 +38850,14 @@ +@@ -88207,14 +38948,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93140,7 +93343,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88072,10 +38865,10 @@ +@@ -88222,10 +38963,10 @@ fi PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG if test -n "$PYTHON_CONFIG"; then @@ -93153,7 +93356,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88086,9 +38879,9 @@ +@@ -88236,9 +38977,9 @@ else # Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args. set dummy python$PYTHON_VER-config; ac_word=$2 @@ -93165,7 +93368,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON_CONFIG in -@@ -88101,14 +38894,14 @@ +@@ -88251,14 +38992,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93183,7 +93386,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88116,10 +38909,10 @@ +@@ -88266,10 +39007,10 @@ fi PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG if test -n "$PYTHON_CONFIG"; then @@ -93196,7 +93399,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88127,7 +38920,7 @@ +@@ -88277,7 +39018,7 @@ fi if test -z "$PYTHON_CONFIG"; then @@ -93205,7 +93408,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: No python-config found" >&2;} else -@@ -88137,11 +38930,7 @@ +@@ -88287,11 +39028,7 @@ LIBS="$LIBS `$PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`" @@ -93218,7 +93421,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88158,42 +38947,15 @@ +@@ -88308,42 +39045,15 @@ return 0; } _ACEOF @@ -93264,7 +93467,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88205,11 +38967,7 @@ +@@ -88355,11 +39065,7 @@ LIBS="$LIBS `$PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`" @@ -93277,7 +93480,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88226,42 +38984,15 @@ +@@ -88376,42 +39082,15 @@ return 0; } _ACEOF @@ -93323,7 +93526,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88276,11 +39007,7 @@ +@@ -88426,11 +39105,7 @@ LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`" @@ -93336,7 +93539,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88297,42 +39024,15 @@ +@@ -88447,42 +39122,15 @@ return 0; } _ACEOF @@ -93382,7 +93585,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88344,11 +39044,7 @@ +@@ -88494,11 +39142,7 @@ LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`" @@ -93395,7 +93598,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88365,42 +39061,15 @@ +@@ -88515,42 +39159,15 @@ return 0; } _ACEOF @@ -93441,7 +93644,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88430,11 +39099,7 @@ +@@ -88580,11 +39197,7 @@ LIBS="$LIBS $DISTUTILS_LDFLAGS" CFLAGS="$CFLAGS $DISTUTILS_CFLAGS" @@ -93454,7 +93657,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88451,64 +39116,37 @@ +@@ -88601,64 +39214,37 @@ return 0; } _ACEOF @@ -93527,7 +93730,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$merged_build_possible" >&6; } # Enable merged build automatically if possible, when in developer mode -@@ -88564,9 +39202,9 @@ +@@ -88714,9 +39300,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -93539,7 +93742,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON in -@@ -88579,14 +39217,14 @@ +@@ -88729,14 +39315,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93557,7 +93760,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88594,10 +39232,10 @@ +@@ -88744,10 +39330,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then @@ -93570,7 +93773,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88608,9 +39246,9 @@ +@@ -88758,9 +39344,9 @@ else # Extract the first word of "python[$PYTHON_VER]", so it can be a program name with args. set dummy python$PYTHON_VER; ac_word=$2 @@ -93582,7 +93785,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON in -@@ -88623,14 +39261,14 @@ +@@ -88773,14 +39359,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93600,7 +93803,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88638,10 +39276,10 @@ +@@ -88788,10 +39374,10 @@ fi PYTHON=$ac_cv_path_PYTHON if test -n "$PYTHON"; then @@ -93613,7 +93816,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88649,7 +39287,7 @@ +@@ -88799,7 +39385,7 @@ fi if test -z "$PYTHON"; then working_python=no @@ -93622,7 +93825,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: No python found" >&2;} fi -@@ -88660,9 +39298,9 @@ +@@ -88810,9 +39396,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -93634,7 +93837,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON_CONFIG in -@@ -88675,14 +39313,14 @@ +@@ -88825,14 +39411,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93652,7 +93855,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88690,10 +39328,10 @@ +@@ -88840,10 +39426,10 @@ fi PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG if test -n "$PYTHON_CONFIG"; then @@ -93665,7 +93868,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88704,9 +39342,9 @@ +@@ -88854,9 +39440,9 @@ else # Extract the first word of "python[$PYTHON_VER]-config", so it can be a program name with args. set dummy python$PYTHON_VER-config; ac_word=$2 @@ -93677,7 +93880,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PYTHON_CONFIG in -@@ -88719,14 +39357,14 @@ +@@ -88869,14 +39455,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -93695,7 +93898,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -88734,10 +39372,10 @@ +@@ -88884,10 +39470,10 @@ fi PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG if test -n "$PYTHON_CONFIG"; then @@ -93708,7 +93911,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -88745,7 +39383,7 @@ +@@ -88895,7 +39481,7 @@ fi if test -z "$PYTHON_CONFIG"; then @@ -93717,7 +93920,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: No python-config found" >&2;} else -@@ -88755,11 +39393,7 @@ +@@ -88905,11 +39491,7 @@ LIBS="$LIBS `$PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`" @@ -93730,7 +93933,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88776,42 +39410,15 @@ +@@ -88926,42 +39508,15 @@ return 0; } _ACEOF @@ -93776,7 +93979,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88823,11 +39430,7 @@ +@@ -88973,11 +39528,7 @@ LIBS="$LIBS `$PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`" @@ -93789,7 +93992,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88844,42 +39447,15 @@ +@@ -88994,42 +39545,15 @@ return 0; } _ACEOF @@ -93835,7 +94038,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88894,11 +39470,7 @@ +@@ -89044,11 +39568,7 @@ LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`" @@ -93848,7 +94051,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88915,42 +39487,15 @@ +@@ -89065,42 +39585,15 @@ return 0; } _ACEOF @@ -93894,7 +94097,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -88962,11 +39507,7 @@ +@@ -89112,11 +39605,7 @@ LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`" CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`" @@ -93907,7 +94110,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -88983,42 +39524,15 @@ +@@ -89133,42 +39622,15 @@ return 0; } _ACEOF @@ -93953,7 +94156,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" fi -@@ -89048,11 +39562,7 @@ +@@ -89198,11 +39660,7 @@ LIBS="$LIBS $DISTUTILS_LDFLAGS" CFLAGS="$CFLAGS $DISTUTILS_CFLAGS" @@ -93966,7 +94169,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #undef HAVE_UINTPTR_T -@@ -89069,52 +39579,25 @@ +@@ -89219,52 +39677,25 @@ return 0; } _ACEOF @@ -94024,7 +94227,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } -@@ -89142,20 +39625,18 @@ +@@ -89292,20 +39723,18 @@ else @@ -94049,7 +94252,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$pythondir" >&6; } -@@ -89170,553 +39651,133 @@ +@@ -89320,553 +39749,133 @@ @@ -94690,7 +94893,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -89734,63 +39795,32 @@ +@@ -89884,63 +39893,32 @@ return 0; } _ACEOF @@ -94765,7 +94968,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -89808,43 +39838,18 @@ +@@ -89958,43 +39936,18 @@ return 0; } _ACEOF @@ -94815,7 +95018,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure TERMLIBS="-lreadline $TERMLIBS" EXTERNAL_READLINE=yes break -@@ -89858,11 +39863,11 @@ +@@ -90008,11 +39961,11 @@ ;; no) @@ -94829,7 +95032,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at -@@ -89874,151 +39879,12 @@ +@@ -90024,151 +39977,12 @@ LDFLAGS="-L$with_readline/lib $LDFLAGS" CPPFLAGS="-I$with_readline/include $CPPFLAGS" @@ -94987,7 +95190,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -90027,151 +39893,12 @@ +@@ -90177,151 +39991,12 @@ done @@ -95144,7 +95347,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -90179,168 +39906,26 @@ +@@ -90329,168 +40004,26 @@ done @@ -95322,7 +95525,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -90358,63 +39943,32 @@ +@@ -90508,63 +40041,32 @@ return 0; } _ACEOF @@ -95397,7 +95600,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -90432,43 +39986,18 @@ +@@ -90582,43 +40084,18 @@ return 0; } _ACEOF @@ -95447,7 +95650,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure TERMLDFLAGS="-L$with_readline/lib" TERMCPPFLAGS="-I$with_readline/include" LDFLAGS="-L$with_readline/lib $LDFLAGS" -@@ -90488,7 +40017,7 @@ +@@ -90638,7 +40115,7 @@ ;; esac else @@ -95456,7 +95659,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -90497,18 +40026,14 @@ +@@ -90647,18 +40124,14 @@ # The readline API changed slightly from readline3 to readline4, so # code will generate warnings on one of them unless we have a few # special cases. @@ -95478,7 +95681,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -90521,142 +40046,53 @@ +@@ -90671,142 +40144,53 @@ int main () { @@ -95652,7 +95855,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -90674,60 +40110,31 @@ +@@ -90824,60 +40208,31 @@ return 0; } _ACEOF @@ -95723,7 +95926,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS -@@ -90782,7 +40189,7 @@ +@@ -90932,7 +40287,7 @@ ################################### " @@ -95732,7 +95935,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -90791,102 +40198,9 @@ +@@ -90941,102 +40296,9 @@ @@ -95837,7 +96040,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else cat >>confdefs.h <<_ACEOF -@@ -90895,102 +40209,9 @@ +@@ -91045,102 +40307,9 @@ fi @@ -95942,7 +96145,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else cat >>confdefs.h <<_ACEOF -@@ -91000,151 +40221,12 @@ +@@ -91150,151 +40319,12 @@ fi @@ -96098,7 +96301,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF else -@@ -91154,151 +40236,12 @@ +@@ -91304,151 +40334,12 @@ done @@ -96254,7 +96457,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF else -@@ -91308,29 +40251,6 @@ +@@ -91458,29 +40349,6 @@ done @@ -96284,7 +96487,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure for ac_header in \ crypt.h \ curses.h \ -@@ -91356,147 +40276,11 @@ +@@ -91506,147 +40374,11 @@ netinet6/in6.h \ libintl.h @@ -96437,7 +96640,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -91506,42 +40290,6 @@ +@@ -91656,42 +40388,6 @@ done @@ -96480,7 +96683,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure for ac_func in \ atexit \ cgetent \ -@@ -91574,271 +40322,65 @@ +@@ -91724,271 +40420,65 @@ warn \ errx \ warnx \ @@ -96789,7 +96992,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -91854,11 +40396,11 @@ +@@ -92004,11 +40494,11 @@ #define $ac_tr_func 1 _ACEOF @@ -96803,7 +97006,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; esac -@@ -91868,17 +40410,13 @@ +@@ -92018,17 +40508,13 @@ @@ -96824,7 +97027,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #ifdef HAVE_SYS_BSWAP_H #include -@@ -91891,140 +40429,25 @@ +@@ -92041,140 +40527,25 @@ return 0; } _ACEOF @@ -96974,7 +97177,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -92040,11 +40463,11 @@ +@@ -92190,11 +40561,11 @@ #define $ac_tr_func 1 _ACEOF @@ -96988,7 +97191,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; esac -@@ -92055,25 +40478,21 @@ +@@ -92205,25 +40576,21 @@ @@ -97018,7 +97221,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ac_cv_struct_winsize=yes; break fi rm -f conftest* -@@ -92083,63 +40502,45 @@ +@@ -92233,63 +40600,45 @@ if test "$ac_cv_struct_winsize" = "yes"; then @@ -97093,7 +97296,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -92152,35 +40553,14 @@ +@@ -92302,35 +40651,14 @@ return 0; } _ACEOF @@ -97132,7 +97335,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF -@@ -92190,9 +40570,7 @@ +@@ -92340,9 +40668,7 @@ if test "$ac_cv_type_signal" = "void" ; then @@ -97143,7 +97346,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -92223,18 +40601,14 @@ +@@ -92373,18 +40699,14 @@ @@ -97165,7 +97368,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #ifdef HAVE_SYS_TYPES_H #include -@@ -92251,44 +40625,15 @@ +@@ -92401,44 +40723,15 @@ return 0; } _ACEOF @@ -97215,7 +97418,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ extern int h_errno; int foo(void) { return h_errno; } -@@ -92300,44 +40645,19 @@ +@@ -92450,44 +40743,19 @@ return 0; } _ACEOF @@ -97265,7 +97468,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_foo" >&6; } if test "$ac_foo" = yes; then -@@ -92345,81 +40665,23 @@ +@@ -92495,81 +40763,23 @@ #define HAVE_H_ERRNO 1 _ACEOF @@ -97353,7 +97556,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -92435,151 +40697,12 @@ +@@ -92585,151 +40795,12 @@ @@ -97510,7 +97713,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -92591,23 +40714,17 @@ +@@ -92741,23 +40812,17 @@ @@ -97537,7 +97740,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -92625,54 +40742,28 @@ +@@ -92775,54 +40840,28 @@ return 0; } _ACEOF @@ -97599,7 +97802,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBUTIL 1 _ACEOF -@@ -92689,7 +40780,6 @@ +@@ -92839,7 +40878,6 @@ fi @@ -97607,7 +97810,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS OPENPTY_ENABLE = YES " -@@ -92709,23 +40799,17 @@ +@@ -92859,23 +40897,17 @@ @@ -97634,7 +97837,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -92743,54 +40827,28 @@ +@@ -92893,54 +40925,28 @@ return 0; } _ACEOF @@ -97696,7 +97899,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBINTL 1 _ACEOF -@@ -92807,7 +40865,6 @@ +@@ -92957,7 +40963,6 @@ fi @@ -97704,7 +97907,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS INTL_ENABLE = YES " -@@ -92831,150 +40888,12 @@ +@@ -92981,150 +40986,12 @@ @@ -97860,7 +98063,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -92984,22 +40903,9 @@ +@@ -93134,22 +41001,9 @@ done @@ -97885,7 +98088,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure #ifdef HAVE_SYS_TYPES_H #include #endif -@@ -93010,46 +40916,10 @@ +@@ -93160,46 +41014,10 @@ #include #endif @@ -97935,7 +98138,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -93061,9 +40931,9 @@ +@@ -93211,9 +41029,9 @@ @@ -97947,7 +98150,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -93078,11 +40948,7 @@ +@@ -93228,11 +41046,7 @@ *) ac_lib="-l$ac_lib" ;; esac LIBS=" $ac_lib $ac_save_LIBS" @@ -97960,7 +98163,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -93104,148 +40970,31 @@ +@@ -93254,148 +41068,31 @@ { res_search(0,0,0,0,0) ; @@ -98130,7 +98333,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -93265,13 +41014,13 @@ +@@ -93415,13 +41112,13 @@ #define $ac_tr_func 1 _ACEOF @@ -98146,7 +98349,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; *) -@@ -93285,7 +41034,7 @@ +@@ -93435,7 +41132,7 @@ #define $ac_tr_lib 1 _ACEOF @@ -98155,7 +98358,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes, in $ac_res" >&6; } ;; esac -@@ -93300,9 +41049,9 @@ +@@ -93450,9 +41147,9 @@ @@ -98167,7 +98370,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -93317,11 +41066,7 @@ +@@ -93467,11 +41164,7 @@ *) ac_lib="-l$ac_lib" ;; esac LIBS=" $ac_lib $ac_save_LIBS" @@ -98180,7 +98383,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -93346,38 +41091,11 @@ +@@ -93496,38 +41189,11 @@ return 0; } _ACEOF @@ -98222,7 +98425,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}" LIBS="$ac_save_LIBS" -@@ -93389,102 +41107,12 @@ +@@ -93539,102 +41205,12 @@ eval "ac_res=\$ac_cv_funclib_res_nsearch" if false; then @@ -98330,7 +98533,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -93504,13 +41132,13 @@ +@@ -93654,13 +41230,13 @@ #define $ac_tr_func 1 _ACEOF @@ -98346,7 +98549,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; *) -@@ -93524,7 +41152,7 @@ +@@ -93674,7 +41250,7 @@ #define $ac_tr_lib 1 _ACEOF @@ -98355,7 +98558,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes, in $ac_res" >&6; } ;; esac -@@ -93539,9 +41167,9 @@ +@@ -93689,9 +41265,9 @@ @@ -98367,7 +98570,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -93556,11 +41184,7 @@ +@@ -93706,11 +41282,7 @@ *) ac_lib="-l$ac_lib" ;; esac LIBS=" $ac_lib $ac_save_LIBS" @@ -98380,7 +98583,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -93585,38 +41209,11 @@ +@@ -93735,38 +41307,11 @@ return 0; } _ACEOF @@ -98422,7 +98625,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}" LIBS="$ac_save_LIBS" -@@ -93628,102 +41225,12 @@ +@@ -93778,102 +41323,12 @@ eval "ac_res=\$ac_cv_funclib_res_ndestroy" if false; then @@ -98530,7 +98733,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -93743,13 +41250,13 @@ +@@ -93893,13 +41348,13 @@ #define $ac_tr_func 1 _ACEOF @@ -98546,7 +98749,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; *) -@@ -93763,7 +41270,7 @@ +@@ -93913,7 +41368,7 @@ #define $ac_tr_lib 1 _ACEOF @@ -98555,7 +98758,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes, in $ac_res" >&6; } ;; esac -@@ -93777,9 +41284,9 @@ +@@ -93927,9 +41382,9 @@ @@ -98567,7 +98770,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -93794,11 +41301,7 @@ +@@ -93944,11 +41399,7 @@ *) ac_lib="-l$ac_lib" ;; esac LIBS=" $ac_lib $ac_save_LIBS" @@ -98580,7 +98783,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #ifdef HAVE_DNS_H -@@ -93813,38 +41316,11 @@ +@@ -93963,38 +41414,11 @@ return 0; } _ACEOF @@ -98622,7 +98825,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}" LIBS="$ac_save_LIBS" -@@ -93856,102 +41332,12 @@ +@@ -94006,102 +41430,12 @@ eval "ac_res=\$ac_cv_funclib_dns_search" if false; then @@ -98730,7 +98933,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -93971,13 +41357,13 @@ +@@ -94121,13 +41455,13 @@ #define $ac_tr_func 1 _ACEOF @@ -98746,7 +98949,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; *) -@@ -93991,7 +41377,7 @@ +@@ -94141,7 +41475,7 @@ #define $ac_tr_lib 1 _ACEOF @@ -98755,7 +98958,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes, in $ac_res" >&6; } ;; esac -@@ -94003,9 +41389,9 @@ +@@ -94153,9 +41487,9 @@ @@ -98767,7 +98970,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -94020,11 +41406,7 @@ +@@ -94170,11 +41504,7 @@ *) ac_lib="-l$ac_lib" ;; esac LIBS=" $ac_lib $ac_save_LIBS" @@ -98780,7 +98983,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -94049,38 +41431,11 @@ +@@ -94199,38 +41529,11 @@ return 0; } _ACEOF @@ -98822,7 +99025,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}" LIBS="$ac_save_LIBS" -@@ -94092,102 +41447,12 @@ +@@ -94242,102 +41545,12 @@ eval "ac_res=\$ac_cv_funclib_dn_expand" if false; then @@ -98930,7 +99133,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -94207,13 +41472,13 @@ +@@ -94357,13 +41570,13 @@ #define $ac_tr_func 1 _ACEOF @@ -98946,7 +99149,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } ;; *) -@@ -94227,7 +41492,7 @@ +@@ -94377,7 +41590,7 @@ #define $ac_tr_lib 1 _ACEOF @@ -98955,7 +99158,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes, in $ac_res" >&6; } ;; esac -@@ -94239,18 +41504,14 @@ +@@ -94389,18 +41602,14 @@ @@ -98977,7 +99180,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_TYPES_H -@@ -94274,44 +41535,15 @@ +@@ -94424,44 +41633,15 @@ return 0; } _ACEOF @@ -99027,7 +99230,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ extern int _res; int foo(void) { return _res; } -@@ -94323,44 +41555,19 @@ +@@ -94473,44 +41653,19 @@ return 0; } _ACEOF @@ -99077,7 +99280,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$ac_foo" >&6; } if test "$ac_foo" = yes; then -@@ -94368,18 +41575,7 @@ +@@ -94518,18 +41673,7 @@ #define HAVE__RES 1 _ACEOF @@ -99097,7 +99300,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure #ifdef HAVE_SYS_TYPES_H #include #endif -@@ -94392,64 +41588,17 @@ +@@ -94542,64 +41686,17 @@ #ifdef HAVE_RESOLV_H #include #endif @@ -99167,7 +99370,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -94515,9 +41664,9 @@ +@@ -94665,9 +41762,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -99179,7 +99382,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then -@@ -94528,24 +41677,24 @@ +@@ -94678,24 +41775,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -99209,7 +99412,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -94574,20 +41723,20 @@ +@@ -94724,20 +41821,20 @@ return ! yylex () + ! yywrap (); } _ACEOF @@ -99237,7 +99440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -94596,19 +41745,17 @@ +@@ -94746,19 +41843,17 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else @@ -99261,7 +99464,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else -@@ -94616,55 +41763,29 @@ +@@ -94766,55 +41861,29 @@ ac_cv_lib_lex='none needed' for ac_lib in '' -lfl -ll; do LIBS="$ac_lib $ac_save_LIBS" @@ -99325,7 +99528,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the -@@ -94673,52 +41794,24 @@ +@@ -94823,52 +41892,24 @@ ac_cv_prog_lex_yytext_pointer=no ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" @@ -99385,7 +99588,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi rm -f conftest.l $LEX_OUTPUT_ROOT.c -@@ -94728,9 +41821,9 @@ +@@ -94878,9 +41919,9 @@ if test x"$LEX_BASENAME" = x"flex"; then # "flex 2.5.33" FLEX_VERSION=`$LEX --version | cut -d ' ' -f2` @@ -99397,7 +99600,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$FLEX_VERSION" >&6; } FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1` FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2` -@@ -94743,9 +41836,9 @@ +@@ -94893,9 +41934,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -99409,7 +99612,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then -@@ -94756,24 +41849,24 @@ +@@ -94906,24 +41947,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -99439,7 +99642,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -94786,9 +41879,9 @@ +@@ -94936,9 +41977,9 @@ if test x"$YACC_BASENAME" = x"bison -y"; then # bison (GNU Bison) 2.3 BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4` @@ -99451,7 +99654,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$BISON_VERSION" >&6; } BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1` BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2` -@@ -94796,7 +41889,7 @@ +@@ -94946,7 +41987,7 @@ YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR" fi @@ -99460,7 +99663,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "checking working LEX YACC combination... " >&6; } LEX_YACC="no" if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then -@@ -94812,7 +41905,7 @@ +@@ -94962,7 +42003,7 @@ LEX=false YACC=false fi @@ -99469,7 +99672,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$LEX_YACC" >&6; } # Portions of heimdal kerberos are unpacked into source/heimdal -@@ -94820,21 +41913,15 @@ +@@ -94970,21 +42011,15 @@ # if we ever get to using a host kerberos, we might add conditionals here @@ -99494,7 +99697,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure HAVE_GSSAPI=YES -@@ -94914,193 +42001,48 @@ +@@ -95064,193 +42099,48 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";" @@ -99716,7 +99919,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -95118,46 +42060,15 @@ +@@ -95268,46 +42158,15 @@ return 0; } _ACEOF @@ -99767,7 +99970,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -95175,65 +42086,32 @@ +@@ -95325,65 +42184,32 @@ return 0; } _ACEOF @@ -99841,7 +100044,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define backtrace to an innocuous variant, in case declares backtrace. For example, HP-UX 11i declares gettimeofday. */ -@@ -95274,43 +42152,18 @@ +@@ -95424,43 +42250,18 @@ return 0; } _ACEOF @@ -99891,7 +100094,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_BACKTRACE 1 _ACEOF -@@ -95318,7 +42171,6 @@ +@@ -95468,7 +42269,6 @@ fi @@ -99899,7 +100102,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then MAKE_SETTINGS="$MAKE_SETTINGS -@@ -95404,102 +42256,12 @@ +@@ -95554,102 +42354,12 @@ @@ -100007,7 +100210,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -95508,102 +42270,12 @@ +@@ -95658,102 +42368,12 @@ done @@ -100114,7 +100317,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -95612,153 +42284,14 @@ +@@ -95762,153 +42382,14 @@ ################################################# # these tests are taken from the GNU fileutils package @@ -100274,7 +100477,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -95768,65 +42301,16 @@ +@@ -95918,65 +42399,16 @@ done @@ -100345,7 +100548,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -95839,19 +42323,15 @@ +@@ -95989,19 +42421,15 @@ # Test for statvfs64. if test $space = no; then # SVR4 @@ -100369,7 +100572,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #if defined(HAVE_UNISTD_H) -@@ -95865,51 +42345,22 @@ +@@ -96015,51 +42443,22 @@ exit (statvfs64 (".", &fsd)); } _ACEOF @@ -100427,7 +100630,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -95922,16 +42373,12 @@ +@@ -96072,16 +42471,12 @@ # is what it gets when this test fails. if test $space = no; then # SVR4 @@ -100447,7 +100650,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -95943,64 +42390,33 @@ +@@ -96093,64 +42488,33 @@ return 0; } _ACEOF @@ -100521,7 +100724,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -96012,59 +42428,32 @@ +@@ -96162,59 +42526,32 @@ return 0; } _ACEOF @@ -100589,7 +100792,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -96077,71 +42466,38 @@ +@@ -96227,71 +42564,38 @@ exit (statfs (".", &fsd, sizeof (struct statfs))); } _ACEOF @@ -100671,7 +100874,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #ifdef HAVE_SYS_PARAM_H -@@ -96160,71 +42516,38 @@ +@@ -96310,71 +42614,38 @@ exit (statfs (".", &fsd)); } _ACEOF @@ -100753,7 +100956,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -96234,71 +42557,38 @@ +@@ -96384,71 +42655,38 @@ exit (statfs (".", &fsd, sizeof fsd, 0)); } _ACEOF @@ -100835,7 +101038,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_PARAM_H -@@ -96314,71 +42604,38 @@ +@@ -96464,71 +42702,38 @@ exit (statfs (".", &fsd)); } _ACEOF @@ -100917,7 +101120,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #ifdef HAVE_SYS_PARAM_H -@@ -96398,201 +42655,33 @@ +@@ -96548,201 +42753,33 @@ exit (statfs (".", &fsd) != 1); } _ACEOF @@ -101142,7 +101345,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -96601,19 +42690,15 @@ +@@ -96751,19 +42788,15 @@ done @@ -101165,7 +101368,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -96631,46 +42716,15 @@ +@@ -96781,46 +42814,15 @@ return 0; } _ACEOF @@ -101216,7 +101419,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -96688,65 +42742,32 @@ +@@ -96838,65 +42840,32 @@ return 0; } _ACEOF @@ -101290,7 +101493,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define flistxattr to an innocuous variant, in case declares flistxattr. For example, HP-UX 11i declares gettimeofday. */ -@@ -96787,50 +42808,24 @@ +@@ -96937,50 +42906,24 @@ return 0; } _ACEOF @@ -101347,7 +101550,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS XATTR_LIBS = ${XATTR_LIBS} XATTR_CFLAGS = ${XATTR_CFLAGS} -@@ -96840,18 +42835,14 @@ +@@ -96990,18 +42933,14 @@ if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then @@ -101369,7 +101572,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -96874,48 +42865,23 @@ +@@ -97024,48 +42963,23 @@ return 0; } _ACEOF @@ -101423,7 +101626,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS -@@ -96927,20 +42893,16 @@ +@@ -97077,20 +42991,16 @@ fi @@ -101448,7 +101651,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -96955,117 +42917,55 @@ +@@ -97105,117 +43015,55 @@ } _ACEOF @@ -101582,7 +101785,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -97073,7 +42973,7 @@ +@@ -97223,7 +43071,7 @@ INCLUDED_POPT=auto # Check whether --with-included-popt was given. @@ -101591,7 +101794,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_included_popt; INCLUDED_POPT=$withval fi -@@ -97082,169 +42982,26 @@ +@@ -97232,169 +43080,26 @@ if test x"$INCLUDED_POPT" != x"yes"; then @@ -101769,7 +101972,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -97262,43 +43019,18 @@ +@@ -97412,43 +43117,18 @@ return 0; } _ACEOF @@ -101819,7 +102022,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure POPT_LIBS="-lpopt" fi -@@ -97310,9 +43042,9 @@ +@@ -97460,9 +43140,9 @@ fi fi @@ -101831,7 +102034,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$INCLUDED_POPT" >&6; } if test x"$INCLUDED_POPT" != x"no"; then poptdir="" -@@ -97326,156 +43058,16 @@ +@@ -97476,156 +43156,16 @@ fi done if test x"$poptdir" = "x"; then @@ -101995,7 +102198,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -97514,12 +43106,10 @@ +@@ -97664,12 +43204,10 @@ LOOK_DIRS="/usr /usr/local /sw" # Check whether --with-libiconv was given. @@ -102010,7 +102213,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else if test "$withval" != "yes" ; then -@@ -97531,26 +43121,20 @@ +@@ -97681,26 +43219,20 @@ LIBS=-liconv @@ -102045,7 +102248,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97563,33 +43147,10 @@ +@@ -97713,33 +43245,10 @@ } _ACEOF @@ -102082,7 +102285,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ICONV_FOUND=yes; ICONV_CPPFLAGS="$CPPFLAGS" -@@ -97597,29 +43158,17 @@ +@@ -97747,29 +43256,17 @@ ICONV_LDFLAGS="$LDFLAGS" else @@ -102117,7 +102320,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97632,33 +43181,10 @@ +@@ -97782,33 +43279,10 @@ } _ACEOF @@ -102154,7 +102357,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ICONV_FOUND=yes; ICONV_CPPFLAGS="$CPPFLAGS" -@@ -97666,28 +43192,17 @@ +@@ -97816,28 +43290,17 @@ ICONV_LDFLAGS="$LDFLAGS" else @@ -102189,7 +102392,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97700,33 +43215,10 @@ +@@ -97850,33 +43313,10 @@ } _ACEOF @@ -102226,7 +102429,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ICONV_FOUND=yes; ICONV_CPPFLAGS="$CPPFLAGS" -@@ -97734,31 +43226,22 @@ +@@ -97884,31 +43324,22 @@ ICONV_LDFLAGS="$LDFLAGS" else @@ -102264,7 +102467,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CPPFLAGS="$save_CPPFLAGS" LDFLAGS="$save_LDFLAGS" LIBS="$save_LIBS" -@@ -97771,17 +43254,13 @@ +@@ -97921,17 +43352,13 @@ if test x$ICONV_FOUND = xno; then @@ -102286,7 +102489,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97794,49 +43273,20 @@ +@@ -97944,49 +43371,20 @@ } _ACEOF @@ -102342,7 +102545,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi for i in $LOOK_DIRS ; do -@@ -97853,24 +43303,20 @@ +@@ -98003,24 +43401,20 @@ LIBS=-liconv @@ -102374,7 +102577,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97883,33 +43329,10 @@ +@@ -98033,33 +43427,10 @@ } _ACEOF @@ -102411,7 +102614,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ICONV_FOUND=yes ICONV_CPPFLAGS="$CPPFLAGS" -@@ -97917,27 +43340,17 @@ +@@ -98067,27 +43438,17 @@ ICONV_LDFLAGS="$LDFLAGS" else @@ -102443,7 +102646,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -97950,33 +43363,10 @@ +@@ -98100,33 +43461,10 @@ } _ACEOF @@ -102480,7 +102683,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ICONV_FOUND=yes ICONV_CPPFLAGS="$CPPFLAGS" -@@ -97984,26 +43374,17 @@ +@@ -98134,26 +43472,17 @@ ICONV_LDFLAGS="$LDFLAGS" else @@ -102512,7 +102715,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include #include -@@ -98015,304 +43396,92 @@ +@@ -98165,304 +43494,92 @@ return 0; } @@ -102884,7 +103087,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -98391,151 +43560,12 @@ +@@ -98541,151 +43658,12 @@ @@ -103040,7 +103243,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -98545,23 +43575,17 @@ +@@ -98695,23 +43673,17 @@ @@ -103067,7 +103270,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -98579,54 +43603,28 @@ +@@ -98729,54 +43701,28 @@ return 0; } _ACEOF @@ -103129,7 +103332,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBZ 1 _ACEOF -@@ -98642,18 +43640,13 @@ +@@ -98792,18 +43738,13 @@ fi @@ -103151,7 +103354,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -98671,40 +43664,19 @@ +@@ -98821,40 +43762,19 @@ return 0; } _ACEOF @@ -103194,7 +103397,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_zlib_1_2_3" >&6; } if test x"$ac_cv_header_zlib_h" = x"yes" -a \ -@@ -98763,9 +43735,9 @@ +@@ -98913,9 +43833,9 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -103206,7 +103409,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -98778,14 +43750,14 @@ +@@ -98928,14 +43848,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -103224,7 +103427,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -@@ -98794,10 +43766,10 @@ +@@ -98944,10 +43864,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -103237,7 +103440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -98813,52 +43785,27 @@ +@@ -98963,52 +43883,27 @@ else SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then @@ -103297,7 +103500,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS LIBTALLOC_ENABLE = YES -@@ -98866,22 +43813,16 @@ +@@ -99016,22 +43911,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"LIBTALLOC\"} = \"YES\";" @@ -103324,7 +103527,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$OLD_CFLAGS" ac_cv_LIBTALLOC_libs_only_other="`$PKG_CONFIG --libs-only-other 'talloc >= 2.0.1'` `$PKG_CONFIG --libs-only-L 'talloc >= 2.0.1'`" -@@ -98942,7 +43883,7 @@ +@@ -99092,7 +43981,7 @@ ac_cv_LIBTALLOC_found=yes else @@ -103333,7 +103536,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } $PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.1' ac_cv_LIBTALLOC_found=no -@@ -98976,9 +43917,9 @@ +@@ -99126,9 +44015,9 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -103345,7 +103548,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -98991,14 +43932,14 @@ +@@ -99141,14 +44030,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -103363,7 +103566,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -@@ -99007,10 +43948,10 @@ +@@ -99157,10 +44046,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -103376,7 +103579,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -99026,52 +43967,27 @@ +@@ -99176,52 +44065,27 @@ else SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then @@ -103436,7 +103639,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS LIBTDB_ENABLE = YES -@@ -99079,22 +43995,16 @@ +@@ -99229,22 +44093,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"LIBTDB\"} = \"YES\";" @@ -103463,7 +103666,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$OLD_CFLAGS" ac_cv_LIBTDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'tdb >= 1.2.1'` `$PKG_CONFIG --libs-only-L 'tdb >= 1.2.1'`" -@@ -99155,7 +44065,7 @@ +@@ -99305,7 +44163,7 @@ ac_cv_LIBTDB_found=yes else @@ -103472,7 +103675,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } $PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.2.1' ac_cv_LIBTDB_found=no -@@ -99180,9 +44090,7 @@ +@@ -99330,9 +44188,7 @@ fi done if test x"$tdbdir" = "x"; then @@ -103483,7 +103686,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o" -@@ -99195,104 +44103,12 @@ +@@ -99345,104 +44201,12 @@ TDB_CFLAGS="-I$tdbdir/include" @@ -103593,7 +103796,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -99300,151 +44116,12 @@ +@@ -99450,151 +44214,12 @@ fi done @@ -103750,7 +103953,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -99455,17 +44132,13 @@ +@@ -99605,17 +44230,13 @@ @@ -103771,7 +103974,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -99476,56 +44149,29 @@ +@@ -99626,56 +44247,29 @@ return 0; } _ACEOF @@ -103835,7 +104038,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -99536,41 +44182,18 @@ +@@ -99686,41 +44280,18 @@ return 0; } _ACEOF @@ -103881,7 +104084,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -99601,9 +44224,9 @@ +@@ -99751,9 +44322,9 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -103893,7 +104096,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -99616,14 +44239,14 @@ +@@ -99766,14 +44337,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -103911,7 +104114,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -@@ -99632,10 +44255,10 @@ +@@ -99782,10 +44353,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -103924,7 +104127,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -99651,52 +44274,27 @@ +@@ -99801,52 +44372,27 @@ else SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then @@ -103984,7 +104187,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS LIBTEVENT_ENABLE = YES -@@ -99704,22 +44302,16 @@ +@@ -99854,22 +44400,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"LIBTEVENT\"} = \"YES\";" @@ -104011,7 +104214,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$OLD_CFLAGS" ac_cv_LIBTEVENT_libs_only_other="`$PKG_CONFIG --libs-only-other 'tevent = 0.9.8'` `$PKG_CONFIG --libs-only-L 'tevent = 0.9.8'`" -@@ -99780,7 +44372,7 @@ +@@ -99930,7 +44470,7 @@ ac_cv_LIBTEVENT_found=yes else @@ -104020,7 +104223,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } $PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8' ac_cv_LIBTEVENT_found=no -@@ -99801,281 +44393,50 @@ +@@ -99951,281 +44491,50 @@ if test x"$teventdir" = "x"; then teventdir="" @@ -104333,7 +104536,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -100084,9 +44445,7 @@ +@@ -100234,9 +44543,7 @@ if test x"$ac_cv_header_sys_epoll_h" = x"yes" -a x"$ac_cv_func_epoll_create" = x"yes"; then TEVENT_OBJ="$TEVENT_OBJ tevent_epoll.o" @@ -104344,7 +104547,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -100142,9 +44501,9 @@ +@@ -100292,9 +44599,9 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -104356,7 +104559,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -100157,14 +44516,14 @@ +@@ -100307,14 +44614,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -104374,7 +104577,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -@@ -100173,10 +44532,10 @@ +@@ -100323,10 +44630,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -104387,7 +104590,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -100192,52 +44551,27 @@ +@@ -100342,52 +44649,27 @@ else SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then @@ -104447,7 +104650,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS LIBLDB_ENABLE = YES -@@ -100245,22 +44579,16 @@ +@@ -100395,22 +44677,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"LIBLDB\"} = \"YES\";" @@ -104474,7 +104677,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$OLD_CFLAGS" ac_cv_LIBLDB_libs_only_other="`$PKG_CONFIG --libs-only-other 'ldb = 0.9.10'` `$PKG_CONFIG --libs-only-L 'ldb = 0.9.10'`" -@@ -100321,7 +44649,7 @@ +@@ -100471,7 +44747,7 @@ ac_cv_LIBLDB_found=yes else @@ -104483,7 +104686,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } $PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.10' ac_cv_LIBLDB_found=no -@@ -100367,12 +44695,12 @@ +@@ -100517,12 +44793,12 @@ SQLITE3_LIBS="" with_sqlite3_support=no @@ -104498,7 +104701,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure withval=$with_sqlite3; case "$withval" in yes|no|auto) with_sqlite3_support=$withval -@@ -100381,157 +44709,18 @@ +@@ -100531,157 +44807,18 @@ fi @@ -104662,7 +104865,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -100541,11 +44730,9 @@ +@@ -100691,11 +44828,9 @@ if test x"$ac_cv_header_sqlite3_h" != x"yes"; then if test x"$with_sqlite3_support" = x"yes"; then @@ -104676,7 +104879,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;} fi -@@ -100560,23 +44747,17 @@ +@@ -100710,23 +44845,17 @@ # now see if we can find the sqlite3 libs in standard paths @@ -104703,7 +104906,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -100594,54 +44775,28 @@ +@@ -100744,54 +44873,28 @@ return 0; } _ACEOF @@ -104765,7 +104968,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBSQLITE3 1 _ACEOF -@@ -100657,21 +44812,16 @@ +@@ -100807,21 +44910,16 @@ fi @@ -104791,7 +104994,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } with_sqlite3_support=yes -@@ -100683,11 +44833,9 @@ +@@ -100833,11 +44931,9 @@ else if test x"$with_sqlite3_support" = x"yes"; then @@ -104805,7 +105008,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;} fi -@@ -100757,7 +44905,7 @@ +@@ -100907,7 +45003,7 @@ use_gnutls=auto # Check whether --enable-gnutls was given. @@ -104814,7 +105017,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_gnutls; if test x$enable_gnutls = xno; then use_gnutls=no fi -@@ -100771,9 +44919,9 @@ +@@ -100921,9 +45017,9 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -104826,7 +105029,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in -@@ -100786,14 +44934,14 @@ +@@ -100936,14 +45032,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -104844,7 +105047,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -@@ -100802,10 +44950,10 @@ +@@ -100952,10 +45048,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then @@ -104857,7 +105060,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -100821,52 +44969,27 @@ +@@ -100971,52 +45067,27 @@ else SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0" if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then @@ -104917,7 +105120,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS GNUTLS_ENABLE = YES -@@ -100874,22 +44997,16 @@ +@@ -101024,22 +45095,16 @@ SMB_INFO_ENABLES="$SMB_INFO_ENABLES \$enabled{\"GNUTLS\"} = \"YES\";" @@ -104944,7 +105147,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CFLAGS="$OLD_CFLAGS" ac_cv_GNUTLS_libs_only_other="`$PKG_CONFIG --libs-only-other 'gnutls >= 1.4.0'` `$PKG_CONFIG --libs-only-L 'gnutls >= 1.4.0'`" -@@ -100950,7 +45067,7 @@ +@@ -101100,7 +45165,7 @@ ac_cv_GNUTLS_found=yes else @@ -104953,7 +105156,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } $PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0' ac_cv_GNUTLS_found=no -@@ -100970,151 +45087,12 @@ +@@ -101120,151 +45185,12 @@ fi if test x$use_gnutls = xauto; then @@ -105110,7 +105313,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -101123,23 +45101,17 @@ +@@ -101273,23 +45199,17 @@ @@ -105137,7 +105340,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -101157,580 +45129,116 @@ +@@ -101307,580 +45227,116 @@ return 0; } _ACEOF @@ -105797,7 +106000,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -101739,23 +45247,17 @@ +@@ -101889,23 +45345,17 @@ @@ -105824,7 +106027,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -101773,54 +45275,28 @@ +@@ -101923,54 +45373,28 @@ return 0; } _ACEOF @@ -105886,7 +106089,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBGCRYPT 1 _ACEOF -@@ -101836,7 +45312,6 @@ +@@ -101986,7 +45410,6 @@ fi @@ -105894,7 +106097,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS GCRYPT_LIBS = $GCRYPT_LIBS GCRYPT_CFLAGS = -@@ -101853,7 +45328,7 @@ +@@ -102003,7 +45426,7 @@ use_netapi=auto # Check whether --enable-netapi was given. @@ -105903,7 +106106,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_netapi; if test x$enable_netapi = xno; then use_netapi=no fi -@@ -101875,151 +45350,12 @@ +@@ -102025,151 +45448,12 @@ \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";" if test x$use_netapi != xno; then @@ -106060,7 +106263,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -102028,23 +45364,17 @@ +@@ -102178,23 +45462,17 @@ @@ -106087,7 +106290,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102062,54 +45392,28 @@ +@@ -102212,54 +45490,28 @@ return 0; } _ACEOF @@ -106149,7 +106352,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNETAPI 1 _ACEOF -@@ -102126,24 +45430,17 @@ +@@ -102276,24 +45528,17 @@ fi @@ -106177,7 +106380,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102161,54 +45458,28 @@ +@@ -102311,54 +45556,28 @@ return 0; } _ACEOF @@ -106239,7 +106442,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNETAPI 1 _ACEOF -@@ -102225,24 +45496,17 @@ +@@ -102375,24 +45594,17 @@ fi @@ -106267,7 +106470,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102260,54 +45524,28 @@ +@@ -102410,54 +45622,28 @@ return 0; } _ACEOF @@ -106329,7 +106532,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNETAPI 1 _ACEOF -@@ -102324,24 +45562,17 @@ +@@ -102474,24 +45660,17 @@ fi @@ -106357,7 +106560,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102359,54 +45590,28 @@ +@@ -102509,54 +45688,28 @@ return 0; } _ACEOF @@ -106419,7 +106622,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNETAPI 1 _ACEOF -@@ -102423,24 +45628,17 @@ +@@ -102573,24 +45726,17 @@ fi @@ -106447,7 +106650,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102458,54 +45656,28 @@ +@@ -102608,54 +45754,28 @@ return 0; } _ACEOF @@ -106509,7 +106712,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBNETAPI 1 _ACEOF -@@ -102520,12 +45692,9 @@ +@@ -102670,12 +45790,9 @@ fi @@ -106523,7 +106726,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS -@@ -102543,9 +45712,7 @@ +@@ -102693,9 +45810,7 @@ else if test x$use_netapi != xauto; then @@ -106534,7 +106737,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi fi -@@ -102586,19 +45753,17 @@ +@@ -102736,19 +45851,17 @@ ################################################# # check for pthread support @@ -106558,7 +106761,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi MAKE_SETTINGS="$MAKE_SETTINGS -@@ -102616,12 +45781,12 @@ +@@ -102766,12 +45879,12 @@ ;; *) @@ -106573,7 +106776,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -102637,274 +45802,45 @@ +@@ -102787,274 +45900,45 @@ @@ -106861,7 +107064,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -102922,54 +45858,28 @@ +@@ -103072,54 +45956,28 @@ return 0; } _ACEOF @@ -106923,7 +107126,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBSETPROCTITLE 1 _ACEOF -@@ -102985,15 +45895,14 @@ +@@ -103135,15 +45993,14 @@ fi @@ -106941,7 +107144,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "yes" >&6; } MAKE_SETTINGS="$MAKE_SETTINGS -@@ -103003,22 +45912,20 @@ +@@ -103153,22 +46010,20 @@ \$enabled{\"SETPROCTITLE\"} = \"YES\";" @@ -106968,7 +107171,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "no" >&6; } fi -@@ -103036,238 +45943,68 @@ +@@ -103186,238 +46041,68 @@ @@ -107237,7 +107440,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -103285,46 +46022,15 @@ +@@ -103435,46 +46120,15 @@ return 0; } _ACEOF @@ -107288,7 +107491,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -103342,65 +46048,32 @@ +@@ -103492,65 +46146,32 @@ return 0; } _ACEOF @@ -107362,7 +107565,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Define blkid_get_cache to an innocuous variant, in case declares blkid_get_cache. For example, HP-UX 11i declares gettimeofday. */ -@@ -103441,50 +46114,24 @@ +@@ -103591,50 +46212,24 @@ return 0; } _ACEOF @@ -107419,7 +107622,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS BLKID_LIBS = ${BLKID_LIBS} BLKID_CFLAGS = ${BLKID_CFLAGS} -@@ -103495,9 +46142,7 @@ +@@ -103645,9 +46240,7 @@ if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then @@ -107430,7 +107633,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS -@@ -103525,102 +46170,12 @@ +@@ -103675,102 +46268,12 @@ fi @@ -107537,7 +107740,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -103630,151 +46185,12 @@ +@@ -103780,151 +46283,12 @@ ############################### # start SMB_EXT_LIB_PAM # check for security/pam_appl.h and -lpam @@ -107693,7 +107896,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -103783,23 +46199,17 @@ +@@ -103933,23 +46297,17 @@ @@ -107720,7 +107923,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -103817,54 +46227,28 @@ +@@ -103967,54 +46325,28 @@ return 0; } _ACEOF @@ -107782,7 +107985,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 _ACEOF -@@ -103879,7 +46263,6 @@ +@@ -104029,7 +46361,6 @@ fi @@ -107790,7 +107993,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then MAKE_SETTINGS="$MAKE_SETTINGS -@@ -103905,23 +46288,17 @@ +@@ -104055,23 +46386,17 @@ # test for where we get crypt() from @@ -107817,7 +108020,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -103939,54 +46316,28 @@ +@@ -104089,54 +46414,28 @@ return 0; } _ACEOF @@ -107879,7 +108082,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF -@@ -104002,7 +46353,6 @@ +@@ -104152,7 +46451,6 @@ fi @@ -107887,7 +108090,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure MAKE_SETTINGS="$MAKE_SETTINGS CRYPT_ENABLE = YES " -@@ -104019,102 +46369,12 @@ +@@ -104169,102 +46467,12 @@ @@ -107995,7 +108198,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -104123,151 +46383,12 @@ +@@ -104273,151 +46481,12 @@ done @@ -108151,7 +108354,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -104276,23 +46397,17 @@ +@@ -104426,23 +46495,17 @@ @@ -108178,7 +108381,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -104310,54 +46425,28 @@ +@@ -104460,54 +46523,28 @@ return 0; } _ACEOF @@ -108240,7 +108443,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBSASL2 1 _ACEOF -@@ -104373,7 +46462,6 @@ +@@ -104523,7 +46560,6 @@ fi @@ -108248,7 +108451,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then MAKE_SETTINGS="$MAKE_SETTINGS -@@ -104419,312 +46507,88 @@ +@@ -104569,312 +46605,88 @@ ac_new_flags="$ac_new_flags$s$i"; else ac_new_flags="$ac_new_flags$s$l $i"; @@ -108618,7 +108821,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -104735,41 +46599,18 @@ +@@ -104885,41 +46697,18 @@ return 0; } _ACEOF @@ -108664,7 +108867,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -104813,17 +46654,13 @@ +@@ -104963,17 +46752,13 @@ fi @@ -108685,7 +108888,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -104834,56 +46671,29 @@ +@@ -104984,56 +46769,29 @@ return 0; } _ACEOF @@ -108749,7 +108952,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include int -@@ -104894,41 +46704,18 @@ +@@ -105044,41 +46802,18 @@ return 0; } _ACEOF @@ -108795,7 +108998,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi -@@ -104952,151 +46739,12 @@ +@@ -105102,151 +46837,12 @@ fi @@ -108952,7 +109155,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -105410,151 +47058,12 @@ +@@ -105560,151 +47156,12 @@ @@ -109108,7 +109311,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF fi -@@ -105564,23 +47073,17 @@ +@@ -105714,23 +47171,17 @@ @@ -109135,7 +109338,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -105598,54 +47101,28 @@ +@@ -105748,54 +47199,28 @@ return 0; } _ACEOF @@ -109197,7 +109400,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure cat >>confdefs.h <<_ACEOF #define HAVE_LIBZ 1 _ACEOF -@@ -105661,18 +47138,13 @@ +@@ -105811,18 +47236,13 @@ fi @@ -109219,7 +109422,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure /* end confdefs.h. */ #include -@@ -105690,40 +47162,19 @@ +@@ -105840,40 +47260,19 @@ return 0; } _ACEOF @@ -109262,7 +109465,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$samba_cv_zlib_1_2_3" >&6; } if test x"$ac_cv_header_zlib_h" = x"yes" -a \ -@@ -105745,7 +47196,7 @@ +@@ -105895,7 +47294,7 @@ # Check whether --enable-dmalloc was given. @@ -109271,7 +109474,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure enableval=$enable_dmalloc; fi -@@ -105753,14 +47204,10 @@ +@@ -105903,14 +47302,10 @@ if test "x$enable_dmalloc" = xyes then @@ -109288,7 +109491,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure LIBS="$LIBS -ldmalloc" fi -@@ -105858,87 +47305,54 @@ +@@ -106008,87 +47403,54 @@ ################################################# # Display summary of libraries detected @@ -109392,7 +109595,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes" -o x"$picky_developer" = x"yes"; then CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS)" fi -@@ -105997,13 +47411,13 @@ +@@ -106147,13 +47509,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -109408,7 +109611,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure esac ;; esac done -@@ -106011,8 +47425,8 @@ +@@ -106161,8 +47523,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -109419,7 +109622,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -106035,11 +47449,11 @@ +@@ -106185,11 +47547,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -109433,7 +109636,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -106059,8 +47473,8 @@ +@@ -106209,8 +47571,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -109444,7 +109647,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done LIBOBJS=$ac_libobjs -@@ -106084,9 +47498,10 @@ +@@ -106234,9 +47596,10 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -109457,7 +109660,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -106096,17 +47511,18 @@ +@@ -106246,17 +47609,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -109483,7 +109686,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -106114,23 +47530,15 @@ +@@ -106264,23 +47628,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -109512,7 +109715,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure as_nl=' ' export as_nl -@@ -106138,7 +47546,13 @@ +@@ -106288,7 +47644,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -109527,7 +109730,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -106149,7 +47563,7 @@ +@@ -106299,7 +47661,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -109536,7 +109739,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -106172,13 +47586,6 @@ +@@ -106322,13 +47684,6 @@ } fi @@ -109550,7 +109753,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -106188,15 +47595,15 @@ +@@ -106338,15 +47693,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -109569,7 +109772,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure IFS=$as_save_IFS ;; -@@ -106208,12 +47615,16 @@ +@@ -106358,12 +47713,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -109590,7 +109793,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done PS1='$ ' PS2='> ' -@@ -106225,7 +47636,89 @@ +@@ -106375,7 +47734,89 @@ LANGUAGE=C export LANGUAGE @@ -109681,7 +109884,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -106239,8 +47732,12 @@ +@@ -106389,8 +47830,12 @@ as_basename=false fi @@ -109695,7 +109898,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -106260,76 +47757,25 @@ +@@ -106410,76 +47855,25 @@ } s/.*/./; q'` @@ -109783,7 +109986,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -106358,8 +47804,56 @@ +@@ -106508,8 +47902,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -109841,7 +110044,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -106378,10 +47872,10 @@ +@@ -106528,10 +47970,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -109854,7 +110057,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -106396,13 +47890,19 @@ +@@ -106546,13 +47988,19 @@ exec 6>&1 @@ -109876,7 +110079,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -106434,13 +47934,15 @@ +@@ -106584,13 +48032,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -109895,7 +110098,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -106459,16 +47961,17 @@ +@@ -106609,16 +48059,17 @@ Configuration commands: $config_commands @@ -109917,7 +110120,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -106503,6 +48006,8 @@ +@@ -106653,6 +48104,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; @@ -109926,7 +110129,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -106510,20 +48015,19 @@ +@@ -106660,20 +48113,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -109951,7 +110154,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -106531,11 +48035,10 @@ +@@ -106681,11 +48133,10 @@ ac_cs_silent=: ;; # This is an error. @@ -109966,7 +110169,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ac_need_defaults=false ;; esac -@@ -106628,9 +48131,7 @@ +@@ -106778,9 +48229,7 @@ "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;; "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;; @@ -109977,7 +110180,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure esac done -@@ -106657,7 +48158,7 @@ +@@ -106807,7 +48256,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -109986,7 +110189,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure } # Create a (secure) tmp directory for tmp files. -@@ -106668,11 +48169,7 @@ +@@ -106818,11 +48267,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -109999,7 +110202,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -106680,10 +48177,16 @@ +@@ -106830,10 +48275,16 @@ if test -n "$CONFIG_FILES"; then @@ -110018,7 +110221,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else ac_cs_awk_cr=$ac_cr fi -@@ -106697,24 +48200,18 @@ +@@ -106847,24 +48298,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -110046,7 +110249,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -106736,7 +48233,7 @@ +@@ -106886,7 +48331,7 @@ t delim :nl h @@ -110055,7 +110258,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -106750,7 +48247,7 @@ +@@ -106900,7 +48345,7 @@ t nl :delim h @@ -110064,7 +110267,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p -@@ -106803,9 +48300,7 @@ +@@ -106953,9 +48398,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -110075,7 +110278,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -106846,9 +48341,7 @@ +@@ -106996,9 +48439,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -110086,7 +110289,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -106933,9 +48426,7 @@ +@@ -107083,9 +48524,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -110097,7 +110300,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure fi # test -n "$CONFIG_HEADERS" -@@ -106948,9 +48439,7 @@ +@@ -107098,9 +48537,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -110108,7 +110311,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -106978,12 +48467,10 @@ +@@ -107128,12 +48565,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -110123,7 +110326,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -106994,7 +48481,7 @@ +@@ -107144,7 +48579,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -110132,7 +110335,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -107007,9 +48494,7 @@ +@@ -107157,9 +48592,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -110143,7 +110346,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure esac ;; esac -@@ -107037,47 +48522,7 @@ +@@ -107187,47 +48620,7 @@ q } s/.*/./; q'` @@ -110192,7 +110395,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ac_builddir=. case "$ac_dir" in -@@ -107129,7 +48574,6 @@ +@@ -107279,7 +48672,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -110200,7 +110403,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -107139,12 +48583,11 @@ +@@ -107289,12 +48681,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -110215,7 +110418,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -107154,7 +48597,7 @@ +@@ -107304,7 +48695,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -110224,7 +110427,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure esac _ACEOF -@@ -107182,14 +48625,12 @@ +@@ -107332,14 +48723,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -110241,7 +110444,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -107199,9 +48640,7 @@ +@@ -107349,9 +48738,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -110252,7 +110455,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure ;; :H) # -@@ -107212,29 +48651,23 @@ +@@ -107362,29 +48749,23 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -110287,7 +110490,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -107260,15 +48693,12 @@ +@@ -107410,15 +48791,12 @@ done # for ac_tag @@ -110305,7 +110508,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure # configure is writing to config.log, and then calls config.status. -@@ -107289,10 +48719,10 @@ +@@ -107439,10 +48817,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -110318,7 +110521,7 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -@@ -107303,8 +48733,8 @@ +@@ -107453,8 +48831,8 @@ # Print very concise instructions on building/use if test "x$enable_dmalloc" = xyes then @@ -110329,10 +110532,10 @@ diff -Naur samba-3.5.2/source3/configure samba-3.5.2.patch/source3/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: result: \$ eval \\`dmalloc samba\\`." >&5 $as_echo " \$ eval \\`dmalloc samba\\`." >&6; } fi -diff -Naur samba-3.5.2/source3/configure.in samba-3.5.2.patch/source3/configure.in ---- samba-3.5.2/source3/configure.in 2010-04-01 15:26:22.000000000 +0200 -+++ samba-3.5.2.patch/source3/configure.in 2010-04-18 00:12:00.732273152 +0200 -@@ -1191,36 +1191,7 @@ +diff -Naur samba-3.5.3/source3/configure.in samba-3.5.3.patch/source3/configure.in +--- samba-3.5.3/source3/configure.in 2010-05-17 13:51:23.000000000 +0200 ++++ samba-3.5.3.patch/source3/configure.in 2010-06-03 01:00:07.569378093 +0200 +@@ -1190,36 +1190,7 @@ # # # @@ -110370,10 +110573,10 @@ diff -Naur samba-3.5.2/source3/configure.in samba-3.5.2.patch/source3/configure. # # stat64 family may need on some systems, notably ReliantUNIX -diff -Naur samba-3.5.2/source3/include/config.h.in samba-3.5.2.patch/source3/include/config.h.in ---- samba-3.5.2/source3/include/config.h.in 2010-04-06 09:43:13.000000000 +0200 -+++ samba-3.5.2.patch/source3/include/config.h.in 2010-04-18 00:12:16.000000000 +0200 -@@ -2222,19 +2222,21 @@ +diff -Naur samba-3.5.3/source3/include/config.h.in samba-3.5.3.patch/source3/include/config.h.in +--- samba-3.5.3/source3/include/config.h.in 2010-05-17 13:53:10.000000000 +0200 ++++ samba-3.5.3.patch/source3/include/config.h.in 2010-06-03 01:01:15.000000000 +0200 +@@ -2225,19 +2225,21 @@ /* Whether struct ifaddrs is available */ #undef HAVE_STRUCT_IFADDRS @@ -110399,7 +110602,7 @@ diff -Naur samba-3.5.2/source3/include/config.h.in samba-3.5.2.patch/source3/inc #undef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR /* Define to 1 if the system has the type `struct sockaddr'. */ -@@ -2243,37 +2245,37 @@ +@@ -2246,37 +2248,37 @@ /* Define to 1 if the system has the type `struct sockaddr_in6'. */ #undef HAVE_STRUCT_SOCKADDR_IN6 @@ -110447,7 +110650,7 @@ diff -Naur samba-3.5.2/source3/include/config.h.in samba-3.5.2.patch/source3/inc #undef HAVE_STRUCT_STAT_ST_UMTIME /* Whether we have struct timespec */ -@@ -3026,6 +3028,9 @@ +@@ -3029,6 +3031,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME diff --git a/packages/network/samba/url b/packages/network/samba/url index 3de7229e21..9b9171bb71 100644 --- a/packages/network/samba/url +++ b/packages/network/samba/url @@ -1 +1 @@ -http://samba.org/samba/ftp/stable/samba-3.5.2.tar.gz \ No newline at end of file +http://samba.org/samba/ftp/stable/samba-3.5.3.tar.gz \ No newline at end of file