diff --git a/packages/network/samba/patches/010_samba-3.4.5-crosscompile-0.1.diff b/packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff
similarity index 94%
rename from packages/network/samba/patches/010_samba-3.4.5-crosscompile-0.1.diff
rename to packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff
index ce5b76e9f4..b834a54b1a 100644
--- a/packages/network/samba/patches/010_samba-3.4.5-crosscompile-0.1.diff
+++ b/packages/network/samba/patches/010_samba-3.5.2-crosscompile-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
---- samba-3.4.5/source3/configure	2010-01-18 13:04:22.000000000 +0100
-+++ samba-3.4.5.patch/source3/configure	2010-02-18 09:20:13.176598606 +0100
+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
 @@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -810,7 +810,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  ac_unique_file="include/includes.h"
  ac_default_prefix=/usr/local/samba
-@@ -945,6 +902,7 @@
+@@ -957,6 +914,7 @@
  program_transform_name
  prefix
  exec_prefix
@@ -818,7 +818,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  PACKAGE_BUGREPORT
  PACKAGE_STRING
  PACKAGE_VERSION
-@@ -1164,8 +1122,7 @@
+@@ -1183,8 +1141,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -828,7 +828,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1191,8 +1148,7 @@
+@@ -1210,8 +1167,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -838,7 +838,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1396,8 +1352,7 @@
+@@ -1415,8 +1371,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -848,7 +848,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1413,8 +1368,7 @@
+@@ -1432,8 +1387,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -858,7 +858,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1444,17 +1398,17 @@
+@@ -1463,17 +1417,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -882,7 +882,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1471,15 +1425,13 @@
+@@ -1490,15 +1444,13 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -900,7 +900,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
  fi
-@@ -1502,8 +1454,7 @@
+@@ -1521,8 +1473,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -910,7 +910,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1533,11 +1484,9 @@
+@@ -1552,11 +1503,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -924,7 +924,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  # Find the source files, if location was not specified.
-@@ -1576,13 +1525,11 @@
+@@ -1595,13 +1544,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -940,7 +940,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1820,7 +1767,7 @@
+@@ -1848,7 +1795,7 @@
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
    LIBS        libraries to pass to the linker, e.g. -l<library>
@@ -949,7 +949,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
                you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
    PKG_CONFIG  path to pkg-config utility
-@@ -1904,178 +1851,863 @@
+@@ -1935,178 +1882,863 @@
  if $ac_init_version; then
    cat <<\_ACEOF
  Samba configure 3
@@ -1959,7 +1959,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
        *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
        esac
        $as_echo "$ac_var='\''$ac_val'\''"
-@@ -2119,39 +2751,41 @@
+@@ -2150,39 +2782,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -2006,7 +2006,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -2169,8 +2803,8 @@
+@@ -2200,8 +2834,8 @@
  for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
@@ -2017,7 +2017,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -2178,10 +2812,10 @@
+@@ -2209,10 +2843,10 @@
  done
  
  if test -r "$cache_file"; then
@@ -2032,7 +2032,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2189,7 +2823,7 @@
+@@ -2220,7 +2854,7 @@
      esac
    fi
  else
@@ -2041,7 +2041,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -2204,11 +2838,11 @@
+@@ -2235,11 +2869,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -2055,7 +2055,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -2218,17 +2852,17 @@
+@@ -2249,17 +2883,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -2077,7 +2077,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2240,43 +2874,20 @@
+@@ -2271,43 +2905,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -2128,7 +2128,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2290,14 +2901,12 @@
+@@ -2321,14 +2932,12 @@
  ac_config_headers="$ac_config_headers include/config.h"
  
  
@@ -2145,7 +2145,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: \$PATH contains /usr/ucb - build errors may follow" >&2;}
  	;;
  esac
-@@ -2329,24 +2938,16 @@
+@@ -2360,24 +2969,16 @@
  
  ac_aux_dir=
  for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2178,7 +2178,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2358,57 +2959,29 @@
+@@ -2389,57 +2990,29 @@
  ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
  
  
@@ -2199,7 +2199,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -$as_echo "$as_me: error: cannot find libreplace in $libreplacepaths" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
--LIBREPLACEOBJ="replace.o"
+-LIBREPLACEOBJ="$libreplacedir/replace.o"
 -
 -
  # Make sure we can run config.sub.
@@ -2243,7 +2243,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -2424,28 +2997,24 @@
+@@ -2455,28 +3028,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2277,7 +2277,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -2461,28 +3030,24 @@
+@@ -2492,28 +3061,24 @@
  case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
  
  
@@ -2311,7 +2311,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  esac
  target=$ac_cv_target
  ac_save_IFS=$IFS; IFS='-'
-@@ -2505,6 +3070,27 @@
+@@ -2536,6 +3101,27 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  
@@ -2329,7 +2329,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test x"$libreplacedir" = "x"; then
 +	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
 +fi
-+LIBREPLACEOBJ="replace.o"
++LIBREPLACEOBJ="$libreplacedir/replace.o"
 +
 +
 +
@@ -2339,7 +2339,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  echo "LIBREPLACE_LOCATION_CHECKS: END"
  
  
-@@ -2533,7 +3119,7 @@
+@@ -2564,7 +3150,7 @@
  
  
  # Check whether --with-fhs was given.
@@ -2348,7 +2348,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_fhs;  case "$withval" in
    yes)
      lockdir="\${VARDIR}/lib/samba"
-@@ -2550,9 +3136,7 @@
+@@ -2581,9 +3167,7 @@
      cachedir="\${VARDIR}/lib/samba"
      ncalrpcdir="\${VARDIR}/ncalrpc"
  
@@ -2359,7 +2359,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
      ;;
    esac
-@@ -2563,13 +3147,13 @@
+@@ -2594,13 +3178,13 @@
  # set private directory location
  
  # Check whether --with-privatedir was given.
@@ -2375,7 +2375,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-privatedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2583,13 +3167,13 @@
+@@ -2614,13 +3198,13 @@
  # set root sbin directory location
  
  # Check whether --with-rootsbindir was given.
@@ -2391,7 +2391,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-rootsbindir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2603,13 +3187,13 @@
+@@ -2634,13 +3218,13 @@
  # set lock directory location
  
  # Check whether --with-lockdir was given.
@@ -2407,7 +2407,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-lockdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2623,13 +3207,13 @@
+@@ -2654,13 +3238,13 @@
  # set state directory location
  
  # Check whether --with-statedir was given.
@@ -2423,7 +2423,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-statedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2643,13 +3227,13 @@
+@@ -2674,13 +3258,13 @@
  # set cache directory location
  
  # Check whether --with-cachedir was given.
@@ -2439,7 +2439,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-cachedir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2663,13 +3247,13 @@
+@@ -2694,13 +3278,13 @@
  # set pid directory location
  
  # Check whether --with-piddir was given.
@@ -2455,13 +2455,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-piddir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2683,13 +3267,13 @@
+@@ -2714,13 +3298,13 @@
  # set ncalrpc directory location
  
- # Check whether --with-ncalprcdir was given.
--if test "${with_ncalprcdir+set}" = set; then
-+if test "${with_ncalprcdir+set}" = set; then :
-   withval=$with_ncalprcdir;  case "$withval" in
+ # Check whether --with-ncalrpcdir was given.
+-if test "${with_ncalrpcdir+set}" = set; then
++if test "${with_ncalrpcdir+set}" = set; then :
+   withval=$with_ncalrpcdir;  case "$withval" in
    yes|no)
    #
    # Just in case anybody calls it without argument
@@ -2471,7 +2471,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-ncalrpcdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2703,13 +3287,13 @@
+@@ -2734,13 +3318,13 @@
  # set SWAT directory location
  
  # Check whether --with-swatdir was given.
@@ -2487,7 +2487,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-swatdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2723,13 +3307,13 @@
+@@ -2754,13 +3338,13 @@
  # set configuration directory location
  
  # Check whether --with-configdir was given.
@@ -2503,7 +2503,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-configdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2743,13 +3327,13 @@
+@@ -2774,13 +3358,13 @@
  # set log directory location
  
  # Check whether --with-logfilebase was given.
@@ -2519,7 +2519,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-logfilebase called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2764,13 +3348,13 @@
+@@ -2795,13 +3379,13 @@
  # set shared modules (internal lib) directory location
  
  # Check whether --with-modulesdir was given.
@@ -2535,7 +2535,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-modulesdir without argument - will use default" >&2;}
    ;;
    * )
-@@ -2784,13 +3368,13 @@
+@@ -2815,13 +3399,13 @@
  # set PAM modules directory location
  
  # Check whether --with-pammodulesdir was given.
@@ -2551,7 +2551,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-pammodulesdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2804,13 +3388,13 @@
+@@ -2835,13 +3419,13 @@
  # set man directory location
  
  # Check whether --with-mandir was given.
@@ -2567,7 +2567,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-mandir without argument - will use default" >&2;}
    ;;
    * )
-@@ -2824,13 +3408,13 @@
+@@ -2855,13 +3439,13 @@
  # set locale directory location
  
  # Check whether --with-localedir was given.
@@ -2583,7 +2583,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-localedir called without argument - will use default" >&2;}
    ;;
    *)
-@@ -2864,10 +3448,10 @@
+@@ -2875,13 +3459,13 @@
+ # set codepage directory location
+ 
+ # Check whether --with-codepagedir was given.
+-if test "${with_codepagedir+set}" = set; then
++if test "${with_codepagedir+set}" = set; then :
+   withval=$with_codepagedir;  case "$withval" in
+   yes|no)
+   #
+   # Just in case anybody calls it without argument
+   #
+-    { $as_echo "$as_me:$LINENO: WARNING: --with-codepagedir called without argument - will use default" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-codepagedir called without argument - will use default" >&5
+ $as_echo "$as_me: WARNING: --with-codepagedir called without argument - will use default" >&2;}
+   ;;
+   * )
+@@ -2915,10 +3499,10 @@
  
  
  # Check whether --with-selftest-prefix was given.
@@ -2596,7 +2612,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-selftest-prefix called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2884,10 +3468,10 @@
+@@ -2935,10 +3519,10 @@
  
  
  # Check whether --with-selftest-shrdir was given.
@@ -2609,7 +2625,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-selftest-shrdir called without argument - will use default" >&2;}
    ;;
    * )
-@@ -2906,19 +3490,15 @@
+@@ -2957,19 +3541,15 @@
  
  
  # Check whether --with-smbtorture4_path was given.
@@ -2632,7 +2648,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      fi
      smbtorture4_option="-t $withval"
    ;;
-@@ -2933,19 +3513,15 @@
+@@ -2984,19 +3564,15 @@
  
  
  # Check whether --with-selftest_custom_conf was given.
@@ -2655,7 +2671,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      fi
      selftest_custom_conf="-c $withval"
    ;;
-@@ -2958,7 +3534,7 @@
+@@ -3009,7 +3585,7 @@
  ## so that we don't mix -O and -g
  debug=no
  # Check whether --enable-debug was given.
@@ -2664,7 +2680,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_debug; if eval "test x$enable_debug = xyes"; then
  	debug=yes
      fi
-@@ -2968,7 +3544,7 @@
+@@ -3019,7 +3595,7 @@
  
  developer=no
  # Check whether --enable-developer was given.
@@ -2673,7 +2689,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_developer; if eval "test x$enable_developer = xyes"; then
          debug=yes
          developer=yes
-@@ -2978,7 +3554,7 @@
+@@ -3029,7 +3605,7 @@
  
  krb5developer=no
  # Check whether --enable-krb5developer was given.
@@ -2682,7 +2698,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_krb5developer; if eval "test x$enable_krb5developer = xyes"; then
          debug=yes
          developer=yes
-@@ -2989,7 +3565,7 @@
+@@ -3040,7 +3616,7 @@
  
  picky_developer=no
  # Check whether --enable-picky-developer was given.
@@ -2691,7 +2707,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_picky_developer; if eval "test x$enable_picky_developer = xyes"; then
          debug=yes
          developer=yes
-@@ -3000,7 +3576,7 @@
+@@ -3051,7 +3627,7 @@
  
  
  # Check whether --with-cfenc was given.
@@ -2700,7 +2716,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_cfenc;
  # May be in source $withval/CoreFoundation/StringEncodings.subproj.
  # Should have been in framework $withval/CoreFoundation.framework/Headers.
-@@ -3097,9 +3673,9 @@
+@@ -3148,9 +3724,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2712,7 +2728,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3110,24 +3686,24 @@
+@@ -3161,24 +3737,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2742,7 +2758,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3137,9 +3713,9 @@
+@@ -3188,9 +3764,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -2754,7 +2770,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3150,24 +3726,24 @@
+@@ -3201,24 +3777,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2784,7 +2800,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3176,7 +3752,7 @@
+@@ -3227,7 +3803,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2793,7 +2809,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3190,9 +3766,9 @@
+@@ -3241,9 +3817,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2805,7 +2821,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3203,24 +3779,24 @@
+@@ -3254,24 +3830,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2835,7 +2851,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3230,9 +3806,9 @@
+@@ -3281,9 +3857,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -2847,7 +2863,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3244,18 +3820,18 @@
+@@ -3295,18 +3871,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2869,7 +2885,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -3274,10 +3850,10 @@
+@@ -3325,10 +3901,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -2882,7 +2898,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3289,9 +3865,9 @@
+@@ -3340,9 +3916,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2894,7 +2910,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3302,24 +3878,24 @@
+@@ -3353,24 +3929,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2924,7 +2940,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3333,9 +3909,9 @@
+@@ -3384,9 +3960,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
@@ -2936,7 +2952,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3346,24 +3922,24 @@
+@@ -3397,24 +3973,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -2966,7 +2982,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -3376,7 +3952,7 @@
+@@ -3427,7 +4003,7 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -2975,7 +2991,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
-@@ -3387,57 +3963,37 @@
+@@ -3438,57 +4014,37 @@
  fi
  
  
@@ -3053,7 +3069,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3453,8 +4009,8 @@
+@@ -3504,8 +4060,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -3064,7 +3080,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  
  # The possible output files:
-@@ -3470,17 +4026,17 @@
+@@ -3521,17 +4077,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -3087,7 +3103,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3497,7 +4053,7 @@
+@@ -3548,7 +4104,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -3096,7 +3112,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3516,84 +4072,42 @@
+@@ -3567,84 +4123,42 @@
  else
    ac_file=''
  fi
@@ -3202,7 +3218,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3608,32 +4122,83 @@
+@@ -3659,32 +4173,83 @@
    esac
  done
  else
@@ -3302,7 +3318,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3645,17 +4210,17 @@
+@@ -3696,17 +4261,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -3325,7 +3341,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3668,31 +4233,23 @@
+@@ -3719,31 +4284,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -3364,7 +3380,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3706,37 +4263,16 @@
+@@ -3757,37 +4314,16 @@
    return 0;
  }
  _ACEOF
@@ -3405,7 +3421,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3745,20 +4281,16 @@
+@@ -3796,20 +4332,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -3429,7 +3445,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3769,35 +4301,11 @@
+@@ -3820,35 +4352,11 @@
    return 0;
  }
  _ACEOF
@@ -3468,7 +3484,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3808,36 +4316,12 @@
+@@ -3859,36 +4367,12 @@
    return 0;
  }
  _ACEOF
@@ -3509,7 +3525,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -3848,42 +4332,17 @@
+@@ -3899,42 +4383,17 @@
    return 0;
  }
  _ACEOF
@@ -3554,7 +3570,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3900,18 +4359,14 @@
+@@ -3951,18 +4410,14 @@
      CFLAGS=
    fi
  fi
@@ -3576,7 +3592,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3968,32 +4423,9 @@
+@@ -4019,32 +4474,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -3610,7 +3626,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -4004,17 +4436,19 @@
+@@ -4055,17 +4487,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -3633,7 +3649,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4025,18 +4459,14 @@
+@@ -4076,18 +4510,14 @@
  CFLAGS=$savedCFLAGS
  
  if test x"$GCC" != x"yes" ; then
@@ -3655,7 +3671,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdbool.h>
-@@ -4178,32 +4608,9 @@
+@@ -4229,32 +4659,9 @@
  for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
  do
    CC="$ac_save_CC $ac_arg"
@@ -3689,7 +3705,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c99" != "xno" && break
  done
-@@ -4214,26 +4621,28 @@
+@@ -4265,26 +4672,28 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c99" in
    x)
@@ -3723,7 +3739,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "${GCC_VERSION}" >&6; }
  fi
  
-@@ -4242,14 +4651,14 @@
+@@ -4293,14 +4702,14 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3740,7 +3756,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-@@ -4264,11 +4673,7 @@
+@@ -4315,11 +4724,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3753,7 +3769,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4277,78 +4682,34 @@
+@@ -4328,78 +4733,34 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -3837,7 +3853,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    break
  fi
  
-@@ -4360,7 +4721,7 @@
+@@ -4411,7 +4772,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -3846,7 +3862,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
-@@ -4371,11 +4732,7 @@
+@@ -4422,11 +4783,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -3859,7 +3875,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -4384,87 +4741,40 @@
+@@ -4435,87 +4792,40 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -3956,7 +3972,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  
  ac_ext=c
-@@ -4474,9 +4784,9 @@
+@@ -4525,9 +4835,9 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -3968,7 +3984,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -4487,7 +4797,7 @@
+@@ -4538,7 +4848,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -3977,7 +3993,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4507,7 +4817,7 @@
+@@ -4558,7 +4868,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3986,7 +4002,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -4522,26 +4832,24 @@
+@@ -4573,26 +4883,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -4018,7 +4034,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4555,7 +4863,7 @@
+@@ -4606,7 +4914,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -4027,7 +4043,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4575,7 +4883,7 @@
+@@ -4626,7 +4934,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4036,7 +4052,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4590,12 +4898,10 @@
+@@ -4641,12 +4949,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -4051,7 +4067,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4603,21 +4909,17 @@
+@@ -4654,21 +4960,17 @@
  
     fi
  fi
@@ -4077,7 +4093,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -4632,48 +4934,23 @@
+@@ -4683,48 +4985,23 @@
    return 0;
  }
  _ACEOF
@@ -4131,7 +4147,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
    ac_cv_header_stdc=no
  fi
-@@ -4683,18 +4960,14 @@
+@@ -4734,18 +5011,14 @@
  
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4153,7 +4169,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
    ac_cv_header_stdc=no
  fi
-@@ -4704,14 +4977,10 @@
+@@ -4755,14 +5028,10 @@
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4170,7 +4186,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <ctype.h>
  #include <stdlib.h>
-@@ -4738,118 +5007,34 @@
+@@ -4789,118 +5058,34 @@
    return 0;
  }
  _ACEOF
@@ -4302,7 +4318,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4860,139 +5045,8 @@
+@@ -4911,139 +5096,8 @@
  
  
  
@@ -4444,7 +4460,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    MINIX=yes
  else
    MINIX=
-@@ -5001,34 +5055,23 @@
+@@ -5052,34 +5106,23 @@
  
    if test "$MINIX" = yes; then
  
@@ -4485,7 +4501,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #	  define __EXTENSIONS__ 1
-@@ -5041,71 +5084,35 @@
+@@ -5092,71 +5135,35 @@
    return 0;
  }
  _ACEOF
@@ -4568,7 +4584,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifndef __APPLE_CC__
  	       not a universal capable compiler
-@@ -5113,46 +5120,34 @@
+@@ -5164,46 +5171,34 @@
  	     typedef int dummy;
  
  _ACEOF
@@ -4637,7 +4653,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  	     #include <sys/param.h>
-@@ -5170,30 +5165,9 @@
+@@ -5221,30 +5216,9 @@
    return 0;
  }
  _ACEOF
@@ -4670,7 +4686,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  		#include <sys/param.h>
-@@ -5209,49 +5183,18 @@
+@@ -5260,49 +5234,18 @@
    return 0;
  }
  _ACEOF
@@ -4723,7 +4739,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5266,30 +5209,9 @@
+@@ -5317,30 +5260,9 @@
    return 0;
  }
  _ACEOF
@@ -4756,7 +4772,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <limits.h>
  
-@@ -5304,51 +5226,20 @@
+@@ -5355,51 +5277,20 @@
    return 0;
  }
  _ACEOF
@@ -4812,7 +4828,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  short int ascii_mm[] =
  		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -5374,24 +5265,7 @@
+@@ -5425,24 +5316,7 @@
    return 0;
  }
  _ACEOF
@@ -4838,7 +4854,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
  	      ac_cv_c_bigendian=yes
  	    fi
-@@ -5403,20 +5277,10 @@
+@@ -5454,20 +5328,10 @@
  		ac_cv_c_bigendian=unknown
  	      fi
  	    fi
@@ -4860,7 +4876,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  $ac_includes_default
  int
-@@ -5436,81 +5300,43 @@
+@@ -5487,81 +5351,43 @@
    return 0;
  }
  _ACEOF
@@ -4954,7 +4970,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifndef __cplusplus
  typedef int foo_t;
-@@ -5519,41 +5345,17 @@
+@@ -5570,41 +5396,17 @@
  #endif
  
  _ACEOF
@@ -4998,7 +5014,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  case $ac_cv_c_inline in
    inline | yes) ;;
    *)
-@@ -5573,14 +5375,10 @@
+@@ -5624,14 +5426,10 @@
  saved_CFLAGS="$CFLAGS";
  c99_init=no
  if test x"$c99_init" = x"no"; then
@@ -5015,7 +5031,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5593,45 +5391,20 @@
+@@ -5644,45 +5442,20 @@
    return 0;
  }
  _ACEOF
@@ -5066,7 +5082,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5644,45 +5417,20 @@
+@@ -5695,45 +5468,20 @@
    return 0;
  }
  _ACEOF
@@ -5117,7 +5133,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5695,45 +5443,20 @@
+@@ -5746,45 +5494,20 @@
    return 0;
  }
  _ACEOF
@@ -5168,7 +5184,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5746,45 +5469,20 @@
+@@ -5797,45 +5520,20 @@
    return 0;
  }
  _ACEOF
@@ -5219,7 +5235,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -5797,34 +5495,13 @@
+@@ -5848,34 +5546,13 @@
    return 0;
  }
  _ACEOF
@@ -5257,7 +5273,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5843,7 +5520,7 @@
+@@ -5894,7 +5571,7 @@
  else
      CFLAGS="$saved_CFLAGS"
      saved_CFLAGS=""
@@ -5266,7 +5282,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: c99 structure initializer are not supported" >&2;}
  fi
  
-@@ -5862,10 +5539,10 @@
+@@ -5913,10 +5590,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -5279,7 +5295,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -5873,11 +5550,11 @@
+@@ -5924,11 +5601,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5295,7 +5311,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -5914,7 +5591,7 @@
+@@ -5965,7 +5642,7 @@
      ;;
  esac
  
@@ -5304,7 +5320,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -5930,7 +5607,7 @@
+@@ -5981,7 +5658,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -5313,7 +5329,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -5942,17 +5619,13 @@
+@@ -5993,17 +5670,13 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -5334,7 +5350,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -5977,54 +5650,27 @@
+@@ -6028,54 +5701,27 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
@@ -5397,7 +5413,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
-@@ -6032,7 +5678,6 @@
+@@ -6083,7 +5729,6 @@
  
  
  
@@ -5405,7 +5421,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE_EXTENDED
  #define _XOPEN_SOURCE_EXTENDED 1
-@@ -6041,15 +5686,15 @@
+@@ -6092,15 +5737,15 @@
  
  
  # Check whether --enable-largefile was given.
@@ -5424,7 +5440,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    ac_cv_sys_largefile_CC=no
-@@ -6058,11 +5703,7 @@
+@@ -6109,11 +5754,7 @@
         while :; do
  	 # IRIX 6.2 and later do not support large files by default,
  	 # so use the C compiler's -n32 option if that helps.
@@ -5437,7 +5453,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6081,60 +5722,14 @@
+@@ -6132,60 +5773,14 @@
    return 0;
  }
  _ACEOF
@@ -5500,7 +5516,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  rm -f core conftest.err conftest.$ac_objext
  	 break
         done
-@@ -6142,23 +5737,19 @@
+@@ -6193,23 +5788,19 @@
         rm -f conftest.$ac_ext
      fi
  fi
@@ -5528,7 +5544,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6177,38 +5768,11 @@
+@@ -6228,38 +5819,11 @@
    return 0;
  }
  _ACEOF
@@ -5569,7 +5585,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #define _FILE_OFFSET_BITS 64
  #include <sys/types.h>
-@@ -6228,38 +5792,15 @@
+@@ -6279,38 +5843,15 @@
    return 0;
  }
  _ACEOF
@@ -5610,7 +5626,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
  case $ac_cv_sys_file_offset_bits in #(
    no | unknown) ;;
-@@ -6271,17 +5812,13 @@
+@@ -6322,17 +5863,13 @@
  esac
  rm -rf conftest*
    if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -5631,7 +5647,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
   /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -6300,38 +5837,11 @@
+@@ -6351,38 +5888,11 @@
    return 0;
  }
  _ACEOF
@@ -5672,7 +5688,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #define _LARGE_FILES 1
  #include <sys/types.h>
-@@ -6351,38 +5861,15 @@
+@@ -6402,38 +5912,15 @@
    return 0;
  }
  _ACEOF
@@ -5713,7 +5729,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_sys_large_files" >&6; }
  case $ac_cv_sys_large_files in #(
    no | unknown) ;;
-@@ -6406,31 +5893,25 @@
+@@ -6457,31 +5944,25 @@
  	*hpux*)
  		# mmap on HPUX is completely broken...
  
@@ -5750,7 +5766,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		if test "${GCC}" != "yes"; then
  			## for funky AIX compiler using strncpy()
-@@ -6442,7 +5923,6 @@
+@@ -6493,7 +5974,6 @@
  
  
  
@@ -5758,7 +5774,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
   cat >>confdefs.h <<\EOF
  #ifndef _XOPEN_SOURCE
  #define _XOPEN_SOURCE 600
-@@ -6452,7 +5932,6 @@
+@@ -6503,7 +5983,6 @@
  
  
  
@@ -5766,7 +5782,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
   cat >>confdefs.h <<\EOF
  #ifndef _OSF_SOURCE
  #define _OSF_SOURCE 1
-@@ -6469,9 +5948,7 @@
+@@ -6520,9 +5999,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=200112L"
  
@@ -5777,7 +5793,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  				;;
  		esac
-@@ -6480,9 +5957,7 @@
+@@ -6531,9 +6008,7 @@
  			*)
  				CFLAGS="$CFLAGS -D_SYSV"
  
@@ -5788,7 +5804,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  				;;
  		esac
-@@ -6491,978 +5966,385 @@
+@@ -6542,978 +6017,385 @@
  
  
  
@@ -7022,7 +7038,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  
-@@ -7470,717 +6352,429 @@
+@@ -7521,30401 +6403,2005 @@
  # 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.
@@ -7187,7 +7203,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -7211,8 +7230,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 +
++
++
++ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
++if test "x$ac_cv_type_intptr_t" = x""yes; then :
++
 +cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t
++#define HAVE_INTPTR_T 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -7228,14 +7252,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  return 0;
 -}
 +
-+
-+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-+if test "x$ac_cv_type_intptr_t" = x""yes; then :
-+
-+else
++fi
++ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
++if test "x$ac_cv_type_uintptr_t" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
-+#define intptr_t long long
++#define HAVE_UINTPTR_T 1
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -7256,13 +7278,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
-+
-+fi
-+
-+ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
-+if test "x$ac_cv_type_uintptr_t" = x""yes; then :
-+
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7272,26 +7288,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
-+cat >>confdefs.h <<_ACEOF
-+#define uintptr_t unsigned long long
-+_ACEOF
 +
  fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
 +ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
 +if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 +
- else
++cat >>confdefs.h <<_ACEOF
++#define HAVE_PTRDIFF_T 1
++_ACEOF
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_lo= ac_hi=
-+cat >>confdefs.h <<_ACEOF
-+#define ptrdiff_t unsigned long long
-+_ACEOF
-+
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -7375,16 +7387,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  libreplace_cv_immediate_structures=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
-+$as_echo "$libreplace_cv_immediate_structures" >&6; }
-+if test x"$libreplace_cv_immediate_structures" = x"yes"; then
-+
-+$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_immediate_structures" >&5
++$as_echo "$libreplace_cv_immediate_structures" >&6; }
++if test x"$libreplace_cv_immediate_structures" = x"yes"; then
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
@@ -7402,15 +7410,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -     ac_cv_sizeof_short=0
 -   fi ;;
 -esac
-+
-+echo "LIBREPLACE_CC_CHECKS: END"
-+
-+
-+
-+# Check whether --enable-external_libtalloc was given.
-+if test "${enable_external_libtalloc+set}" = set; then :
-+  enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -7425,8 +7425,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
-+   enable_external_libtalloc=auto
-+fi
++$as_echo "#define HAVE_IMMEDIATE_STRUCTURES 1" >>confdefs.h
  
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
@@ -7448,6 +7447,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
++fi
  
 -  ;
 -  return 0;
@@ -7476,41 +7476,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
-+if test "x$enable_external_libtalloc" != xno
-+then
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
  
 -( exit $ac_status )
 -if test "$ac_cv_type_short" = yes; then
@@ -7527,28 +7496,41 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+  ;;
-+esac
- fi
+-fi
 -rm -f conftest.val
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++echo "LIBREPLACE_CC_CHECKS: END"
++
++
++
++
++
++
++if test x"$teventdir" = "x"; then
++	teventdir=""
++	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++	for d in $teventpaths; do
++		if test -f "$d/tevent.c"; then
++			teventdir="$d"
++			break;
++		fi
++	done
++	if test x"$teventdir" = "x"; then
++	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++	fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
  
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
+ 
  
--
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
--
--
+ 
+ 
 -# The cast to long int works around a bug in the HP C Compiler
 -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -7556,16 +7538,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: checking size of long" >&5
 -$as_echo_n "checking size of long... " >&6; }
 -if test "${ac_cv_sizeof_long+set}" = set; then
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  if test "$cross_compiling" = yes; then
 -  # Depending upon the size, compute the lo and hi bounds.
 -cat >conftest.$ac_ext <<_ACEOF
@@ -7580,25 +7554,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
 -test_array [0] = 0
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++TEVENT_CFLAGS="-I$teventdir"
  
 -  ;
 -  return 0;
@@ -7609,8 +7565,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+  ;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -7637,34 +7592,27 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
 -test_array [0] = 0
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
  
 -  ;
 -  return 0;
 -}
--_ACEOF
++for ac_header in sys/epoll.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 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;;
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -7678,13 +7626,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid; break
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
  
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
@@ -7693,29 +7637,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
-+if test -n "$PKG_CONFIG"; then
-+	_pkg_min_version=0.9.0
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	else
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+		PKG_CONFIG=""
-+	fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
++done
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++for ac_func in epoll_create
++do :
++  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
++if test "x$ac_cv_func_epoll_create" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_EPOLL_CREATE 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -7725,9 +7663,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
 -test_array [0] = 0
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
-+$as_echo_n "checking for TALLOC... " >&6; }
  
 -  ;
 -  return 0;
@@ -7742,14 +7677,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TALLOC_CFLAGS"; then
-+        pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -7772,7 +7700,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
 -test_array [0] = 0
--
++fi
++done
+ 
 -  ;
 -  return 0;
 -}
@@ -7786,24 +7716,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+    fi
-+else
-+	pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TALLOC_LIBS"; then
-+        pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -7813,31 +7726,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_lo=$ac_mid; break
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++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"
++
++$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
+ 
 -	ac_hi=`expr '(' $ac_mid ')' - 1`
 -			if test $ac_mid -le $ac_hi; then
 -			  ac_lo= ac_hi=
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid`
-+  pkg_failed=yes
  fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
-+    fi
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++if test x"$VERSIONSCRIPT" != "x"; then
++    EXPORTSFILE=tevent.exports
+ 
 -	ac_lo= ac_hi=
-+	pkg_failed=untried
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -7883,60 +7796,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+        else
-+	        TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$TALLOC_PKG_ERRORS" >&5
++LIBTEVENT_OBJ0=""
++for obj in ${TEVENT_OBJ}; do
++	LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
++done
 +
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+                 if test "x$enable_external_libtalloc" = xyes; then
-+		 	as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+	      else
-+			enable_external_libtalloc=no
-+		  fi
-+
-+elif test $pkg_failed = untried; then
-+	 if test "x$enable_external_libtalloc" = xyes; then
-+		 	as_fn_error "Unable to find libtalloc" "$LINENO" 5
-+	      else
-+			enable_external_libtalloc=no
-+		  fi
++LIBS="${LIBS} ${TEVENT_LIBS}"
  
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
-+else
-+	TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
-+	TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	 enable_external_libtalloc=yes
-+fi
++SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
++SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
++
++SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
++
++## cleanup the $(srcdir) in the Makefile if we are outside of the tree
++if test "x${srcdir-.}" != "x."; then
++	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
  fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "x$enable_external_libtalloc" != xyes
-+then
-+	tallocdir=""
-+tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
-+for d in $tallocpaths; do
-+	if test -f "$srcdir/$d/talloc.c"; then
-+		tallocdir="$d"
-+
-+		break;
-+	fi
- done
+-done
 -case $ac_lo in
 -?*) ac_cv_sizeof_long=$ac_lo;;
 -'') if test "$ac_cv_type_long" = yes; then
@@ -7966,10 +7852,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
-+if test x"$tallocdir" = "x"; then
-+   as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
-+fi
-+TALLOC_OBJ="talloc.o"
  
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
@@ -8019,77 +7901,48 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_long=`cat conftest.val`
-+TALLOC_CFLAGS="-I$srcdir/$tallocdir"
-+
-+
-+TALLOC_LIBS=""
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
-+if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
  
 -( exit $ac_status )
 -if test "$ac_cv_type_long" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+else
-+  if test "$ac_cv_type_size_t" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 -{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
 -See \`config.log' for more details." >&5
 -$as_echo "$as_me: error: cannot compute sizeof (long)
 -See \`config.log' for more details." >&2;}
 -   { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-    else
+-   else
 -     ac_cv_sizeof_long=0
-+     ac_cv_sizeof_size_t=0
-    fi
- fi
+-   fi
+-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
-+
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -$as_echo "$ac_cv_sizeof_long" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
  
  
  
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG $ac_cv_sizeof_long
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
- _ACEOF
+-_ACEOF
  
  
-@@ -8188,29172 +6782,661 @@
- # 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.
+-# The cast to long int works around a bug in the HP C Compiler
+-# 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.
 -{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
 -$as_echo_n "checking size of long long... " >&6; }
 -if test "${ac_cv_sizeof_long_long+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
-+$as_echo_n "checking size of void *... " >&6; }
-+if test "${ac_cv_sizeof_void_p+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  if test "$cross_compiling" = yes; then
 -  # Depending upon the size, compute the lo and hi bounds.
 -cat >conftest.$ac_ext <<_ACEOF
@@ -8104,7 +7957,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -8141,7 +7994,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
  
 -  ;
 -  return 0;
@@ -8166,19 +8018,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_hi=$ac_mid; break
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test "$ac_cv_type_void_p" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void *)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_void_p=0
-+   fi
-+fi
  
 -	ac_lo=`expr $ac_mid + 1`
 -			if test $ac_lo -le $ac_mid; then
@@ -8186,9 +8028,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -			  break
 -			fi
 -			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  done
@@ -8235,9 +8075,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  while :; do
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -8288,13 +8126,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo= ac_hi=
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -8311,7 +8149,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
 -test_array [0] = 0
--
+ 
 -  ;
 -  return 0;
 -}
@@ -8338,10 +8176,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -8373,7 +8211,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
--
+ 
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -8394,7 +8232,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
--
+ 
 -  ;
 -  return 0;
 -}
@@ -8426,7 +8264,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -( exit $ac_status )
 -if test "$ac_cv_type_long_long" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -8447,15 +8285,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 -$as_echo "$ac_cv_sizeof_long_long" >&6; }
--
--
--
+ 
+ 
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 -_ACEOF
--
--
--
+ 
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for uint_t" >&5
 -$as_echo_n "checking for uint_t... " >&6; }
 -if test "${ac_cv_type_uint_t+set}" = set; then
@@ -8534,18 +8372,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_type_uint_t=yes
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint_t" >&5
@@ -8553,13 +8391,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_uint_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define uint_t unsigned int
 -_ACEOF
--
+ 
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for int8_t" >&5
 -$as_echo_n "checking for int8_t... " >&6; }
 -if test "${ac_cv_type_int8_t+set}" = set; then
@@ -8638,18 +8476,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_type_int8_t=yes
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
@@ -8657,13 +8495,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_int8_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define int8_t char
 -_ACEOF
--
+ 
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for uint8_t" >&5
 -$as_echo_n "checking for uint8_t... " >&6; }
 -if test "${ac_cv_type_uint8_t+set}" = set; then
@@ -8742,18 +8580,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_type_uint8_t=yes
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
@@ -8761,13 +8599,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_uint8_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define uint8_t unsigned char
 -_ACEOF
--
+ 
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for int16_t" >&5
 -$as_echo_n "checking for int16_t... " >&6; }
 -if test "${ac_cv_type_int16_t+set}" = set; then
@@ -8846,32 +8684,53 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	ac_cv_type_int16_t=yes
--fi
--
++
++# compile with optimization and without debugging by default, but
++# allow people to set their own preference.
++# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
++# if it has no value.  This prevent *very* large debug binaries from occurring
++# by default.
++if test "x$debug" = "xyes" ; then
++	CFLAGS="${CFLAGS} -g"
++fi
++if test "x$CFLAGS" = x; then
++  CFLAGS="-O"
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
++# Check whether --enable-socket-wrapper was given.
++if test "${enable_socket_wrapper+set}" = set; then :
++  enableval=$enable_socket_wrapper;
++fi
+ 
+ 
 -fi
--
++DEFAULT_TEST_OPTIONS=
++HAVE_SOCKET_WRAPPER=no
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++if eval "test x$developer = xyes"; then
++	enable_socket_wrapper=yes
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
 -$as_echo "$ac_cv_type_int16_t" >&6; }
 -if test "x$ac_cv_type_int16_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define int16_t short
 -_ACEOF
--
++if eval "test x$enable_socket_wrapper = xyes"; then
+ 
 -fi
--
++$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
+ 
 -{ $as_echo "$as_me:$LINENO: checking for uint16_t" >&5
 -$as_echo_n "checking for uint16_t... " >&6; }
 -if test "${ac_cv_type_uint16_t+set}" = set; then
@@ -8950,33 +8809,46 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++	DEFAULT_TEST_OPTIONS=--socket-wrapper
++	HAVE_SOCKET_WRAPPER=yes
+ 
 -	ac_cv_type_uint16_t=yes
--fi
--
++	# this is only used for samba3
++	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++# Check whether --enable-nss-wrapper was given.
++if test "${enable_nss_wrapper+set}" = set; then :
++  enableval=$enable_nss_wrapper;
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
 -$as_echo "$ac_cv_type_uint16_t" >&6; }
 -if test "x$ac_cv_type_uint16_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define uint16_t unsigned short
 -_ACEOF
--
--fi
--
--
+ 
++HAVE_NSS_WRAPPER=no
++
++if eval "test x$developer = xyes"; then
++	enable_nss_wrapper=yes
+ fi
+ 
++if eval "test x$enable_nss_wrapper = xyes"; then
+ 
 -if test $ac_cv_sizeof_int -eq 4 ; then
 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
 -$as_echo_n "checking for int32_t... " >&6; }
@@ -9056,18 +8928,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
+ 
 -	ac_cv_type_int32_t=yes
--fi
--
++	HAVE_NSS_WRAPPER=yes
++
++	# this is only used for samba3
++	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
@@ -9075,13 +8952,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_int32_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define int32_t int
 -_ACEOF
--
+ 
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
 -$as_echo_n "checking for uint32_t... " >&6; }
 -if test "${ac_cv_type_uint32_t+set}" = set; then
@@ -9160,18 +9037,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
++SWAT_INSTALL_TARGETS=installswat
++
++# Check whether --enable-swat was given.
++if test "${enable_swat+set}" = set; then :
++  enableval=$enable_swat;
++    case "$enable_swat" in
++	no)
++	    SWAT_SBIN_TARGETS=''
++	    SWAT_INSTALL_TARGETS=''
++	    ;;
++    esac
+ 
 -	ac_cv_type_uint32_t=yes
--fi
--
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
@@ -9179,19 +9068,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_uint32_t" = x""yes; then
 -  :
 -else
--
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define uint32_t unsigned int
 -_ACEOF
--
+ 
 -fi
--
+ 
 -elif test $ac_cv_size_long -eq 4 ; then
 -{ $as_echo "$as_me:$LINENO: checking for int32_t" >&5
 -$as_echo_n "checking for int32_t... " >&6; }
 -if test "${ac_cv_type_int32_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++# Probe the gcc version for extra CFLAGS. We always stash these in
++# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
++# Makefile edit, avoiding the need to re-run configure.
++if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
++    	DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
++	# Add -Wdeclaration-after-statement if compiler supports it
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
++$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
++if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_int32_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -9232,7 +9130,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Wdeclaration-after-statement";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -9242,7 +9155,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -9262,21 +9180,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Wdeclaration_after_statement=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_int32_t=yes
--fi
--
++  samba_cv_HAVE_Wdeclaration_after_statement=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
+ 
+ 
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
++$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
@@ -9284,25 +9219,46 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_int32_t" = x""yes; then
 -  :
 -else
--
++	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
++	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
++	fi
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define int32_t long
 -_ACEOF
--
++	#-Werror-implicit-function-declaration
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
++$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
++if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
+ 
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
 -$as_echo_n "checking for uint32_t... " >&6; }
 -if test "${ac_cv_type_uint32_t+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Werror_implicit_function_declaration=cross
+ else
 -  ac_cv_type_uint32_t=no
 -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.  */
 -$ac_includes_default
 -int
 -main ()
@@ -9312,7 +9268,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
++
++	    int main(void)
++	    {
++	    	return 0;
++	    }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -10992,15 +10953,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
 -$as_echo "$ac_cv_type_intptr_t" >&6; }
 -if test "x$ac_cv_type_intptr_t" = x""yes; then
--  :
--else
 -
 -cat >>confdefs.h <<_ACEOF
--#define intptr_t long long
+-#define HAVE_INTPTR_T 1
 -_ACEOF
 -
--fi
 -
+-fi
 -{ $as_echo "$as_me:$LINENO: checking for uintptr_t" >&5
 -$as_echo_n "checking for uintptr_t... " >&6; }
 -if test "${ac_cv_type_uintptr_t+set}" = set; then
@@ -11096,15 +11055,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
 -$as_echo "$ac_cv_type_uintptr_t" >&6; }
 -if test "x$ac_cv_type_uintptr_t" = x""yes; then
--  :
--else
 -
 -cat >>confdefs.h <<_ACEOF
--#define uintptr_t unsigned long long
+-#define HAVE_UINTPTR_T 1
 -_ACEOF
 -
--fi
 -
+-fi
 -{ $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
 -$as_echo_n "checking for ptrdiff_t... " >&6; }
 -if test "${ac_cv_type_ptrdiff_t+set}" = set; then
@@ -11200,13 +11157,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
 -$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
 -if test "x$ac_cv_type_ptrdiff_t" = x""yes; then
--  :
--else
 -
 -cat >>confdefs.h <<_ACEOF
--#define ptrdiff_t unsigned long long
+-#define HAVE_PTRDIFF_T 1
 -_ACEOF
 -
+-
 -fi
 -
 -
@@ -11302,979 +11258,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--# Check whether --enable-external_libtalloc was given.
--if test "${enable_external_libtalloc+set}" = set; then
--  enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
--else
--   enable_external_libtalloc=auto
--fi
--
--
--if test "x$enable_external_libtalloc" != xno
--then
--
--
--if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--	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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  case $PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--$as_echo "$PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_path_PKG_CONFIG"; then
--  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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  case $ac_pt_PKG_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
--if test -n "$ac_pt_PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
--$as_echo "$ac_pt_PKG_CONFIG" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  if test "x$ac_pt_PKG_CONFIG" = x; then
--    PKG_CONFIG=""
--  else
--    case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
--    PKG_CONFIG=$ac_pt_PKG_CONFIG
--  fi
--else
--  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
--fi
--
--fi
--if test -n "$PKG_CONFIG"; then
--	_pkg_min_version=0.9.0
--	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
--$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
--	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--		PKG_CONFIG=""
--	fi
--
--fi
--
--pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for TALLOC" >&5
--$as_echo_n "checking for TALLOC... " >&6; }
--
--if test -n "$PKG_CONFIG"; then
--    if test -n "$TALLOC_CFLAGS"; then
--        pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 1.3.0" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
--    if test -n "$TALLOC_LIBS"; then
--        pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
--    else
--        if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "talloc >= 1.3.0") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 1.3.0" 2>/dev/null`
--else
--  pkg_failed=yes
--fi
--    fi
--else
--	pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
--        _pkg_short_errors_supported=yes
--else
--        _pkg_short_errors_supported=no
--fi
--        if test $_pkg_short_errors_supported = yes; then
--	        TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc >= 1.3.0"`
--        else
--	        TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc >= 1.3.0"`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$TALLOC_PKG_ERRORS" >&5
--
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--                 if test "x$enable_external_libtalloc" = xyes; then
--		 	{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
--$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
--   { (exit 1); exit 1; }; }
--	      else
--			enable_external_libtalloc=no
--		  fi
--
--elif test $pkg_failed = untried; then
--	 if test "x$enable_external_libtalloc" = xyes; then
--		 	{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
--$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
--   { (exit 1); exit 1; }; }
--	      else
--			enable_external_libtalloc=no
--		  fi
--
--else
--	TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
--	TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--	 enable_external_libtalloc=yes
--fi
--fi
--
--if test "x$enable_external_libtalloc" != xyes
--then
--	tallocdir=""
--tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
--for d in $tallocpaths; do
--	if test -f "$srcdir/$d/talloc.c"; then
--		tallocdir="$d"
--
--		break;
--	fi
--done
--if test x"$tallocdir" = "x"; then
--   { { $as_echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
--$as_echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--TALLOC_OBJ="talloc.o"
--
--
--TALLOC_CFLAGS="-I$srcdir/$tallocdir"
--
--
--TALLOC_LIBS=""
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# 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.
--{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
--$as_echo_n "checking size of size_t... " >&6; }
--if test "${ac_cv_sizeof_size_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_lo=0 ac_mid=0
--  while :; do
--    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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=$ac_mid; break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo=`expr $ac_mid + 1`
--			if test $ac_lo -le $ac_mid; then
--			  ac_lo= ac_hi=
--			  break
--			fi
--			ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=-1 ac_mid=-1
--  while :; do
--    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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_lo=$ac_mid; break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_hi=`expr '(' $ac_mid ')' - 1`
--			if test $ac_mid -le $ac_hi; then
--			  ac_lo= ac_hi=
--			  break
--			fi
--			ac_mid=`expr 2 '*' $ac_mid`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo= ac_hi=
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
--  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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=$ac_mid
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_size_t=$ac_lo;;
--'') if test "$ac_cv_type_size_t" = yes; then
--     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
--   else
--     ac_cv_sizeof_size_t=0
--   fi ;;
--esac
--else
--  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
--static long int longval () { return (long int) (sizeof (size_t)); }
--static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    return 1;
--  if (((long int) (sizeof (size_t))) < 0)
--    {
--      long int i = longval ();
--      if (i != ((long int) (sizeof (size_t))))
--	return 1;
--      fprintf (f, "%ld", i);
--    }
--  else
--    {
--      unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (size_t))))
--	return 1;
--      fprintf (f, "%lu", i);
--    }
--  /* Do not output a trailing newline, as this causes \r\n confusion
--     on some platforms.  */
--  return ferror (f) || fclose (f) != 0;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_sizeof_size_t=`cat conftest.val`
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$ac_cv_type_size_t" = yes; then
--     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (size_t)
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
--   else
--     ac_cv_sizeof_size_t=0
--   fi
--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
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--$as_echo "$ac_cv_sizeof_size_t" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
--_ACEOF
--
--
--# The cast to long int works around a bug in the HP C Compiler
--# 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.
--{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
--$as_echo_n "checking size of void *... " >&6; }
--if test "${ac_cv_sizeof_void_p+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_lo=0 ac_mid=0
--  while :; do
--    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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=$ac_mid; break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo=`expr $ac_mid + 1`
--			if test $ac_lo -le $ac_mid; then
--			  ac_lo= ac_hi=
--			  break
--			fi
--			ac_mid=`expr 2 '*' $ac_mid + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=-1 ac_mid=-1
--  while :; do
--    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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_lo=$ac_mid; break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_hi=`expr '(' $ac_mid ')' - 1`
--			if test $ac_mid -le $ac_hi; then
--			  ac_lo= ac_hi=
--			  break
--			fi
--			ac_mid=`expr 2 '*' $ac_mid`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  done
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo= ac_hi=
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--# Binary search between lo and hi bounds.
--while test "x$ac_lo" != "x$ac_hi"; do
--  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
--  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
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_hi=$ac_mid
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_lo=`expr '(' $ac_mid ')' + 1`
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--case $ac_lo in
--?*) ac_cv_sizeof_void_p=$ac_lo;;
--'') if test "$ac_cv_type_void_p" = yes; then
--     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
--   else
--     ac_cv_sizeof_void_p=0
--   fi ;;
--esac
--else
--  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
--static long int longval () { return (long int) (sizeof (void *)); }
--static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
--#include <stdio.h>
--#include <stdlib.h>
--int
--main ()
--{
--
--  FILE *f = fopen ("conftest.val", "w");
--  if (! f)
--    return 1;
--  if (((long int) (sizeof (void *))) < 0)
--    {
--      long int i = longval ();
--      if (i != ((long int) (sizeof (void *))))
--	return 1;
--      fprintf (f, "%ld", i);
--    }
--  else
--    {
--      unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (void *))))
--	return 1;
--      fprintf (f, "%lu", i);
--    }
--  /* Do not output a trailing newline, as this causes \r\n confusion
--     on some platforms.  */
--  return ferror (f) || fclose (f) != 0;
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_sizeof_void_p=`cat conftest.val`
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$ac_cv_type_void_p" = yes; then
--     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute sizeof (void *)
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
--   else
--     ac_cv_sizeof_void_p=0
--   fi
--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
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
--$as_echo "$ac_cv_sizeof_void_p" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
--_ACEOF
--
--
--
--if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
--	{ $as_echo "$as_me:$LINENO: WARNING: size_t cannot represent the amount of used memory of a process" >&5
--$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
--	{ $as_echo "$as_me:$LINENO: WARNING: please report this to <samba-technical@samba.org>" >&5
--$as_echo "$as_me: WARNING: please report this to <samba-technical@samba.org>" >&2;}
--	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
--$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
--	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
--$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
--	{ { $as_echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
--$as_echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
--fi
--
 -
 -
 -
@@ -12583,27 +11566,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -LIBS="${LIBS} ${TEVENT_LIBS}"
 -
--# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
--# but currently this fails: things have to get merged from s4.
--tdbdir="../lib/tdb"
--
--TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
--
--
--LIBTDB_OBJ0=""
--for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
--	     common/traverse.o common/freelist.o common/freelistcheck.o \
--		 common/io.o common/lock.o common/open.o;
--do
--	LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
--done
--
--
 -SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
--SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
--SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
 -SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
@@ -12671,6 +11636,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
+-
+-
 -# compile with optimization and without debugging by default, but
 -# allow people to set their own preference.
 -# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
@@ -12778,7 +11745,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -	old_CFLAGS="$CFLAGS";
--	CFLAGS="-Wdeclaration-after-statement";
+-	CFLAGS="$CFLAGS -Wdeclaration-after-statement";
 -	export CFLAGS;
 -	old_CPPFLAGS="$CPPFLAGS";
 -	CPPFLAGS="$CPPFLAGS";
@@ -12865,7 +11832,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -	old_CFLAGS="$CFLAGS";
--	CFLAGS="-Werror-implicit-function-declaration";
+-	CFLAGS="$CFLAGS -Werror-implicit-function-declaration";
 -	export CFLAGS;
 -	old_CPPFLAGS="$CPPFLAGS";
 -	CPPFLAGS="$CPPFLAGS";
@@ -12953,27 +11920,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       fi
 -fi
 -
--# Check whether --enable-dmalloc was given.
--if test "${enable_dmalloc+set}" = set; then
--  enableval=$enable_dmalloc;
--fi
--
--
--if test "x$enable_dmalloc" = xyes
--then
--
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_DMALLOC 1
--_ACEOF
--
--
--cat >>confdefs.h <<\_ACEOF
--#define DMALLOC_FUNC_CHECK 1
--_ACEOF
--
--	LIBS="$LIBS -ldmalloc"
--fi
--
 -#################################################
 -# check for a shared memory profiling support
 -{ $as_echo "$as_me:$LINENO: checking whether to use profiling" >&5
@@ -13611,7 +12557,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -	old_CFLAGS="$CFLAGS";
--	CFLAGS="-Werror";
+-	CFLAGS="$CFLAGS -Werror";
 -	export CFLAGS;
 -	old_CPPFLAGS="$CPPFLAGS";
 -	CPPFLAGS="$CPPFLAGS";
@@ -13694,7 +12640,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -	old_CFLAGS="$CFLAGS";
--	CFLAGS="-w2";
+-	CFLAGS="$CFLAGS -w2";
 -	export CFLAGS;
 -	old_CPPFLAGS="$CPPFLAGS";
 -	CPPFLAGS="$CPPFLAGS";
@@ -13777,7 +12723,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -	old_CFLAGS="$CFLAGS";
--	CFLAGS="-errwarn=%all";
+-	CFLAGS="$CFLAGS -errwarn=%all";
 -	export CFLAGS;
 -	old_CPPFLAGS="$CPPFLAGS";
 -	CPPFLAGS="$CPPFLAGS";
@@ -14269,13 +13215,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -DYNEXP=
 -
+-LDSHFLAGS_Z_DEFS=
+-
+-LDSHFLAGS_Z_NODEFS=
+-
 -
 -default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
 -
--default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
+-default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
 -
 -if test "x$developer" = xyes; then
--   default_static_modules="$default_static_modules rpc_rpcecho"
+-   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
 -   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
 -fi
 -
@@ -14746,6 +13696,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -      { $as_echo "$as_me:$LINENO: result: $GLIBC_LFS_SUPPORT" >&5
 -$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
 -    ;;
+-    *qnx*)
+-        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _LARGEFILE64_SOURCE 1
+-_ACEOF
+-
+-        ;;
 -
 -esac
 -
@@ -14770,10 +13728,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -   { (exit 1); exit 1; }; }
 -fi
 -
--LIBREPLACEOBJ="replace.o"
+-LIBREPLACEOBJ="$libreplacedir/replace.o"
 -
 -
--LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
+-LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
 -
 -{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
 -$as_echo_n "checking return type of signal handlers... " >&6; }
@@ -17564,6 +16522,157 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -done
 -
 -
+-for ac_header in unix.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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
 -
 -
 -
@@ -17783,7 +16892,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--for ac_func in waitpid strlcpy strlcat initgroups memmove strdup
+-
+-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`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -22336,10 +21446,112 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
+-for ac_func in getgrouplist
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
+-_ACEOF
+-
+-fi
+-done
+-
+-
 -# locale
 -
 -
--for ac_header in ctype.h locale.h
+-
+-for ac_header in ctype.h locale.h langinfo.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
@@ -23721,7 +22933,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -if test x"${libreplace_cv_dlfcn}" = x"yes";then
--	LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
+-	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
 -fi
 -
 -LIBDL="$LIBS"
@@ -23917,7 +23129,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_GETPASS 1
 -_ACEOF
 -
--	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+-	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
 -else
 -
 -{ $as_echo "$as_me:$LINENO: checking whether getpass should be replaced" >&5
@@ -23985,7 +23197,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_GETPASS 1
 -_ACEOF
 -
--	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+-	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
 -fi
 -
 -fi
@@ -24056,7 +23268,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_STRPTIME 1
 -_ACEOF
 -
--        LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
+-        LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
 -fi
 -
 -
@@ -24382,7 +23594,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--  LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
+-  LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
 -fi
 -done
 -
@@ -24934,7 +24146,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_READDIR_GETDIRENTRIES 1
 -_ACEOF
 -
--	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
+-	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
 -	libreplace_cv_READDIR_NEEDED=no
 -fi
 -
@@ -25123,7 +24335,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_READDIR_GETDENTS 1
 -_ACEOF
 -
--	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
+-	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
 -	libreplace_cv_READDIR_NEEDED=no
 -fi
 -
@@ -25426,7 +24638,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--   LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
+-   LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
 -fi
 -
 -
@@ -25434,8 +24646,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--
--for ac_func in syslog printf memset memcpy
+-for ac_func in printf memset memcpy
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -25543,6 +24754,111 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -echo "LIBREPLACE_BROKEN_CHECKS: END"
 -
 -
+-for ac_func in syslog
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
+-_ACEOF
+-
+-else
+-  { { $as_echo "$as_me:$LINENO: error: Required function not found" >&5
+-$as_echo "$as_me: error: Required function not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-done
+-
+-
 -echo "LIBREPLACE_NETWORK_CHECKS: START"
 -
 -
@@ -29088,7 +28404,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
+-  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"
 -fi
 -done
 -
@@ -29270,7 +28586,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define REPLACE_INET_NTOA 1
 -_ACEOF
 -
--    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
+-    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
 -fi
 -
 -
@@ -29372,7 +28688,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"
+-  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
 -fi
 -done
 -
@@ -29476,7 +28792,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
+-  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
 -fi
 -done
 -
@@ -29580,7 +28896,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
+-  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
 -fi
 -done
 -
@@ -29682,7 +28998,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
+-	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
 -fi
 -
 -
@@ -30112,7 +29428,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -
 -else
--	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
+-	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
 -fi
 -
 -
@@ -30444,10 +29760,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
 -
--LIBREPLACE_OBJS=""
--for obj in ${LIBREPLACEOBJ}; do
--	LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
--done
+-LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
+-
+-
+-LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
+-
 -
 -
 -# add -ldl to the global LIBS
@@ -30770,8 +30087,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--
--for ac_header in limits.h float.h pthread.h libintl.h
+-for ac_header in limits.h float.h libintl.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
@@ -35548,18 +34864,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
-+$as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical@samba.org>" >&5
-+$as_echo "$as_me: WARNING: please report this to <samba-technical@samba.org>" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
-+$as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
-+$as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-+	as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -# Binary search between lo and hi bounds.
 -while test "x$ac_lo" != "x$ac_hi"; do
@@ -35605,8 +34911,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -case $ac_lo in
@@ -35638,7 +34944,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
- 
+-
 -  FILE *f = fopen ("conftest.val", "w");
 -  if (! f)
 -    return 1;
@@ -35659,7 +34965,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  /* Do not output a trailing newline, as this causes \r\n confusion
 -     on some platforms.  */
 -  return ferror (f) || fclose (f) != 0;
- 
+-
 -  ;
 -  return 0;
 -}
@@ -35687,11 +34993,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_sizeof_short=`cat conftest.val`
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Werror_implicit_function_declaration=yes
+ else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -( exit $ac_status )
 -if test "$ac_cv_type_short" = yes; then
 -     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -35704,44 +35012,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -   else
 -     ac_cv_sizeof_short=0
 -   fi
--fi
++  samba_cv_HAVE_Werror_implicit_function_declaration=no
+ 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
-+if test x"$teventdir" = "x"; then
-+	teventdir=""
-+	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
-+	for d in $teventpaths; do
-+		if test -f "$d/tevent.c"; then
-+			teventdir="$d"
-+			break;
-+		fi
-+	done
-+	if test x"$teventdir" = "x"; then
-+	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
-+	fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -$as_echo "$ac_cv_sizeof_short" >&6; }
-+
-+TEVENT_OBJ=""
-+TEVENT_CFLAGS=""
-+TEVENT_LIBS=""
- 
- 
- 
+-
+-
+-
 -cat >>confdefs.h <<_ACEOF
 -#define SIZEOF_SHORT $ac_cv_sizeof_short
 -_ACEOF
- 
-+TEVENT_CFLAGS="-I$teventdir"
- 
-+TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
-+TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
- 
+-
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 -if test "${ac_cv_c_const+set}" = set; then
@@ -35749,17 +35039,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in sys/epoll.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
- 
+-
 -int
 -main ()
 -{
@@ -35787,8 +35071,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  { /* SCO 3.2v4 cc rejects this.  */
 -    char *t;
 -    char const *s = 0 ? (char *) 0 : (char const *) 0;
-+fi
- 
+-
 -    *t++ = 0;
 -    if (s) return 0;
 -  }
@@ -35813,18 +35096,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  }
 -  return !cs[0] && !zero.x;
 -#endif
-+done
  
 -  ;
 -  return 0;
 -}
-+for ac_func in epoll_create
-+do :
-+  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
-+if test "x$ac_cv_func_epoll_create" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EPOLL_CREATE 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -35847,28 +35123,42 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
 -	ac_cv_c_const=no
- fi
-+done
-+
-+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"
-+
-+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 -$as_echo "$ac_cv_c_const" >&6; }
 -if test $ac_cv_c_const = no; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
++$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
++       if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
++	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
++       fi
  
 -cat >>confdefs.h <<\_ACEOF
 -#define const /**/
 -_ACEOF
-+if test x"$VERSIONSCRIPT" != "x"; then
-+    EXPORTSFILE=tevent.exports
++	# krb5developer is like developer, except we don't get
++	# -Wstrict-prototypes.
++       if test x"$krb5_developer" != x"$yes" ; then
++	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
++       fi
  
++       if test x"$picky_developer" = x"yes"; then
++	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
++       fi
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking for inline" >&5
@@ -35889,7 +35179,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -static $ac_kw foo_t static_foo () {return 0; }
 -$ac_kw foo_t foo () {return 0; }
 -#endif
- 
+-
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -35913,47 +35203,36 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++#################################################
++# check for a shared memory profiling support
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
++$as_echo_n "checking whether to use profiling... " >&6; }
  
-+LIBTEVENT_OBJ0=""
-+for obj in ${TEVENT_OBJ}; do
-+	LIBTEVENT_OBJ0="${LIBTEVENT_OBJ0} ${teventdir}/${obj}"
-+done
++# Check whether --with-profiling-data was given.
++if test "${with_profiling_data+set}" = set; then :
++  withval=$with_profiling_data;  case "$withval" in
++  yes)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  
 -fi
-+LIBS="${LIBS} ${TEVENT_LIBS}"
++$as_echo "#define WITH_PROFILE 1" >>confdefs.h
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  test "$ac_cv_c_inline" != no && break
-+# TODO: These should come from m4_include(lib/tdb/libtdb.m4)
-+# but currently this fails: things have to get merged from s4.
-+tdbdir="../lib/tdb"
-+
-+TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include"
-+
-+
-+LIBTDB_OBJ0=""
-+for o in common/tdb.o common/dump.o common/transaction.o common/error.o \
-+	     common/traverse.o common/freelist.o common/freelistcheck.o \
-+		 common/io.o common/lock.o common/open.o;
-+do
-+	LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o"
- done
+-done
++    samba_cv_WITH_PROFILE=yes
++    ;;
++  *)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    samba_cv_WITH_PROFILE=no
++    ;;
++  esac
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  
-+
-+SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
-+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/.."
-+
-+SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
-+
-+## cleanup the $(srcdir) in the Makefile if we are outside of the tree
-+if test "x${srcdir-.}" != "x."; then
-+	SAMBA_CPPFLAGS=`echo ${SAMBA_CPPFLAGS} | sed -e "s;${srcdir};\$\(srcdir\);g"`
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 -$as_echo "$ac_cv_c_inline" >&6; }
@@ -35973,13 +35252,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -    ;;
 -esac
++merged_build_possible=yes
  
  
 - { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 -if test "${ac_cv_c_bigendian+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++for ac_prog in gawk mawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AWK+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_c_bigendian=unknown
 -    # See if we're dealing with a universal compiler.
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -35992,7 +35279,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	       not a universal capable compiler
 -	     #endif
 -	     typedef int dummy;
- 
+-
 -_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -36012,6 +35299,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AWK="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -	# Check for potential -arch flags.  It is not universal unless
 -	# there are some -arch flags.  Note that *ppc* also matches
@@ -36019,12 +35323,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
 -	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
 -	esac
--else
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
  
 -fi
++  test -n "$AWK" && break
++done
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    if test $ac_cv_c_bigendian = unknown; then
@@ -36037,6 +35352,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -	     #include <sys/param.h>
++# Check for GNU make
  
 -int
 -main ()
@@ -36117,12 +35433,49 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++for ac_prog in gmake make
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_MAKE+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
++  case $MAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
- 
--fi
++  ;;
++esac
++fi
++MAKE=$ac_cv_path_MAKE
++if test -n "$MAKE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
++$as_echo "$MAKE" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    fi
@@ -36135,7 +35488,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
- 
+-
 -int
 -main ()
 -{
@@ -36173,6 +35526,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <limits.h>
++  test -n "$MAKE" && break
++done
  
 -int
 -main ()
@@ -36204,20 +35559,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_bigendian=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
++$as_echo_n "checking whether we have GNU make... " >&6; }
++if test "${samba_cv_gnu_make+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_c_bigendian=no
--fi
++if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
++then
++	samba_cv_gnu_make=no
++else
++	samba_cv_gnu_make=yes
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
++$as_echo "$samba_cv_gnu_make" >&6; }
++if test x$samba_cv_gnu_make = xyes; then
++	true
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--fi
+-
+-
++	merged_build_possible=no
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -    fi
@@ -36287,6 +35657,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++# Check for perl
  
  
 -fi
@@ -36340,21 +35711,100 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_bigendian=no
--else
++case "$host_os" in
++	*irix*)
++		# On IRIX, we prefer Freeware or Nekoware Perl, because the
++		# system perl is so ancient.
++		# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  case $PERL in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
++for as_dir in $as_dummy
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -( exit $ac_status )
 -ac_cv_c_bigendian=yes
--fi
++  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
++  ;;
++esac
+ 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
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
 -    fi
--fi
++		;;
++	*)
++		# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PERL+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PERL in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++PERL=$ac_cv_path_PERL
++if test -n "$PERL"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
++$as_echo "$PERL" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 -$as_echo "$ac_cv_c_bigendian" >&6; }
 - case $ac_cv_c_bigendian in #(
@@ -36379,13 +35829,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
 -   { (exit 1); exit 1; }; } ;;
 - esac
++		;;
++esac
++
++if test x"$PERL" = x""; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
++$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
++	merged_build_possible=no
++else
++	if test x"$debug" = x"yes";then
++		PERL="$PERL -W"
++	fi
++	export PERL
++	true
++fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking whether char is unsigned" >&5
 -$as_echo_n "checking whether char is unsigned... " >&6; }
 -if test "${ac_cv_c_char_unsigned+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_AR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -36398,7 +35868,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{
 -static int test_array [1 - 2 * !(((char) -1) < 0)];
 -test_array [0] = 0
- 
+-
 -  ;
 -  return 0;
 -}
@@ -36422,30 +35892,61 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_c_char_unsigned=no
--else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -	ac_cv_c_char_unsigned=yes
--fi
- 
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
 -$as_echo "$ac_cv_c_char_unsigned" >&6; }
 -if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
 -  cat >>confdefs.h <<\_ACEOF
 -#define __CHAR_UNSIGNED__ 1
 -_ACEOF
- 
--fi
+-
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
 -$as_echo_n "checking return type of signal handlers... " >&6; }
 -if test "${ac_cv_type_signal+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -36454,7 +35955,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -#include <sys/types.h>
 -#include <signal.h>
- 
+-
 -int
 -main ()
 -{
@@ -36482,28 +35983,70 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_type_signal=int
--else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -	ac_cv_type_signal=void
--fi
- 
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 -$as_echo "$ac_cv_type_signal" >&6; }
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -cat >>confdefs.h <<_ACEOF
 -#define RETSIGTYPE $ac_cv_type_signal
 -_ACEOF
++  if test "x$ac_ct_AR" = x; then
++    AR=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
++else
++  AR="$ac_cv_prog_AR"
++fi
  
  
 -{ $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
--  $as_echo_n "(cached) " >&6
--else
++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; }
++if test "${ac_cv_prog_gnu_ld+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -36511,95 +36054,130 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <sys/types.h>
- 
+-
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "uid_t" >/dev/null 2>&1; then
 -  ac_cv_type_uid_t=yes
--else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  ac_cv_prog_gnu_ld=yes
+ else
 -  ac_cv_type_uid_t=no
-+
-+
-+
-+
-+# compile with optimization and without debugging by default, but
-+# allow people to set their own preference.
-+# do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-+# if it has no value.  This prevent *very* large debug binaries from occurring
-+# by default.
-+if test "x$debug" = "xyes" ; then
-+	CFLAGS="${CFLAGS} -g"
-+fi
-+if test "x$CFLAGS" = x; then
-+  CFLAGS="-O"
-+fi
-+
-+# Check whether --enable-socket-wrapper was given.
-+if test "${enable_socket_wrapper+set}" = set; then :
-+  enableval=$enable_socket_wrapper;
++  ac_cv_prog_gnu_ld=no
  fi
 -rm -f conftest*
- 
-+
-+DEFAULT_TEST_OPTIONS=
-+HAVE_SOCKET_WRAPPER=no
-+
-+if eval "test x$developer = xyes"; then
-+	enable_socket_wrapper=yes
+-
  fi
 -{ $as_echo "$as_me:$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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
++$as_echo "$ac_cv_prog_gnu_ld" >&6; }
  
 -cat >>confdefs.h <<\_ACEOF
 -#define uid_t int
 -_ACEOF
-+if eval "test x$enable_socket_wrapper = xyes"; then
++
++if test "$ac_cv_prog_gnu_ld" = "yes"; then
++	ac_cv_gnu_ld_version=`$LD -v 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'`
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
++$as_echo "${ac_cv_gnu_ld_date}" >&6; }
++        if test -n "$ac_cv_gnu_ld_date"; then
++ 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
++ 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++ 	fi
++	if test "$ac_cv_gnu_ld_date" -gt 20030101; then
++		ac_cv_gnu_ld_version_script=yes
++	fi
++        else
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
++$as_echo_n "checking GNU ld release version... " >&6; }
++                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
++           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
++           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
++                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
++$as_echo_n "checking GNU ld release version major... " >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
++$as_echo_n "checking GNU ld release version minor... " >&6; }
++           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
++$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
++           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
++             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
++           fi
++           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
++             ac_cv_gnu_ld_version_script=yes
++           fi
++        fi
++fi
  
-+$as_echo "#define SOCKET_WRAPPER 1" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
 -#define gid_t int
 -_ACEOF
-+	DEFAULT_TEST_OPTIONS=--socket-wrapper
-+	HAVE_SOCKET_WRAPPER=yes
  
-+	# this is only used for samba3
-+	SOCKET_WRAPPER_OBJS="../lib/socket_wrapper/socket_wrapper.o"
++if test "x$CC" != xcc; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
  fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for mode_t" >&5
 -$as_echo_n "checking for mode_t... " >&6; }
 -if test "${ac_cv_type_mode_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++set dummy $CC; ac_cc=`$as_echo "$2" |
++		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_mode_t=no
 -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.  */
 -$ac_includes_default
--int
--main ()
--{
++
+ int
+ main ()
+ {
 -if (sizeof (mode_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   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
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++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:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++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=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36627,13 +36205,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
++  $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:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++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=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36646,21 +36230,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_type_mode_t=yes
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-+# Check whether --enable-nss-wrapper was given.
-+if test "${enable_nss_wrapper+set}" = set; then :
-+  enableval=$enable_nss_wrapper;
- fi
- 
+-
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
@@ -36668,16 +36249,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_type_mode_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define mode_t int
 -_ACEOF
-+HAVE_NSS_WRAPPER=no
- 
-+if eval "test x$developer = xyes"; then
-+	enable_nss_wrapper=yes
- fi
- 
+-
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
 -$as_echo_n "checking for off_t... " >&6; }
 -if test "${ac_cv_type_off_t+set}" = set; then
@@ -36703,13 +36281,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++then
++  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++  if test "x$CC" != xcc; then
++    # Test first that cc exists at all.
++    if { ac_try='cc -c conftest.$ac_ext >&5'
++  { { 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=$?
++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=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36737,13 +36326,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++      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
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
++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=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -36753,27 +36360,40 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; };
++      then
++	# cc works too.
++	:
++      else
++	# cc exists but doesn't like -o.
++	eval ac_cv_prog_cc_${ac_cc}_c_o=no
++      fi
++    fi
++  fi
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if eval "test x$enable_nss_wrapper = xyes"; then
-+
-+$as_echo "#define NSS_WRAPPER 1" >>confdefs.h
-+
-+	HAVE_NSS_WRAPPER=yes
- 
+-
 -	ac_cv_type_off_t=yes
-+	# this is only used for samba3
-+	NSS_WRAPPER_OBJS="../lib/nss_wrapper/nss_wrapper.o"
++  eval ac_cv_prog_cc_${ac_cc}_c_o=no
  fi
++rm -f core conftest*
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  
++$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
  
--fi
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
@@ -36781,19 +36401,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -$as_echo "$ac_cv_type_off_t" >&6; }
 -if test "x$ac_cv_type_off_t" = x""yes; then
 -  :
--else
- 
++if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
++      BROKEN_CC=
+ else
+-
 -cat >>confdefs.h <<_ACEOF
 -#define off_t long int
 -_ACEOF
- 
--fi
+-
++      BROKEN_CC=#
+ fi
  
 -{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
 -$as_echo_n "checking for size_t... " >&6; }
 -if test "${ac_cv_type_size_t+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
++$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
++if test "${samba_cv_HAVE_Werror+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_cv_type_size_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -36867,32 +36494,44 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+SWAT_SBIN_TARGETS='bin/swat$(EXEEXT)'
-+SWAT_INSTALL_TARGETS=installswat
-+
-+# Check whether --enable-swat was given.
-+if test "${enable_swat+set}" = set; then :
-+  enableval=$enable_swat;
-+    case "$enable_swat" in
-+	no)
-+	    SWAT_SBIN_TARGETS=''
-+	    SWAT_INSTALL_TARGETS=''
-+	    ;;
-+    esac
  
 -	ac_cv_type_size_t=yes
- fi
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -Werror";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_Werror=cross
+ 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.  */
  
- 
--fi
- 
++  int main(void)
++  {
++  	return 0;
++  }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_Werror=yes
++else
++  samba_cv_HAVE_Werror=no
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 -$as_echo "$ac_cv_type_size_t" >&6; }
 -if test "x$ac_cv_type_size_t" = x""yes; then
@@ -36902,22 +36541,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<_ACEOF
 -#define size_t unsigned int
 -_ACEOF
++	CFLAGS="$old_CFLAGS";
++	old_CFLAGS="";
++	export CFLAGS;
++	CPPFLAGS="$old_CPPFLAGS";
++	old_CPPFLAGS="";
++	export CPPFLAGS;
++	LDFLAGS="$old_LDFLAGS";
++	old_LDFLAGS="";
++	export LDFLAGS;
  
--fi
- 
+ fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
 -$as_echo_n "checking for pid_t... " >&6; }
 -if test "${ac_cv_type_pid_t+set}" = set; then
-+# Probe the gcc version for extra CFLAGS. We always stash these in
-+# DEVELOPER_CFLAGS, so that you can turn them on and off with a simple
-+# Makefile edit, avoiding the need to re-run configure.
-+if test x"$ac_cv_c_compiler_gnu" = x"yes" ; then
-+    	DEVELOPER_CFLAGS="-g -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -DDEBUG_PASSWORD -DDEVELOPER"
-+	# Add -Wdeclaration-after-statement if compiler supports it
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
-+$as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-+if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
++$as_echo "$samba_cv_HAVE_Werror" >&6; }
++if test x"$samba_cv_HAVE_Werror" = x"yes"; then
++   Werror_FLAGS="-Werror"
  else
 -  ac_cv_type_pid_t=no
 -cat >conftest.$ac_ext <<_ACEOF
@@ -36959,22 +36602,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="-Wdeclaration-after-statement";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Wdeclaration_after_statement=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -36984,12 +36612,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37009,23 +36632,60 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Wdeclaration_after_statement=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
++$as_echo_n "checking that the C compiler understands -w2... " >&6; }
++if test "${samba_cv_HAVE_w2+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_pid_t=yes
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -w2";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_w2=cross
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_type_pid_t=yes
-+  samba_cv_HAVE_Wdeclaration_after_statement=no
-+fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
++  int main(void)
++  {
++  	return 0;
++  }
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_HAVE_w2=yes
++else
++  samba_cv_HAVE_w2=no
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-$as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
+-  :
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define pid_t int
+-_ACEOF
 +	CFLAGS="$old_CFLAGS";
 +	old_CFLAGS="";
 +	export CFLAGS;
@@ -37036,57 +36696,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +	old_LDFLAGS="";
 +	export LDFLAGS;
  
- 
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Wdeclaration_after_statement" >&5
-+$as_echo "$samba_cv_HAVE_Wdeclaration_after_statement" >&6; }
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
--$as_echo "$ac_cv_type_pid_t" >&6; }
--if test "x$ac_cv_type_pid_t" = x""yes; then
--  :
--else
-+	if test x"$samba_cv_HAVE_Wdeclaration_after_statement" = x"yes"; then
-+	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Wdeclaration-after-statement"
-+	fi
- 
--cat >>confdefs.h <<_ACEOF
--#define pid_t int
--_ACEOF
-+	#-Werror-implicit-function-declaration
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
-+$as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
-+if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
--fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
 -$as_echo_n "checking for struct stat.st_rdev... " >&6; }
 -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="-Werror-implicit-function-declaration";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=cross
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
++$as_echo "$samba_cv_HAVE_w2" >&6; }
++if test x"$samba_cv_HAVE_w2" = x"yes"; then
++   Werror_FLAGS="-w2"
  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.  */
 -$ac_includes_default
 -int
 -main ()
@@ -37117,7 +36743,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
--else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
++$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
++if test "${samba_cv_HAVE_errwarn+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37126,7 +36756,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++	old_CFLAGS="$CFLAGS";
++	CFLAGS="$CFLAGS -errwarn=%all";
++	export CFLAGS;
++	old_CPPFLAGS="$CPPFLAGS";
++	CPPFLAGS="$CPPFLAGS";
++	export CPPFLAGS;
++	old_LDFLAGS="$LDFLAGS";
++	LDFLAGS="$LDFLAGS";
++	export LDFLAGS;
++	if test "$cross_compiling" = yes; then :
++  samba_cv_HAVE_errwarn=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
 -int
 -main ()
@@ -37137,10 +36781,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+	    int main(void)
-+	    {
-+	    	return 0;
-+	    }
++
++   int main(void)
++   {
++	return 0;
++   }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -37162,11 +36807,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_stat_st_rdev=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror_implicit_function_declaration=yes
++  samba_cv_HAVE_errwarn=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  samba_cv_HAVE_Werror_implicit_function_declaration=no
++  samba_cv_HAVE_errwarn=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -37181,32 +36826,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +	LDFLAGS="$old_LDFLAGS";
 +	old_LDFLAGS="";
 +	export LDFLAGS;
-+
  
 -	ac_cv_member_struct_stat_st_rdev=no
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror_implicit_function_declaration" >&5
-+$as_echo "$samba_cv_HAVE_Werror_implicit_function_declaration" >&6; }
-+       if test x"$samba_cv_HAVE_Werror_implicit_function_declaration" = x"yes"; then
-+	    DEVELOPER_CFLAGS="${DEVELOPER_CFLAGS} -Werror-implicit-function-declaration"
-+       fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+	# krb5developer is like developer, except we don't get
-+	# -Wstrict-prototypes.
-+       if test x"$krb5_developer" != x"$yes" ; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
-+       fi
-+
-+       if test x"$picky_developer" = x"yes"; then
-+	    DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
-+       fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
++$as_echo "$samba_cv_HAVE_errwarn" >&6; }
++if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
++   Werror_FLAGS="-errwarn=%all"
++fi
  fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Check whether --enable-dmalloc was given.
-+if test "${enable_dmalloc+set}" = set; then :
-+  enableval=$enable_dmalloc;
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_rdev" >&6; }
@@ -37215,32 +36847,65 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_STAT_ST_RDEV 1
 -_ACEOF
- 
-+if test "x$enable_dmalloc" = xyes
-+then
++############################################
++# check if the compiler can handle negative enum values
++# and don't truncate the values to INT_MAX
++# a runtime test is needed here
 +
-+$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
++$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
++if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++	#include <stdio.h>
++	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
++	int main(void) {
++		enum negative_values v1 = NEGATIVE_VALUE;
++		unsigned v2 = NEGATIVE_VALUE;
++
++		if (v1 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v1);
++			return 1;
++		}
++		if (v2 != 0xFFFFFFFF) {
++			printf("%u != 0xFFFFFFFF\n", v2);
++			return 1;
++		}
+ 
++		return 0;
++	}
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_ST_RDEV 1
--_ACEOF
+ _ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
++else
++  samba_cv__CC_NEGATIVE_ENUM_VALUES=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
  
-+$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
-+
-+	LIBS="$LIBS -ldmalloc"
  fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
++$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
++if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
++$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
++	PIDL_ARGS="$PIDL_ARGS --uint-enums"
++fi
  
-+#################################################
-+# check for a shared memory profiling support
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use profiling" >&5
-+$as_echo_n "checking whether to use profiling... " >&6; }
-+
-+# Check whether --with-profiling-data was given.
-+if test "${with_profiling_data+set}" = set; then :
-+  withval=$with_profiling_data;  case "$withval" in
-+  yes)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
  
 -{ $as_echo "$as_me:$LINENO: checking for d_off in dirent" >&5
 -$as_echo_n "checking for d_off in dirent... " >&6; }
@@ -37253,19 +36918,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+$as_echo "#define WITH_PROFILE 1" >>confdefs.h
  
 -#include <unistd.h>
 -#include <sys/types.h>
 -#include <dirent.h>
--int
--main ()
--{
++saved_CFLAGS="$CFLAGS";
++c99_init=no
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
++$as_echo_n "checking for C99 designated initializers... " >&6; }
++    CFLAGS="$saved_CFLAGS";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
+ int
+ main ()
+ {
 -struct dirent d; d.d_off;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37285,65 +36961,61 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_dirent_d_off=yes
-+    samba_cv_WITH_PROFILE=yes
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    samba_cv_WITH_PROFILE=no
-+    ;;
-+  esac
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_dirent_d_off=no
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
- 
--	ac_cv_dirent_d_off=no
  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
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_dirent_d_off" >&5
 -$as_echo "$ac_cv_dirent_d_off" >&6; }
 -if test $ac_cv_dirent_d_off = yes; then
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_DIRENT_D_OFF 1
 -_ACEOF
-+merged_build_possible=yes
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
 -$as_echo_n "checking for ssize_t... " >&6; }
 -if test "${ac_cv_type_ssize_t+set}" = set; then
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_ssize_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
++$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
++    CFLAGS="$saved_CFLAGS -AC99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof (ssize_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37367,17 +37039,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
++    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof ((ssize_t)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37397,87 +37087,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+  if test -n "$AWK"; then
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AWK="$ac_prog"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  test -n "$AWK" && break
-+done
-+
-+# Check for GNU make
-+
-+
-+
-+
-+
-+
-+for ac_prog in gmake make
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_MAKE+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  case $MAKE in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_MAKE="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -	ac_cv_type_ssize_t=yes
-+  ;;
-+esac
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+MAKE=$ac_cv_path_MAKE
-+if test -n "$MAKE"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE" >&5
-+$as_echo "$MAKE" >&6; }
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -37486,48 +37106,52 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
  fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
 -$as_echo "$ac_cv_type_ssize_t" >&6; }
 -if test "x$ac_cv_type_ssize_t" = x""yes; then
 -  :
 -else
- 
+-
 -cat >>confdefs.h <<_ACEOF
 -#define ssize_t int
 -_ACEOF
-+  test -n "$MAKE" && break
-+done
- 
+-
 -fi
- 
+-
 -{ $as_echo "$as_me:$LINENO: checking for wchar_t" >&5
 -$as_echo_n "checking for wchar_t... " >&6; }
 -if test "${ac_cv_type_wchar_t+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
-+$as_echo_n "checking whether we have GNU make... " >&6; }
-+if test "${samba_cv_gnu_make+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_wchar_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
++$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
++    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof (wchar_t))
 -       return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37551,17 +37175,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++if test x"$c99_init" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
++$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
++    CFLAGS="$saved_CFLAGS -c99"
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_includes_default
--int
--main ()
--{
++#include <stdio.h>
+ int
+ main ()
+ {
 -if (sizeof ((wchar_t)))
 -	  return 0;
--  ;
--  return 0;
--}
--_ACEOF
++ struct foo {int x;char y;};
++       struct foo bar = { .y = 'X', .x = 1 };
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -37581,36 +37223,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_wchar_t=yes
-+if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null
-+then
-+	samba_cv_gnu_make=no
-+else
-+	samba_cv_gnu_make=yes
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_gnu_make" >&5
-+$as_echo "$samba_cv_gnu_make" >&6; }
-+if test x$samba_cv_gnu_make = xyes; then
-+	true
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }; c99_init=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	merged_build_possible=no
-+fi
- 
- 
--fi
-+# Check for perl
+-
+-	ac_cv_type_wchar_t=yes
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++if test "`uname`" = "HP-UX"; then
++  if test "$ac_cv_c_compiler_gnu" = no; then
++	# special override for broken HP-UX compiler - I can't find a way to test
++	# this properly (its a compiler bug)
++	CFLAGS="$CFLAGS -AC99";
++	c99_init=yes;
++  fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_wchar_t" >&5
 -$as_echo "$ac_cv_type_wchar_t" >&6; }
 -if test "x$ac_cv_type_wchar_t" = x""yes; then
@@ -37620,142 +37261,114 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<_ACEOF
 -#define wchar_t unsigned short
 -_ACEOF
++if test x"$c99_init" = x"yes"; then
++    saved_CFLAGS=""
  
--fi
++else
++    CFLAGS="$saved_CFLAGS"
++    saved_CFLAGS=""
++    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+ fi
  
  
 -############################################
 -# for cups support we need libcups, and a handful of header files
-+case "$host_os" in
-+	*irix*)
-+		# On IRIX, we prefer Freeware or Nekoware Perl, because the
-+		# system perl is so ancient.
-+		# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PERL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PERL in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_dummy=""/usr/freeware/bin:/usr/nekoware/bin:$PATH""
-+for as_dir in $as_dummy
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
++$as_echo_n "checking uname -s... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
++$as_echo "${UNAME_S}" >&6; }
  
 -# Check whether --enable-cups was given.
 -if test "${enable_cups+set}" = set; then
 -  enableval=$enable_cups;
-+  test -z "$ac_cv_path_PERL" && ac_cv_path_PERL=""""
-+  ;;
-+esac
-+fi
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
++UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
++$as_echo_n "checking uname -r... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
++$as_echo "${UNAME_R}" >&6; }
  
++UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
++$as_echo_n "checking uname -m... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
++$as_echo "${UNAME_M}" >&6; }
  
 -if test x$enable_cups != xno; then
 -	# Extract the first word of "cups-config", so it can be a program name with args.
 -set dummy cups-config; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+		;;
-+	*)
-+		# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PERL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  case $CUPS_CONFIG in
-+  case $PERL in
-   [\\/]* | ?:[\\/]*)
+-  [\\/]* | ?:[\\/]*)
 -  ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
-+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
-   ;;
-   *)
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -37361,2076 +7444,1344 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
+-    break 2
+-  fi
 -done
-+  done
- IFS=$as_save_IFS
+-done
+-IFS=$as_save_IFS
++UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
++$as_echo_n "checking uname -p... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
++$as_echo "${UNAME_P}" >&6; }
  
-   ;;
+-  ;;
++UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
++$as_echo_n "checking uname -i... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
++$as_echo "${UNAME_I}" >&6; }
++
++  case "$host_os" in
++	*irix6*)
++		#TODO add to libreplace
++		if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
++																								CFLAGS="$CFLAGS -diag_error 1035"
++												CFLAGS="$CFLAGS -woff 1209,1174,3201"
++		fi
++	;;
  esac
- fi
+-fi
 -CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
 -if test -n "$CUPS_CONFIG"; then
 -  { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
 -$as_echo "$CUPS_CONFIG" >&6; }
-+PERL=$ac_cv_path_PERL
-+if test -n "$PERL"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
+-else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
+-$as_echo "no" >&6; }
+-fi
  
++DYNEXP=
  
-+		;;
-+esac
++LDSHFLAGS_Z_DEFS=
  
 -        if test "x$CUPS_CONFIG" != x; then
--
++LDSHFLAGS_Z_NODEFS=
+ 
 -		ac_save_CFLAGS=$CFLAGS
 -		ac_save_LDFLAGS=$LDFLAGS
 -		ac_save_PRINT_LIBS=$PRINT_LIBS
 -		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
 -		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
--		PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
-+if test x"$PERL" = x""; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No version of perl was found!" >&5
-+$as_echo "$as_me: WARNING: No version of perl was found!" >&2;}
-+	merged_build_possible=no
-+else
-+	if test x"$debug" = x"yes";then
-+		PERL="$PERL -W"
-+	fi
-+	export PERL
-+	true
-+fi
+-		PRINT_LIBS="$PRINT_LIBS -lcups"
  
++default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
  
 -for ac_header in cups/cups.h cups/language.h
 -do
@@ -37764,19 +37377,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $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
+-else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -37808,33 +37415,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly"
  
 -	ac_header_compiler=no
++if test "x$developer" = xyes; then
++   default_static_modules="$default_static_modules rpc_rpcecho pdb_ads"
++   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
  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; }
--
++#
++# Config CPPFLAG settings for strange OS's that must be set
++# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
++# case statement; its first reference must be unconditional.
++#
++case "$host_os" in
++    *hpux*)
++#
++# Defines needed for HPUX support.
++# HPUX has bigcrypt but (sometimes?) doesn't use it for
++# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
++#
++      case `uname -r` in
++		*9*|*10*|*11)
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -37864,23 +37473,27 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
-+fi
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
+ 
 -  ac_header_preproc=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
++		;;
++      esac
++      ;;
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
++#
++# CRAY Unicos has broken const handling
++       *unicos*)
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
++$as_echo "disabling const" >&6; }
++	  CPPFLAGS="$CPPFLAGS -Dconst="
++	  ;;
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -37915,97 +37528,266 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+fi
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $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; }
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AR="ar"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++#
++# AIX4.x doesn't even admit to having large
++# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
++#
++    *aix4*)
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++      CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
  
- 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
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
-+fi
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
++$as_echo "#define _LARGE_FILES 1" >>confdefs.h
+ 
+-fi
++      ;;
++#
++# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
++# to the existance of large files..
++# Note that -D_LARGEFILE64_SOURCE is different from the Sun
++# recommendations on large file support, however it makes the
++# compile work using gcc 2.7 and 2.8, whereas using the Sun
++# recommendation makes the compile fail on gcc2.7. JRA.
++#
++# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
++#
++	*solaris*)
  
 -done
-+  if test "x$ac_ct_AR" = x; then
-+    AR=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
-+fi
++$as_echo "#define SYSV 1" >>confdefs.h
  
 -		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
 -		        x"$ac_cv_header_cups_language_h" = xyes; then
++		case `uname -r` in
++			5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
++	  			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
++$as_echo "no large file support" >&6; }
++				;;
++			5.*)
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
++$as_echo "enabling large file support" >&6; }
++			if test "$ac_cv_c_compiler_gnu" = yes; then
++				${CC-cc} -v >conftest.c 2>&1
++				ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
++				rm -fr conftest.c
++				case "$ac_cv_gcc_compiler_version_number" in
++					*"gcc version 2.6"*|*"gcc version 2.7"*)
++						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
++						LDFLAGS="$LDFLAGS -lthread"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
-+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; }
-+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 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-+  ac_cv_prog_gnu_ld=yes
-+else
-+  ac_cv_prog_gnu_ld=no
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gnu_ld" >&5
-+$as_echo "$ac_cv_prog_gnu_ld" >&6; }
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -			samba_cv_HAVE_CUPS=yes
++						;;
++					*)
++						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++						LDFLAGS="$LDFLAGS -lthread"
+ 
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
+ 
+-ac_check_lib_ext_save_LIBS=$LIBS
+-LIBS="-lcups $PRINT_LIBS  $LIBS"
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
++						;;
++				esac
++			else
++				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
++				LDFLAGS="$LDFLAGS -lthread"
+ 
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
+ 
+-        { $as_echo "$as_me:$LINENO: checking for httpConnectEncrypt in -lcups" >&5
+-$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
+-if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+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.  */
++$as_echo "#define _FILE_OFFSET_BITS 64" >>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 httpConnectEncrypt ();
+-int
+-main ()
+-{
+-return httpConnectEncrypt ();
+-  ;
+-  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_ext_cups_httpConnectEncrypt=yes;
+-		  ac_cv_lib_ext_cups=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++			fi
++			;;
++		esac
++		;;
++#
++# IRIX uses SYSV printing.  Make sure to set that here
++#
++	*irix*)
+ 
+-	ac_cv_lib_ext_cups_httpConnectEncrypt=no;
+-		  ac_cv_lib_ext_cups=no
+-fi
++$as_echo "#define SYSV 1" >>confdefs.h
++
++		;;
++	*freebsd*|*dragonfly*)
++
++$as_echo "#define FREEBSD 1" >>confdefs.h
++
++		;;
++#
++# VOS may need to have POSIX support and System V compatibility enabled.
++#
++    *vos*)
++    case "$CPPFLAGS" in
++	  *-D_POSIX_C_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
++
++$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++
++		;;
++    esac
++    case "$CPPFLAGS" in
++	  *-D_SYSV*|*-D_SVID_SOURCE*)
++		;;
++	  *)
++		CPPFLAGS="$CPPFLAGS -D_SYSV"
+ 
+-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
++    ;;
++#
++# Tests needed for SINIX large file support.
++#
++    *sysv4*)
++      if test $host = mips-sni-sysv4 ; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
++        if test "$cross_compiling" = yes; then :
++  SINIX_LFS_SUPPORT=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
+-$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
+-    if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_HTTPCONNECTENCRYPT 1
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
++}
+ _ACEOF
+-
++if ac_fn_c_try_run "$LINENO"; then :
++  SINIX_LFS_SUPPORT=yes
++else
++  SINIX_LFS_SUPPORT=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-LIBS=$ac_check_lib_ext_save_LIBS
+-
+-if test $ac_cv_lib_ext_cups = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCUPS 1
+-_ACEOF
+-
+-		case "$PRINT_LIBS" in
+-		    *-lcups*)
+-			;;
+-		    *)
+-			PRINT_LIBS="-lcups $PRINT_LIBS"
+-			;;
+-		esac
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$SINIX_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
+ 
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ 
+-fi
++          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
++          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
++          LIBS="`getconf LFS64_LIBS` $LIBS"
++        fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
++$as_echo "$SINIX_LFS_SUPPORT" >&6; }
++      fi
++    ;;
+ 
 -		else
 -			{ $as_echo "$as_me:$LINENO: WARNING: cups-config around but cups-devel not installed" >&5
 -$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
@@ -38013,85 +37795,57 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -			LDFLAGS=$ac_save_LDFLAGS
 -			PRINT_LIBS=$ac_save_PRINT_LIBS
 -		fi
++# Systems with LFS support.
++#
++    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
++	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
 -	elif test x"$enable_cups" = x"yes"; then
 -		{ { $as_echo "$as_me:$LINENO: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&5
 -$as_echo "$as_me: error: Cups support required but cups-config not located.  Make sure cups-devel related files are installed." >&2;}
 -   { (exit 1); exit 1; }; }
-+if test "$ac_cv_prog_gnu_ld" = "yes"; then
-+	ac_cv_gnu_ld_version=`$LD -v 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'`
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_date}" >&5
-+$as_echo "${ac_cv_gnu_ld_date}" >&6; }
-+        if test -n "$ac_cv_gnu_ld_date"; then
-+ 	if test "$ac_cv_gnu_ld_date" -lt 20030217; then
-+ 		ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+ 	fi
-+	if test "$ac_cv_gnu_ld_date" -gt 20030101; then
-+		ac_cv_gnu_ld_version_script=yes
-+	fi
-+        else
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version" >&5
-+$as_echo_n "checking GNU ld release version... " >&6; }
-+                      ac_cv_gnu_ld_vernr=`echo $ac_cv_gnu_ld_version | sed -n 's,^[^0-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*$,\1,p'`
-+           ac_cv_gnu_ld_vernr_major=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 1`
-+           ac_cv_gnu_ld_vernr_minor=`echo $ac_cv_gnu_ld_vernr | cut -d '.' -f 2`
-+                      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr}" >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version major" >&5
-+$as_echo_n "checking GNU ld release version major... " >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_major}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_major}" >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNU ld release version minor" >&5
-+$as_echo_n "checking GNU ld release version minor... " >&6; }
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_cv_gnu_ld_vernr_minor}" >&5
-+$as_echo "${ac_cv_gnu_ld_vernr_minor}" >&6; }
-+           if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
-+             ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
-+           fi
-+           if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major" = 2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
-+             ac_cv_gnu_ld_version_script=yes
-+           fi
-         fi
- fi
+-        fi
+-fi
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -# Check whether --enable-iprint was given.
 -if test "${enable_iprint+set}" = set; then
 -  enableval=$enable_iprint;
 -fi
--
--
+ 
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ 
 -if test x$enable_iprint != xno; then
 -	if test x"$samba_cv_HAVE_CUPS" = xyes; then
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_IPRINT 1
 -_ACEOF
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -	elif test x"$enable_iprint" = x"yes"; then
 -		{ { $as_echo "$as_me:$LINENO: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&5
 -$as_echo "$as_me: error: iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." >&2;}
 -   { (exit 1); exit 1; }; }
 -        fi
-+if test "x$CC" != xcc; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
- fi
--
+-fi
++	;;
+ 
 -############################################
 -# check if the compiler will optimize out function calls
 -{ $as_echo "$as_me:$LINENO: checking if the compiler will optimize out function calls" >&5
 -$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
 -if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
+-  $as_echo_n "(cached) " >&6
++# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
++#
++    *linux*)
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
++       if test "$cross_compiling" = yes; then :
++  LINUX_LFS_SUPPORT=cross
  else
 -
 -    cat >conftest.$ac_ext <<_ACEOF
@@ -38103,50 +37857,63 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
 -#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
++#include <unistd.h>
++#include <sys/utsname.h>
++#include <string.h>
++#include <stdlib.h>
++main() {
++#if _LFS64_LARGEFILE == 1
++       struct utsname uts;
++       char *release;
++       int major, minor;
  
 -		if (0) {
 -		   this_function_does_not_exist();
 -		} else {
 -		  return 1;
 -		}
--
--
-   ;
-   return 0;
++       /* Ensure this is glibc 2.2 or higher */
++#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
+ 
+-  ;
+-  return 0;
++       /* Ensure this is kernel 2.4 or higher */
++
++       uname(&uts);
++       release = strdup(uts.release);
++       major = atoi(strsep(&release, "."));
++       minor = atoi(strsep(&release, "."));
++
++       if (major > 2 || (major == 2 && minor > 3))
++               exit(0);
++       exit(1);
++#else
++       exit(1);
++#endif
  }
++
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
-+# Make sure it works both with $CC and with simple cc.
-+# We do the test twice because some compilers refuse to overwrite an
-+# existing .o file with -o, though they will create one.
-+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
+-  *\"* | *\`* | *\\*) 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
@@ -38159,81 +37926,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  samba_cv_optimize_out_funcation_calls=yes
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; };
-+then
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-+  if test "x$CC" != xcc; then
-+    # Test first that cc exists at all.
-+    if { ac_try='cc -c conftest.$ac_ext >&5'
-+  { { 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
-+      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
-+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.
-+	:
-+      else
-+	# cc exists but doesn't like -o.
-+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+      fi
-+    fi
-+  fi
++if ac_fn_c_try_run "$LINENO"; then :
++  LINUX_LFS_SUPPORT=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+fi
-+rm -f core conftest*
-+
-+fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
- 
+-
 -	samba_cv_optimize_out_funcation_calls=no
++  LINUX_LFS_SUPPORT=no
  fi
- 
+-
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+      BROKEN_CC=
-+else
-+      BROKEN_CC=#
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_optimize_out_funcation_calls" >&5
 -$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
@@ -38242,91 +37949,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1
 -_ACEOF
++	CPPFLAGS="$old_CPPFLAGS"
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
-+$as_echo_n "checking that the C compiler understands -Werror... " >&6; }
-+if test "${samba_cv_HAVE_Werror+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="-Werror";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_Werror=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+  int main(void)
-+  {
-+  	return 0;
-+  }
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_Werror=yes
-+else
-+  samba_cv_HAVE_Werror=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 "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -#############################################
 -# check for fd passing struct via msg_control
 -{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_control" >&5
 -$as_echo_n "checking for fd passing via msg_control... " >&6; }
 -if test "${samba_cv_msghdr_msg_control+set}" = set; then
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_Werror" >&5
-+$as_echo "$samba_cv_HAVE_Werror" >&6; }
-+if test x"$samba_cv_HAVE_Werror" = x"yes"; then
-+   Werror_FLAGS="-Werror"
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
-+$as_echo_n "checking that the C compiler understands -w2... " >&6; }
-+if test "${samba_cv_HAVE_w2+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
-+
-+
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="-w2";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_w2=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
++$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -#include <sys/types.h>
 -#include <stdlib.h>
@@ -38336,7 +37980,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
--
+ 
 -	struct msghdr msg;
 -	union {
 -	      struct cmsghdr cm;
@@ -38344,15 +37988,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	} control_un;
 -	msg.msg_control = control_un.control;
 -	msg.msg_controllen = sizeof(control_un.control);
--
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+ 
 -  ;
 -  return 0;
 -}
-+  int main(void)
-+  {
-+  	return 0;
-+  }
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38372,62 +38013,61 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_control=yes
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_w2=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++	fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
++$as_echo "$LINUX_LFS_SUPPORT" >&6; }
++	;;
+ 
 -	samba_cv_msghdr_msg_control=no
-+  samba_cv_HAVE_w2=no
- fi
--
+-fi
++#
++# MacOS X is the *only* system that uses compose character in utf8. This
++# is so horribly broken....
++#
++    *darwin*)
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $samba_cv_msghdr_msg_control" >&5
 -$as_echo "$samba_cv_msghdr_msg_control" >&6; }
 -if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
++$as_echo "#define BROKEN_UNICODE_COMPOSE_CHARACTERS 1" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MSGHDR_MSG_CONTROL 1
 -_ACEOF
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
  
- fi
--
+-fi
++# Add a system specific charset module.
++	default_shared_modules="$default_shared_modules charset_macosxfs"
+ 
 -#############################################
 -# check for fd passing struct via msg_acctrights
 -{ $as_echo "$as_me:$LINENO: checking for fd passing via msg_acctrights" >&5
 -$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
 -if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_w2" >&5
-+$as_echo "$samba_cv_HAVE_w2" >&6; }
-+if test x"$samba_cv_HAVE_w2" = x"yes"; then
-+   Werror_FLAGS="-w2"
-+else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
-+$as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-+if test "${samba_cv_HAVE_errwarn+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $as_echo_n "(cached) " >&6
++	;;
++    *hurd*)
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
++$as_echo_n "checking for LFS support... " >&6; }
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
++        if test "$cross_compiling" = yes; then :
++  GLIBC_LFS_SUPPORT=cross
  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.  */
+ 
 -#include <sys/types.h>
 -#include <stdlib.h>
 -#include <stddef.h>
@@ -38436,33 +38076,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -int
 -main ()
 -{
- 
+-
 -	struct msghdr msg;
 -	int fd;
 -	msg.msg_acctrights = (caddr_t) &fd;
 -	msg.msg_acctrightslen = sizeof(fd);
-+	old_CFLAGS="$CFLAGS";
-+	CFLAGS="-errwarn=%all";
-+	export CFLAGS;
-+	old_CPPFLAGS="$CPPFLAGS";
-+	CPPFLAGS="$CPPFLAGS";
-+	export CPPFLAGS;
-+	old_LDFLAGS="$LDFLAGS";
-+	LDFLAGS="$LDFLAGS";
-+	export LDFLAGS;
-+	if test "$cross_compiling" = yes; then :
-+  samba_cv_HAVE_errwarn=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -  ;
 -  return 0;
--}
-+   int main(void)
-+   {
-+	return 0;
-+   }
++#include <unistd.h>
++main () {
++#if _LFS64_LARGEFILE == 1
++exit(0);
++#else
++exit(1);
++#endif
+ }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -38484,13 +38113,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_msghdr_msg_acctrights=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_HAVE_errwarn=yes
++  GLIBC_LFS_SUPPORT=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_msghdr_msg_acctrights=no
-+  samba_cv_HAVE_errwarn=no
++  GLIBC_LFS_SUPPORT=no
  fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -38500,33 +38129,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+	CFLAGS="$old_CFLAGS";
-+	old_CFLAGS="";
-+	export CFLAGS;
-+	CPPFLAGS="$old_CPPFLAGS";
-+	old_CPPFLAGS="";
-+	export CPPFLAGS;
-+	LDFLAGS="$old_LDFLAGS";
-+	old_LDFLAGS="";
-+	export LDFLAGS;
  
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_errwarn" >&5
-+$as_echo "$samba_cv_HAVE_errwarn" >&6; }
-+if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
-+   Werror_FLAGS="-errwarn=%all"
-+fi
-+fi
-+fi
+-fi
++        CPPFLAGS="$old_CPPFLAGS"
++        if test x$GLIBC_LFS_SUPPORT = xyes ; then
++          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
  
-+############################################
-+# check if the compiler can handle negative enum values
-+# and don't truncate the values to INT_MAX
-+# a runtime test is needed here
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -for ac_func in dirfd
 -do
@@ -38534,11 +38147,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 that the C compiler understands negative enum values" >&5
-+$as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-+if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -38553,35 +38163,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+    if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+	#include <stdio.h>
-+	enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF };
-+	int main(void) {
-+		enum negative_values v1 = NEGATIVE_VALUE;
-+		unsigned v2 = NEGATIVE_VALUE;
++        fi
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
++$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
++    ;;
++    *qnx*)
++        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
  
 -#undef $ac_func
-+		if (v1 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v1);
-+			return 1;
-+		}
-+		if (v2 != 0xFFFFFFFF) {
-+			printf("%u != 0xFFFFFFFF\n", v2);
-+			return 1;
-+		}
++$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -38596,8 +38193,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+		return 0;
-+	}
++        ;;
  
 -int
 -main ()
@@ -38606,13 +38202,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
- _ACEOF
+-_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
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
@@ -38629,22 +38225,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+  samba_cv_CC_NEGATIVE_ENUM_VALUES=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
-+  samba_cv__CC_NEGATIVE_ENUM_VALUES=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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam 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
@@ -38655,19 +38246,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
- 
- fi
+-
+-fi
 -done
 -
 -if test x"$ac_cv_func_dirfd" = x"yes"; then
 -	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_CC_NEGATIVE_ENUM_VALUES" >&5
-+$as_echo "$samba_cv_CC_NEGATIVE_ENUM_VALUES" >&6; }
-+if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using --uint-enums for pidl" >&5
-+$as_echo "$as_me: WARNING: using --uint-enums for pidl" >&2;}
-+	PIDL_ARGS="$PIDL_ARGS --uint-enums"
- fi
+-fi
++SAVE_CPPFLAGS="${CPPFLAGS}"
++CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
  
 -{ $as_echo "$as_me:$LINENO: checking for struct sigevent type" >&5
 -$as_echo_n "checking for struct sigevent type... " >&6; }
@@ -38681,6 +38268,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++echo "LIBREPLACE_BROKEN_CHECKS: START"
  
 -#include <sys/types.h>
 -#if STDC_HEADERS
@@ -38688,26 +38276,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#include <stddef.h>
 -#endif
 -#include <signal.h>
-+saved_CFLAGS="$CFLAGS";
-+c99_init=no
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers" >&5
-+$as_echo_n "checking for C99 designated initializers... " >&6; }
-+    CFLAGS="$saved_CFLAGS";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -struct sigevent s;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38727,28 +38303,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_struct_sigevent=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++libreplacedir=""
++libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
++for d in $libreplacepaths; do
++	if test -f "$d/replace.c"; then
++		libreplacedir="$d"
+ 
 -	samba_cv_struct_sigevent=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		break;
++	fi
++done
++if test x"$libreplacedir" = "x"; then
++	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
  fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_struct_sigevent" >&5
 -$as_echo "$samba_cv_struct_sigevent" >&6; }
 -if test x"$samba_cv_struct_sigevent" = x"yes"; then
--
++LIBREPLACEOBJ="$libreplacedir/replace.o"
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_SIGEVENT 1
 -_ACEOF
--
+ 
 -   { $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sival_ptr" >&5
 -$as_echo_n "checking for struct sigevent.sigev_value.sival_ptr... " >&6; }
 -if test "${ac_cv_member_struct_sigevent_sigev_value_sival_ptr+set}" = set; then
@@ -38759,28 +38341,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -AC99" >&5
-+$as_echo_n "checking for C99 designated initializers with -AC99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -AC99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <signal.h>
--
-+#include <stdio.h>
- int
- main ()
- {
++LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+ 
+-int
+-main ()
+-{
 -static struct sigevent ac_aggr;
 -if (ac_aggr.sigev_value.sival_ptr)
 -return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38800,9 +38374,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -38812,29 +38387,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=extc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=extc99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#include <signal.h>
--
-+#include <stdio.h>
++#include <sys/types.h>
+ #include <signal.h>
+ 
  int
  main ()
  {
 -static struct sigevent ac_aggr;
 -if (sizeof ac_aggr.sigev_value.sival_ptr)
 -return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
++return *(signal (0, 0)) (0) == 1;
    ;
    return 0;
  }
@@ -38859,8 +38423,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sival_ptr=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++  ac_cv_type_signal=int
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -38869,8 +38432,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
++  ac_cv_type_signal=void
  fi
 -
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -38878,45 +38440,42 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&5
 -$as_echo "$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" >&6; }
 -if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
++$as_echo "$ac_cv_type_signal" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
--_ACEOF
--
--
++#define RETSIGTYPE $ac_cv_type_signal
+ _ACEOF
+ 
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: checking for struct sigevent.sigev_value.sigval_ptr" >&5
 -$as_echo_n "checking for struct sigevent.sigev_value.sigval_ptr... " >&6; }
 -if test "${ac_cv_member_struct_sigevent_sigev_value_sigval_ptr+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++{ $as_echo "$as_me:${as_lineno-$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 :
+   $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"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -qlanglvl=stdc99" >&5
-+$as_echo_n "checking for C99 designated initializers with -qlanglvl=stdc99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -#include <signal.h>
 -
-+#include <stdio.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -static struct sigevent ac_aggr;
 -if (ac_aggr.sigev_value.sigval_ptr)
 -return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -38936,10 +38495,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -38948,32 +38504,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+if test x"$c99_init" = x"no"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 designated initializers with -c99" >&5
-+$as_echo_n "checking for C99 designated initializers with -c99... " >&6; }
-+    CFLAGS="$saved_CFLAGS -c99"
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <signal.h>
--
-+#include <stdio.h>
- int
- main ()
- {
++#include <sys/types.h>
+ 
+-int
+-main ()
+-{
 -static struct sigevent ac_aggr;
 -if (sizeof ac_aggr.sigev_value.sigval_ptr)
 -return 0;
-+ struct foo {int x;char y;};
-+       struct foo bar = { .y = 'X', .x = 1 };
-+
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -38994,59 +38538,48 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }; c99_init=yes
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "uid_t" >/dev/null 2>&1; then :
++  ac_cv_type_uid_t=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_member_struct_sigevent_sigev_value_sigval_ptr=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_cv_type_uid_t=no
  fi
++rm -f conftest*
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if test "`uname`" = "HP-UX"; then
-+  if test "$ac_cv_c_compiler_gnu" = no; then
-+	# special override for broken HP-UX compiler - I can't find a way to test
-+	# this properly (its a compiler bug)
-+	CFLAGS="$CFLAGS -AC99";
-+	c99_init=yes;
-+  fi
  fi
++{ $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
  
-+if test x"$c99_init" = x"yes"; then
-+    saved_CFLAGS=""
++$as_echo "#define gid_t int" >>confdefs.h
  
-+else
-+    CFLAGS="$saved_CFLAGS"
-+    saved_CFLAGS=""
-+    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
  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
-+UNAME_S=`(uname -s) 2>/dev/null` || UNAME_S="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -s" >&5
-+$as_echo_n "checking uname -s... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_S}" >&5
-+$as_echo "${UNAME_S}" >&6; }
+ else
  
 -    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -39054,12 +38587,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+UNAME_R=`(uname -r) 2>/dev/null` || UNAME_R="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
-+$as_echo_n "checking uname -r... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_R}" >&5
-+$as_echo "${UNAME_R}" >&6; }
- 
+-
 -#include <sys/types.h>
 -#if STDC_HEADERS
 -#include <stdlib.h>
@@ -39075,12 +38603,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#  include <time.h>
 -# endif
 -#endif
-+UNAME_M=`(uname -m) 2>/dev/null` || UNAME_M="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
-+$as_echo_n "checking uname -m... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_M}" >&5
-+$as_echo "${UNAME_M}" >&6; }
- 
+-
 -int
 -main ()
 -{
@@ -39094,27 +38617,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
-+UNAME_P=`(uname -p) 2>/dev/null` || UNAME_P="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -p" >&5
-+$as_echo_n "checking uname -p... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_P}" >&5
-+$as_echo "${UNAME_P}" >&6; }
-+
-+UNAME_I=`(uname -i) 2>/dev/null` || UNAME_I="unknown"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -i" >&5
-+$as_echo_n "checking uname -i... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${UNAME_I}" >&5
-+$as_echo "${UNAME_I}" >&6; }
-+
-+  case "$host_os" in
-+	*irix6*)
-+		#TODO add to libreplace
-+		if test x"$ac_cv_c_compiler_gnu" != x"yes" ; then
-+																								CFLAGS="$CFLAGS -diag_error 1035"
-+												CFLAGS="$CFLAGS -woff 1209,1174,3201"
-+		fi
-+	;;
- esac
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_compile") 2>conftest.er1
@@ -39131,100 +38634,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++cat >>confdefs.h <<_ACEOF
++#define mode_t int
++_ACEOF
  
 -	samba_cv_struct_timespec=no
--fi
-+DYNEXP=
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+default_static_modules="pdb_smbpasswd pdb_tdbsam pdb_wbc_sam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog auth_sam auth_unix auth_winbind auth_wbc auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template"
-+
-+default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_preopen"
-+
-+if test "x$developer" = xyes; then
-+   default_static_modules="$default_static_modules rpc_rpcecho"
-+   default_shared_modules="$default_shared_modules charset_weird perfcount_test"
- 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
++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
--_ACEOF
-+#
-+# Config CPPFLAG settings for strange OS's that must be set
-+# before other tests. Do NOT invoke AC_CHECK_HEADERS within this
-+# case statement; its first reference must be unconditional.
-+#
-+case "$host_os" in
-+    *hpux*)
-+#
-+# Defines needed for HPUX support.
-+# HPUX has bigcrypt but (sometimes?) doesn't use it for
-+# password hashing - hence the USE_BOTH_CRYPT_CALLS define.
-+#
-+      case `uname -r` in
-+		*9*|*10*|*11)
-+
-+$as_echo "#define USE_BOTH_CRYPT_CALLS 1" >>confdefs.h
-+
-+		;;
-+      esac
-+      ;;
-+
-+#
-+# CRAY Unicos has broken const handling
-+       *unicos*)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabling const" >&5
-+$as_echo "disabling const" >&6; }
-+	  CPPFLAGS="$CPPFLAGS -Dconst="
-+	  ;;
-+
-+#
-+# AIX4.x doesn't even admit to having large
-+# files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set.
-+#
-+    *aix4*)
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+      CPPFLAGS="$CPPFLAGS -D_LARGE_FILES"
-+
-+$as_echo "#define _LARGE_FILES 1" >>confdefs.h
-+
-+      ;;
-+#
-+# Defines needed for Solaris 2.6/2.7 aka 7.0 to make it admit
-+# to the existance of large files..
-+# Note that -D_LARGEFILE64_SOURCE is different from the Sun
-+# recommendations on large file support, however it makes the
-+# compile work using gcc 2.7 and 2.8, whereas using the Sun
-+# recommendation makes the compile fail on gcc2.7. JRA.
-+#
-+# Solaris uses SYSV printing.  Make sure to set that here.  --jerry
-+#
-+	*solaris*)
-+
-+$as_echo "#define SYSV 1" >>confdefs.h
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
+ _ACEOF
  
--fi
-+		case `uname -r` in
-+			5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
-+	  			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no large file support" >&5
-+$as_echo "no large file support" >&6; }
-+				;;
-+			5.*)
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling large file support" >&5
-+$as_echo "enabling large file support" >&6; }
-+			if test "$ac_cv_c_compiler_gnu" = yes; then
-+				${CC-cc} -v >conftest.c 2>&1
-+				ac_cv_gcc_compiler_version_number=`grep 'gcc version' conftest.c`
-+				rm -fr conftest.c
-+				case "$ac_cv_gcc_compiler_version_number" in
-+					*"gcc version 2.6"*|*"gcc version 2.7"*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-+						LDFLAGS="$LDFLAGS -lthread"
+ fi
  
 -# and glibc has setresuid under linux but the function does
 -# nothing until kernel 2.1.44! very dumb.
@@ -39233,11 +38666,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "${samba_cv_have_setresuid+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresuid=cross
--else
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -39246,7 +38680,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -#include <errno.h>
 -main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define size_t unsigned int
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39274,59 +38711,56 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+						;;
-+					*)
-+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+						LDFLAGS="$LDFLAGS -lthread"
  
 -( exit $ac_status )
 -samba_cv_have_setresuid=no
 -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
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+ fi
  
++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
++if test "x$ac_cv_type_pid_t" = x""yes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
++_ACEOF
  
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresuid" >&5
 -$as_echo "$samba_cv_have_setresuid" >&6; }
 -if test x"$samba_cv_have_setresuid" = x"yes"; then
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESUID 1
--_ACEOF
-+						;;
-+				esac
-+			else
-+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-+				LDFLAGS="$LDFLAGS -lthread"
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_RDEV 1
+ _ACEOF
  
--fi
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++
+ fi
  
 -# Do the same check for setresguid...
-+
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-+
-+			fi
-+			;;
-+		esac
-+		;;
- #
+-#
 -{ $as_echo "$as_me:$LINENO: checking for real setresgid" >&5
 -$as_echo_n "checking for real setresgid... " >&6; }
 -if test "${samba_cv_have_setresgid+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+# IRIX uses SYSV printing.  Make sure to set that here
-+#
-+	*irix*)
  
 -    if test "$cross_compiling" = yes; then
 -  samba_cv_have_setresgid=cross
--else
++ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
++if test "x$ac_cv_type_ino_t" = x""yes; then :
++
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -39336,7 +38770,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#include <unistd.h>
 -#include <errno.h>
 -main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define ino_t unsigned
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -39364,70 +38801,52 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define SYSV 1" >>confdefs.h
  
 -( exit $ac_status )
 -samba_cv_have_setresgid=no
 -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
-+		;;
-+	*freebsd*|*dragonfly*)
+ fi
  
-+$as_echo "#define FREEBSD 1" >>confdefs.h
++ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
++if test "x$ac_cv_type_loff_t" = x""yes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define loff_t off_t
++_ACEOF
  
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_have_setresgid" >&5
 -$as_echo "$samba_cv_have_setresgid" >&6; }
 -if test x"$samba_cv_have_setresgid" = x"yes"; then
-+		;;
-+#
-+# VOS may need to have POSIX support and System V compatibility enabled.
-+#
-+    *vos*)
-+    case "$CPPFLAGS" in
-+	  *-D_POSIX_C_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_SETRESGID 1
--_ACEOF
-+$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
++ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
++if test "x$ac_cv_type_offset_t" = x""yes; then :
++
++else
++
++cat >>confdefs.h <<_ACEOF
++#define offset_t loff_t
+ _ACEOF
  
--fi
-+		;;
-+    esac
-+    case "$CPPFLAGS" in
-+	  *-D_SYSV*|*-D_SVID_SOURCE*)
-+		;;
-+	  *)
-+		CPPFLAGS="$CPPFLAGS -D_SYSV"
+ fi
  
 -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
--$as_echo_n "checking for working memcmp... " >&6; }
--if test "${ac_cv_func_memcmp_working+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_func_memcmp_working=no
-+$as_echo "#define _SYSV 1" >>confdefs.h
 +
-+    esac
-+    ;;
-+#
-+# Tests needed for SINIX large file support.
-+#
-+    *sysv4*)
-+      if test $host = mips-sni-sysv4 ; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  SINIX_LFS_SUPPORT=cross
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+ $as_echo_n "checking for working memcmp... " >&6; }
+-if test "${ac_cv_func_memcmp_working+set}" = set; then
++if test "${ac_cv_func_memcmp_working+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_memcmp_working=no
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -39436,44 +38855,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--
--  /* Some versions of memcmp are not 8-bit clean.  */
--  char c0 = '\100', c1 = '\200', c2 = '\201';
--  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
--    return 1;
--
--  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
--     or more and with at least one buffer not starting on a 4-byte boundary.
--     William Lewis provided this test program.   */
--  {
--    char foo[21];
--    char bar[21];
--    int i;
--    for (i = 0; i < 4; i++)
--      {
--	char *a = foo + i;
--	char *b = bar + i;
--	strcpy (a, "--------01111111");
--	strcpy (b, "--------10000000");
--	if (memcmp (a, b, 16) >= 0)
--	  return 1;
--      }
--    return 0;
--  }
- 
--  ;
--  return 0;
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
+ $ac_includes_default
+ int
+@@ -37950,44 +8436,17 @@
+   return 0;
  }
  _ACEOF
 -rm -f conftest$ac_exeext
@@ -39498,9 +38883,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_memcmp_working=yes
 +if ac_fn_c_try_run "$LINENO"; then :
-+  SINIX_LFS_SUPPORT=yes
+   ac_cv_func_memcmp_working=yes
  else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
@@ -39508,7 +38892,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -( exit $ac_status )
 -ac_cv_func_memcmp_working=no
-+  SINIX_LFS_SUPPORT=no
++  ac_cv_func_memcmp_working=no
  fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -39516,56 +38900,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
  
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$SINIX_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE $CPPFLAGS"
- 
--fi
+-
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
--$as_echo "$ac_cv_func_memcmp_working" >&6; }
--test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
--  *" memcmp.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-- ;;
--esac
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+ $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 @@
  
-+          CFLAGS="`getconf LFS64_CFLAGS` $CFLAGS"
-+          LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
-+          LIBS="`getconf LFS64_LIBS` $LIBS"
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SINIX_LFS_SUPPORT" >&5
-+$as_echo "$SINIX_LFS_SUPPORT" >&6; }
-+      fi
-+    ;;
  
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu | kopensolaris*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
  
 -###############################################
 -# Readline included by default unless explicitly asked not to
 -test "${with_readline+set}" != "set" && with_readline=yes
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
+-
 -# 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; }
- 
+-
 -# 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; }
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
- 
- 
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
- 
-+	;;
- 
+-
+-
+-
+-
 -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`
@@ -39579,208 +38942,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
-+# Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
-+#
-+    *linux*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+       if test "$cross_compiling" = yes; then :
-+  LINUX_LFS_SUPPORT=cross
- 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>
--_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
-+#include <unistd.h>
-+#include <sys/utsname.h>
-+#include <string.h>
-+#include <stdlib.h>
-+main() {
-+#if _LFS64_LARGEFILE == 1
-+       struct utsname uts;
-+       char *release;
-+       int major, minor;
- 
--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; }
-+       /* Ensure this is glibc 2.2 or higher */
-+#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-+       int libc_major = __GLIBC__;
-+       int libc_minor = __GLIBC_MINOR__;
- 
--# 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 (libc_major < 2)
-+              exit(1);
-+       if (libc_minor < 2)
-+              exit(1);
-+#endif
- 
--  ac_header_preproc=no
--fi
-+       /* Ensure this is kernel 2.4 or higher */
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+       uname(&uts);
-+       release = strdup(uts.release);
-+       major = atoi(strsep(&release, "."));
-+       minor = atoi(strsep(&release, "."));
- 
--# 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
-+       if (major > 2 || (major == 2 && minor > 3))
-+               exit(0);
-+       exit(1);
-+#else
-+       exit(1);
-+#endif
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  LINUX_LFS_SUPPORT=yes
- else
--  eval "$as_ac_Header=\$ac_header_preproc"
-+  LINUX_LFS_SUPPORT=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
--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
-+	CPPFLAGS="$old_CPPFLAGS"
-+	if test x$LINUX_LFS_SUPPORT = xyes ; then
-+		CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
- 
--done
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.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_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
@@ -39816,625 +38977,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define _FILE_OFFSET_BITS 64" >>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; }
-+$as_echo "#define _GNU_SOURCE 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
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+	fi
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINUX_LFS_SUPPORT" >&5
-+$as_echo "$LINUX_LFS_SUPPORT" >&6; }
-+	;;
- 
--  ac_header_preproc=no
--fi
-+#
-+# MacOS X is the *only* system that uses compose character in utf8. This
-+# is so horribly broken....
-+#
-+    *darwin*)
- 
--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 BROKEN_UNICODE_COMPOSE_CHARACTERS 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
-+
-+# Add a system specific charset module.
-+	default_shared_modules="$default_shared_modules charset_macosxfs"
-+
-+	;;
-+    *hurd*)
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LFS support" >&5
-+$as_echo_n "checking for LFS support... " >&6; }
-+        old_CPPFLAGS="$CPPFLAGS"
-+        CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
-+        if test "$cross_compiling" = yes; then :
-+  GLIBC_LFS_SUPPORT=cross
- 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; }
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--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
-+#include <unistd.h>
-+main () {
-+#if _LFS64_LARGEFILE == 1
-+exit(0);
-+#else
-+exit(1);
-+#endif
-+}
- _ACEOF
 -
-+if ac_fn_c_try_run "$LINENO"; then :
-+  GLIBC_LFS_SUPPORT=yes
-+else
-+  GLIBC_LFS_SUPPORT=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
-+        CPPFLAGS="$old_CPPFLAGS"
-+        if test x$GLIBC_LFS_SUPPORT = xyes ; then
-+          CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
- 
-+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
- 
- 
-+$as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+        fi
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBC_LFS_SUPPORT" >&5
-+$as_echo "$GLIBC_LFS_SUPPORT" >&6; }
-+    ;;
- 
--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
--  *\"* | *\`* | *\\*) 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
-+SAVE_CPPFLAGS="${CPPFLAGS}"
-+CPPFLAGS="${CPPFLAGS} ${SAMBA_CONFIGURE_CPPFLAGS}"
- 
--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
-+echo "LIBREPLACE_BROKEN_CHECKS: START"
- 
--  ac_header_preproc=no
-+libreplacedir=""
-+libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
-+for d in $libreplacepaths; do
-+	if test -f "$d/replace.c"; then
-+		libreplacedir="$d"
-+
-+		break;
-+	fi
-+done
-+if test x"$libreplacedir" = "x"; then
-+	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
- fi
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+LIBREPLACEOBJ="replace.o"
- 
--# 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
-+LIBREPLACEOBJ="${LIBREPLACEOBJ} snprintf.o"
- 
--      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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <signal.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 *(signal (0, 0)) (0) == 1;
-   ;
-   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"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_type_signal=int
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_Lib=no"
-+  ac_cv_type_signal=void
- 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; }
 -
--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
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
- 
--      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
-+cat >>confdefs.h <<_ACEOF
-+#define RETSIGTYPE $ac_cv_type_signal
-+_ACEOF
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$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 :
-   $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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <sys/types.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
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "uid_t" >/dev/null 2>&1; then :
-+  ac_cv_type_uid_t=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_type_uid_t=no
-+fi
-+rm -f conftest*
- 
--	ac_cv_lib_readline_rl_callback_handler_install=no
- fi
-+{ $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
-+
-+$as_echo "#define uid_t int" >>confdefs.h
-+
-+
-+$as_echo "#define gid_t int" >>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_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
-+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 :
- 
--       break
- else
--  TERMLIBS=
--fi
-+
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
-+_ACEOF
- 
- fi
- 
--done
-+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 :
- 
--    ;;
--  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; }
-+else
- 
--    # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
--    # alternate readline path
--    _ldflags=${LDFLAGS}
--    _cppflags=${CPPFLAGS}
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
-+_ACEOF
- 
--    # Add additional search path
--    LDFLAGS="-L$with_readline/lib $LDFLAGS"
--    CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+fi
- 
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
- 
-+else
- 
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
- 
--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_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_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
-+
- 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 pid_t int
- _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; }
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = 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; }
@@ -40445,240 +38995,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_RDEV 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
-+
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
-+
- 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
-+ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ino_t" = x""yes; then :
-+
- 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 ino_t unsigned
- _ACEOF
- 
- fi
- 
--done
-+ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-+if test "x$ac_cv_type_loff_t" = x""yes; then :
- 
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define loff_t off_t
-+_ACEOF
- 
--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_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-+if test "x$ac_cv_type_offset_t" = x""yes; then :
-+
- 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.  */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define offset_t loff_t
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-+$as_echo_n "checking for working memcmp... " >&6; }
-+if test "${ac_cv_func_memcmp_working+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_memcmp_working=no
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- $ac_includes_default
--#include <$ac_header>
-+int
-+main ()
-+{
-+
-+  /* Some versions of memcmp are not 8-bit clean.  */
-+  char c0 = '\100', c1 = '\200', c2 = '\201';
-+  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+    return 1;
-+
-+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+     or more and with at least one buffer not starting on a 4-byte boundary.
-+     William Lewis provided this test program.   */
-+  {
-+    char foo[21];
-+    char bar[21];
-+    int i;
-+    for (i = 0; i < 4; i++)
-+      {
-+	char *a = foo + i;
-+	char *b = bar + i;
-+	strcpy (a, "--------01111111");
-+	strcpy (b, "--------10000000");
-+	if (memcmp (a, b, 16) >= 0)
-+	  return 1;
-+      }
-+    return 0;
-+  }
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_run "$LINENO"; then :
-+  ac_cv_func_memcmp_working=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_func_memcmp_working=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: $ac_cv_func_memcmp_working" >&5
-+$as_echo "$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+  *" memcmp.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
-+esac
- 
--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`
@@ -40717,7 +39033,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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: )
@@ -40759,24 +39075,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&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
+-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 setjmp.h utime.h
++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"
@@ -40785,19 +39089,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -39440,732 +8791,430 @@
+@@ -38165,149 +8484,12 @@
+ 
  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"
-+
-+else
-+   ac_config_commands="$ac_config_commands mk-stdint.h"
- 
- 
--for ac_header in readline.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
@@ -40805,19 +39102,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
 -$as_echo "$ac_res" >&6; }
-+
-+
-+
-+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
+-else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -40827,16 +39117,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+   ac_config_commands="$ac_config_commands mk-stdbool.h"
-+
-+
-+fi
-+
-+
-+
-+
-+ac_fn_c_check_type "$LINENO" "bool" "ac_cv_type_bool" "
- $ac_includes_default
+-$ac_includes_default
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -40861,21 +39142,174 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#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; }
+-
+-# 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
+ _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
+-  *\"* | *\`* | *\\*) 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; }
++   ac_config_commands="$ac_config_commands mk-stdint.h"
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -40909,16 +39343,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "
-+$ac_includes_default
-+#ifdef HAVE_STDBOOL_H
-+#include <stdbool.h>
-+#endif
-+
-+"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
-+
-+$as_echo "#define HAVE__Bool 1" >>confdefs.h
  
 -  ac_header_preproc=no
  fi
@@ -40926,6 +39350,753 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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: )
+-    { $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 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 <stdbool.h>
++#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 <stdbool.h>
++#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
+-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
+-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
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_MMAP=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <$ac_header>
++#include "$libreplacedir/test/shared_mmap.c"
+ _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
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_HAVE_MMAP=yes
+ 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
+-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`
++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
+@@ -38793,149 +8598,40 @@
+ 
+ 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`
++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 -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
+ 
++done
+ 
+-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>
++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
+-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.  */
++
++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
+-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
++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; }
++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
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -40960,54 +40131,41 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 "$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
+-  $as_echo_n "(cached) " >&6
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_MMAP=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include "$libreplacedir/test/shared_mmap.c"
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_MMAP=yes
-+else
-+  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
++done
 +
-+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
++for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
++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
 -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/syslog.h syslog.h
++for ac_func in isatty chown lchown link readlink symlink realpath
 +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
++  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_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  
 -      for termlib in ncurses curses termcap terminfo termlib; do
@@ -41015,8 +40173,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $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
++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_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-l${termlib}  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -41025,7 +40190,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -41034,23 +40198,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -extern "C"
 -#endif
 -char tgetent ();
--int
--main ()
--{
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <unistd.h>
+ int
+ main ()
+ {
 -return tgetent ();
--  ;
--  return 0;
--}
-+done
-+
-+for ac_header in sys/time.h time.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
++int i = (int)setresuid
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -41074,18 +40232,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_Lib=yes"
--else
++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
- 
+-
 -	eval "$as_ac_Lib=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
 -LIBS=$ac_check_lib_save_LIBS
--fi
++  ac_cv_have_setresuid_decl=no
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Lib'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -41094,41 +40255,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
 -  TERMLIBS="-l${termlib}"; break
-+done
-+
-+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
-+
++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
  
 -      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
++$as_echo "#define HAVE_SETRESUID_DECL 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 :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lreadline $TERMLIBS $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+done
-+
-+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
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -41140,23 +40291,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -extern "C"
 -#endif
 -char rl_callback_handler_install ();
--int
--main ()
--{
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <unistd.h>
+ int
+ main ()
+ {
 -return rl_callback_handler_install ();
--  ;
--  return 0;
--}
-+fi
-+
-+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
++int i = (int)setresgid
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -41183,28 +40328,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
- 
+-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
-+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_func" | $as_tr_cpp` 1
-+_ACEOF
-+
- fi
+-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
@@ -41212,40 +40344,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       TERMCPPFLAGS="-I$with_readline/include"
 -       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
 -       TERMLIBS="-lreadline $TERMLIBS"
-+done
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBREADLINE 1
-+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
- 
+-_ACEOF
+-
 -       break
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_have_setresgid_decl=yes
+ else
 -  TERMLIBS= CPPFLAGS=$_cppflags
- fi
-+done
- 
 -fi
-+for ac_func in waitpid 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
- 
-+fi
- done
- 
+-
++  ac_cv_have_setresgid_decl=no
+ fi
+-
+-done
+-
 -
 -    LDFLAGS=$_ldflags
 -    ;;
@@ -41253,31 +40368,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 -$as_echo "no" >&6; }
-+for ac_func in pread pwrite strndup strcasestr strtok_r mkdtemp dup2
-+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 core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+done
++{ $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
  
-+for ac_func in isatty chown lchown link readlink symlink realpath
-+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
++$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
  
-+fi
-+done
++ fi
  
  
 -# The readline API changed slightly from readline3 to readline4, so
@@ -41286,9 +40386,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 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 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
  else
 -  ac_check_lib_save_LIBS=$LIBS
@@ -41309,12 +40409,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -char rl_completion_matches ();
 +    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+#include <unistd.h>
++#include <errno.h>
  int
  main ()
  {
 -return rl_completion_matches ();
-+int i = (int)setresuid
++int i = (int)errno
    ;
    return 0;
  }
@@ -41342,13 +40442,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 -  ac_cv_lib_readline_rl_completion_matches=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_setresuid_decl=yes
++  ac_cv_have_errno_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_setresuid_decl=no
++  ac_cv_have_errno_decl=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -41360,14 +40460,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_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: $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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NEW_LIBREADLINE 1
 -_ACEOF
-+$as_echo "#define HAVE_SETRESUID_DECL 1" >>confdefs.h
++$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
  
 -fi
 + fi
@@ -41377,9 +40477,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $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 setresgid declaration" >&5
-+$as_echo_n "checking for setresgid declaration... " >&6; }
-+if test "${ac_cv_have_setresgid_decl+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_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -41389,20 +40489,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <readline/readline.h>
- 
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <unistd.h>
- int
- main ()
- {
+-
+-int
+-main ()
+-{
 -#ifndef rl_event_hook
 -  (void) rl_event_hook;
 -#endif
--
-+int i = (int)setresgid
-   ;
-   return 0;
+ 
+-  ;
+-  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 <stdlib.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <unistd.h>
++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
 -rm -f conftest.$ac_objext
@@ -41424,48 +40538,59 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_compile "$LINENO"; then :
-+  ac_cv_have_setresgid_decl=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
 -
 -	ac_cv_have_decl_rl_event_hook=no
-+  ac_cv_have_setresgid_decl=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
  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
+ 
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_RL_EVENT_HOOK 1
 -_ACEOF
--
--
++$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
+ 
++fi
+ 
 -else
--  cat >>confdefs.h <<_ACEOF
++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 HAVE_DECL_RL_EVENT_HOOK 0
--_ACEOF
-+{ $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
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
  
-+$as_echo "#define HAVE_SETRESGID_DECL 1" >>confdefs.h
- 
--fi
-+ fi
+-
+ fi
  
++done
  
 -{ $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 "$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
+-  $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
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lreadline $TERMLIBS $LIBS"
@@ -41475,6 +40600,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++  ac_have_decl=0
++fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -41483,17 +40610,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -extern "C"
 -#endif
 -char history_list ();
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <errno.h>
- int
- main ()
- {
+-int
+-main ()
+-{
 -return history_list ();
-+int i = (int)errno
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_SNPRINTF $ac_have_decl
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -41517,36 +40642,61 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_readline_history_list=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_errno_decl=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_cv_lib_readline_history_list=no
-+  ac_cv_have_errno_decl=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 -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
++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
 -{ $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: $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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_HISTORY_LIST 1
--_ACEOF
-+$as_echo "#define HAVE_ERRNO_DECL 1" >>confdefs.h
++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
  
--fi
-+ fi
+ fi
++done
  
  
 -###############################################
@@ -41554,9 +40704,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 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 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
 -  ac_func_search_save_LIBS=$LIBS
@@ -41580,26 +40730,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -return yp_get_default_domain ();
 -  ;
 -  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 <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+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
+-}
+-_ACEOF
 -for ac_lib in '' nsl; do
 -  if test -z "$ac_lib"; then
 -    ac_res="none required"
@@ -41629,230 +40761,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_search_yp_get_default_domain=$ac_res
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--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_yp_get_default_domain+set}" = set; then
--  break
--fi
--done
--if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
--  :
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=yes
- else
--  ac_cv_search_yp_get_default_domain=no
-+  libreplace_cv_HAVE_SECURE_MKSTEMP=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
- 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"
- 
- 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
- 
-+$as_echo "#define HAVE_SECURE_MKSTEMP 1" >>confdefs.h
- 
--for ac_func in yp_get_default_domain
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
-+fi
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+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
-+_ACEOF
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--   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
-+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
-+  ac_have_decl=0
-+fi
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_SNPRINTF $ac_have_decl
- _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"
-+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
- 
--	eval "$as_ac_var=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 -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+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
--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_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
-@@ -40174,414 +9223,266 @@
- done
- 
- 
--# Check if we have execl, if not we need to compile smbrun.
--
--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 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
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
 +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.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
 +#include <sys/types.h>
 +#include <stdio.h>
 +#include <stdarg.h>
@@ -41864,121 +40780,66 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +       long long l = 1234567890;
 +       l *= 100;
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
+-fi
 +       va_start(ap, format);
 +       len = vsnprintf(buf, 0, format, ap);
 +       va_end(ap);
 +       if (len != 5) exit(1);
  
--#undef $ac_func
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_yp_get_default_domain+set}" = set; then
+-  break
+-fi
+-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);
- 
--/* 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 (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(3);
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
++
 +       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
--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"
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_HAVE_C99_VSNPRINTF=yes
  else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
+-  ac_cv_search_yp_get_default_domain=no
 +  libreplace_cv_HAVE_C99_VSNPRINTF=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 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
  fi
--done
- 
--if test x"$ac_cv_func_execl" = x"no"; then
--    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
- 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"
++
++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
+ fi
  
  
--
--
--
--for ac_func in getcwd fchown chmod fchmod mknod mknod64
+-for ac_func in yp_get_default_domain
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -42105,9 +40966,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 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
@@ -42118,18 +40977,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 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
  
--fi
--done
 +$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 strtol
+-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
@@ -42247,18 +41110,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -	eval "$as_ac_var=no"
 +  libreplace_cv_HAVE_func_MACRO=no
- 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
 +{ $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
-+$as_echo "#define HAVE_func_MACRO 1" >>confdefs.h
-+
 +    fi
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
@@ -42281,21 +41144,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-+
- done
+-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 :
  
--for ac_func in strchr chflags
++$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_n "(cached) " >&6
--else
++ { $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
@@ -42305,22 +41181,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+$as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#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.  */
@@ -42334,11 +41208,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+ { $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 confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
@@ -42413,14 +41282,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40590,102 +9491,56 @@
+@@ -39892,99 +9211,56 @@
  done
  
  
--
--
--
--for ac_func in getrlimit fsync fdatasync setpgid
+-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
@@ -42510,9 +41376,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -	eval "$as_ac_var=no"
 +  ac_cv_have_environ_decl=no
-+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
 +{ $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
@@ -42552,23 +41418,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -40694,255 +9549,183 @@
+@@ -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");
  
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
- 
--for ac_func in setsid glob strpbrk crypt16 getauthuid
+-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
@@ -42578,35 +41439,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+fi
-+rm -f conftest.err conftest.$ac_ext
++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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++$as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#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
++fi
++rm -f conftest.err conftest.$ac_ext
  
 -#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
@@ -42620,12 +41476,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    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 <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
- #endif
--
++#endif
 +#include <signal.h>
  int
  main ()
@@ -42665,8 +41530,130 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
 +  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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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 <unistd.h>
++#ifdef HAVE_FCNTL_H
++#include <fcntl.h>
+ #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 \
@@ -42683,79 +41670,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  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_sig_atomic_t" >&5
-+$as_echo "$libreplace_cv_sig_atomic_t" >&6; }
-+if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then
- 
--fi
--done
-+$as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h
- 
-+fi
- 
- 
-+{ $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 confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+#include <unistd.h>
-+#ifdef HAVE_FCNTL_H
-+#include <fcntl.h>
-+#endif
-+int
-+main ()
-+{
-+int fd = open("/dev/null", O_DIRECT);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
-+else
-+  libreplace_cv_HAVE_OPEN_O_DIRECT=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_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
+ fi
+-done
  
  
--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 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
--  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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
++  $as_echo_n "(cached) " >&6
++else
  
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
 +	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <sys/types.h>
@@ -42778,16 +41708,49 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +$as_echo "$libreplace_cv_volatile" >&6; }
 +if test x"$libreplace_cv_volatile" = x"yes"; then
  
++$as_echo "#define HAVE_VOLATILE 1" >>confdefs.h
+ 
++fi
+ 
+-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
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++# filesys
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; 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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+$as_echo "#define HAVE_VOLATILE 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.  */
@@ -42801,17 +41764,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+# filesys
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <$ac_hdr>
  
@@ -42884,33 +41836,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
- 
 -
 -
 -
 -
--for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
+-
+-
+-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
-+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
+-  $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
-+  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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -42919,7 +41864,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
@@ -42927,10 +41872,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -40950,106 +9733,56 @@
+@@ -40348,106 +9453,56 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43032,7 +41988,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+-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
@@ -43071,7 +42027,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41057,168 +9790,148 @@
+@@ -40455,169 +9510,148 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -43186,7 +42142,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
  
 +done
@@ -43203,7 +42159,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +fi
  
--for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
++done
+ 
+ 
+-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
@@ -43213,15 +42172,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++# 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
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -43232,19 +42199,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#else
 -# include <assert.h>
 -#endif
-+# 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
  
 -#undef $ac_func
-+fi
++done
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -43259,8 +42217,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+done
-+
 +{ $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 :
@@ -43312,9 +42268,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -	eval "$as_ac_var=no"
 +  ac_cv_header_time=no
-+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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
 +$as_echo "$ac_cv_header_time" >&6; }
 +if test $ac_cv_header_time = yes; then
@@ -43342,7 +42298,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -41227,210 +9940,170 @@
+@@ -40626,212 +9660,170 @@
  done
  
  
@@ -43351,7 +42307,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
+-
+-
+-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
@@ -43509,7 +42467,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +	int i;
  
--for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
+-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
@@ -43670,19 +42628,54 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -41439,200 +10112,139 @@
+@@ -40840,205 +9832,139 @@
  done
  
  
--for ac_func in getpwent_r
++ { $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 <unistd.h>
++	#include <pwd.h>
+ 
++int
++main ()
++{
++int i = (int)getpwent_r
++  ;
++  return 0;
++}
++_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
+ 
++$as_echo "#define HAVE_GETPWENT_R_DECL 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 "$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 "$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 >conftest.$ac_ext <<_ACEOF
@@ -43690,25 +42683,29 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++		$ac_includes_default
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++	#include <unistd.h>
++	#include <pwd.h>
  
 -#undef $ac_func
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++		struct passwd *getpwent_r(struct passwd *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
@@ -43723,17 +42720,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+	#include <unistd.h>
-+	#include <pwd.h>
++	#ifndef HAVE_GETPWENT_R_DECL
++	#error missing getpwent_r prototype
++	#endif
++	return NULL;
++
++		}
  
- int
- main ()
- {
+-int
+-main ()
+-{
 -return $ac_func ();
-+int i = (int)getpwent_r
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -43758,19 +42758,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_getpwent_r_decl=yes
++
++		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_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_getpwent_r_decl=no
- fi
--
+-fi
++		ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_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"'`
@@ -43781,62 +42782,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_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 <unistd.h>
-+	#include <pwd.h>
-+
-+		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 :
-+
-+		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
+-_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_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 getdents64
+ 
+-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
-+
 +$as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
 +
 +
@@ -43970,14 +42931,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -41641,244 +10253,210 @@
+@@ -41047,345 +9973,221 @@
  done
  
  
--
--
--
--for ac_func in setenv strcasecmp fcvt fcvtl
+-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
@@ -44127,7 +43085,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  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; }
@@ -44137,7 +43095,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
  
  
--for ac_func in syslog vsyslog timegm
+-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
@@ -44240,36 +43198,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	eval "$as_ac_var=no"
 +		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
-+
-+fi
-+{ $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
++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
-+
-+# locale
-+for ac_header in ctype.h locale.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
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -44278,27 +43213,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+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 :
 +
 +
-+# glob
-+for ac_header in fnmatch.h
++$as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
++
++
++fi
++
++for ac_func in getgrouplist
 +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 :
++  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
-+#define HAVE_FNMATCH_H 1
++#define HAVE_GETGROUPLIST 1
  _ACEOF
  
  fi
-+
  done
  
  
-+# shmem
-+for ac_header in sys/ipc.h sys/mman.h sys/shm.h
++# locale
++for ac_header in ctype.h locale.h langinfo.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"
@@ -44308,7 +43247,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
--for ac_func in setlocale nl_langinfo
++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
@@ -44318,8 +43259,110 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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.  */
+-#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
++done
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-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
+ 
+-	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
 +
 +
@@ -44330,32 +43373,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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
+   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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+fi
-+
-+done
+ fi
 +
+ done
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
  
--#undef $ac_func
+ 
+-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
 +save_LIBS="$LIBS"
 +LIBS=""
 +
@@ -44363,15 +43397,36 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +{ $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
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
-@@ -41886,100 +10464,85 @@
+@@ -41393,100 +10195,85 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44528,7 +43583,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -41987,1000 +10550,611 @@
+@@ -41494,966 +10281,612 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -44643,7 +43698,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  libreplace_cv_shl=yes
 +fi
 +done
-+
+ 
  
 +{ $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; }
@@ -44653,10 +43708,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
-+		$ac_includes_default
- 
 -ac_check_lib_ext_save_LIBS=$LIBS
 -LIBS="-lrt $LIBS  $LIBS"
++		$ac_includes_default
+ 
 +	#include <dlfcn.h>
  
 +		void *dlopen(const char* filename, unsigned int flags)
@@ -44664,8 +43719,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +	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
@@ -44673,13 +43726,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
++		}
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -44695,7 +43746,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -44719,6 +43770,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 -  ac_cv_lib_ext_rt_nanosleep=yes;
 -		  ac_cv_lib_ext_rt=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
++
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -44758,7 +43813,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define HAVE_LIBRT 1
 -_ACEOF
 +if test x"${libreplace_cv_dlfcn}" = x"yes";then
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
 +fi
  
 -		case "$LIBS" in
@@ -44785,20 +43840,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +if test x"$libreplace_cv_HAVE_GETPASS" = x"yes" -a x"$libreplace_cv_HAVE_GETPASSPHRASE" = x"yes"; then
  
-+$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
- 
- 
-+$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
- 
--for ac_func in mlock munlock mlockall munlockall
+-for ac_func in utimensat
 -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
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -44808,7 +43857,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
++$as_echo "#define REPLACE_GETPASS_BY_GETPASSPHRASE 1" >>confdefs.h
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
@@ -44819,17 +43869,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#else
 -# include <assert.h>
 -#endif
-+{ $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 :
-+  $as_echo_n "(cached) " >&6
-+else
++$as_echo "#define REPLACE_GETPASS 1" >>confdefs.h
  
 -#undef $ac_func
-+SAVE_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
++else
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -44844,6 +43888,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
++{ $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 :
++  $as_echo_n "(cached) " >&6
++else
++
++SAVE_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
 +#include "confdefs.h"
 +#define NO_CONFIG_H
 +#include "$libreplacedir/getpass.c"
@@ -44886,12 +43941,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
--
++  libreplace_cv_REPLACE_GETPASS=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++CPPFLAGS="$SAVE_CPPFLAGS"
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+  libreplace_cv_REPLACE_GETPASS=no
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -44903,60 +43960,93 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_ext
-+CPPFLAGS="$SAVE_CPPFLAGS"
- 
- fi
--done
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_GETPASS" >&5
 +$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} getpass.o"
-+fi
++
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/getpass.o"
+ fi
+-done
  
 +fi
  
--for ac_func in memalign posix_memalign hstrerror
++{ $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
 -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 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
+-  $as_echo_n "(cached) " >&6
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_STRPTIME_OK=yes
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++  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
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++fi
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#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
@@ -44971,16 +44061,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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"
++#######################################
++# 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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
  
--int
--main ()
--{
++		#include <stdio.h>
++		#ifdef HAVE_DIRECT_H
++		#include <direct.h>
++		#endif
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
++
++			mkdir("foo",0777);
++			return 0;
++
+   ;
+   return 0;
+ }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -45004,30 +44109,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $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
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_mkdir_has_mode="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"
++  libreplace_cv_mkdir_has_mode="no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  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 "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_mkdir_has_mode" >&5
++$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
 +
-+$as_echo "#define REPLACE_STRPTIME 1" >>confdefs.h
++if test "$libreplace_cv_mkdir_has_mode" = "yes"
++then
++
++$as_echo "#define HAVE_MKDIR_MODE 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} strptime.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -45037,212 +44140,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $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_header in sys/mman.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
-+#######################################
-+# 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
--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>
--_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
-+		#include <stdio.h>
-+		#ifdef HAVE_DIRECT_H
-+		#include <direct.h>
-+		#endif
-+int
-+main ()
-+{
- 
--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; }
-+			mkdir("foo",0777);
-+			return 0;
- 
--# 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>
-+  ;
-+  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_compile "$LINENO"; then :
-+  libreplace_cv_mkdir_has_mode="yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
-+  libreplace_cv_mkdir_has_mode="no"
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_mkdir_has_mode" >&5
-+$as_echo "$libreplace_cv_mkdir_has_mode" >&6; }
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+if test "$libreplace_cv_mkdir_has_mode" = "yes"
-+then
- 
--# 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; }
-+$as_echo "#define HAVE_MKDIR_MODE 1" >>confdefs.h
- 
- 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 timegm
 +do :
 +  ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
 +if test "x$ac_cv_func_timegm" = 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
 +#define HAVE_TIMEGM 1
  _ACEOF
  
 +else
-+  LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"
++  LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"
  fi
--
  done
  
--# setbuffer, shmget, shm_open are needed for smbtorture
--
  
--for ac_func in shmget shm_open
+-
+-
+-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
@@ -45408,80 +44323,45 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  done
  
 -
--
--for ac_func in gettext dgettext
+-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 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
--  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
 -cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+		$ac_includes_default
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+	#include <dirent.h>
- 
--#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"
+-$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_link") 2>conftest.er1
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
@@ -45490,57 +44370,143 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
--       }; then
--  eval "$as_ac_var=yes"
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
-+
- else
+-       } && 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
  
--	eval "$as_ac_var=no"
-+		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
-+
- fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	ac_header_compiler=no
+-fi
++		$ac_includes_default
  
--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'}
+-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 <dirent.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
+-  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
++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"
+-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; }
--as_val=`eval 'as_val=${'$as_ac_var'}
++
++		ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
+ 
+ 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_func" | $as_tr_cpp` 1
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
 +{ $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 :
-+
-+
-+$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
-+
  
- fi
 -done
  
+-# setbuffer, shmget, shm_open are needed for smbtorture
++$as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
  
--for ac_func in strupr
+ 
+-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
 -$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; }
 +if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
@@ -45656,33 +44622,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
  
  
--# Find a method of generating a stack trace
 +$as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
  
- 
-+fi
- 
--for ac_header in execinfo.h libexc.h libunwind.h
+-for ac_func in gettext dgettext
 -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
++
++fi
++
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
 +$as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
 +if test "${libreplace_cv_READDIR_GETDIRENTRIES+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
@@ -45696,272 +44652,65 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
-+
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
 +#define _LIBREPLACE_REPLACE_H
 +#include "$libreplacedir/repdir_getdirentries.c"
 +#define test_readdir_os2_delete main
 +#include "$libreplacedir/test/os2_delete.c"
- _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
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  libreplace_cv_READDIR_GETDIRENTRIES=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++else
 +  libreplace_cv_READDIR_GETDIRENTRIES=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
-+
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_READDIR_GETDIRENTRIES" >&5
 +$as_echo "$libreplace_cv_READDIR_GETDIRENTRIES" >&6; }
- fi
++fi
 +if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = 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; }
+-/* 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 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.  */
-+
-+$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
-+	libreplace_cv_READDIR_NEEDED=no
-+fi
-+
-+#
-+# try to replace with getdents() if needed
-+#
-+if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
-+for ac_func in getdents
-+do :
-+  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-+if test "x$ac_cv_func_getdents" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETDENTS 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+done
-+
-+{ $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
-+else
-+
-+	if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run test program while cross compiling
-+See \`config.log' for more details." "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#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_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_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_preproc=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 conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define REPLACE_READDIR 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"
-+
-+$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
-+
-+	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
-+	libreplace_cv_READDIR_NEEDED=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; }
- 
-+{ $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
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$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
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 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
-+do :
-+  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_header" | $as_tr_cpp` 1
-+#define HAVE_CRYPT_H 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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
-+$as_echo_n "checking for library containing crypt... " >&6; }
-+if test "${ac_cv_search_ext_crypt+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
 -_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+
-+ac_func_search_ext_save_LIBS=$LIBS
-+ac_cv_search_ext_crypt=no
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -42989,105 +11163,25 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char backtrace_symbols ();
-+char crypt ();
- int
- main ()
- {
--return backtrace_symbols ();
-+return crypt ();
-   ;
-   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;;
@@ -45982,63 +44731,222 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_search_backtrace_symbols=$ac_res
+-  eval "$as_ac_var=yes"
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+-	eval "$as_ac_var=no"
 -fi
--
++$as_echo "#define REPLACE_READDIR_GETDIRENTRIES 1" >>confdefs.h
+ 
 -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"
--
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_ext_crypt="none required"
+-      conftest$ac_exeext conftest.$ac_ext
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
++	libreplace_cv_READDIR_NEEDED=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
++
++#
++# try to replace with getdents() if needed
++#
++if test x"$libreplace_cv_READDIR_NEEDED" = x"yes"; then
++for ac_func in getdents
++do :
++  ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
++if test "x$ac_cv_func_getdents" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETDENTS 1
+ _ACEOF
+ 
+ fi
+ done
+ 
 -
 -
--for ac_func in backtrace_symbols
+-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
--  $as_echo_n "(cached) " >&6
--else
++{ $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
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+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
++
++	if test "$cross_compiling" = yes; then :
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run test program while cross compiling
++See \`config.log' for more details." "$LINENO" 5; }
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++#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 <limits.h>
+-#else
+-# include <assert.h>
+-#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"
+-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
++$as_echo "#define REPLACE_READDIR_GETDENTS 1" >>confdefs.h
+ 
+-	eval "$as_ac_var=no"
++	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
++	libreplace_cv_READDIR_NEEDED=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++{ $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
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$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
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ 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
++
++###############################################
++# test for where we get crypt() from
++for ac_header in crypt.h
++do :
++  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 HAVE_CRYPT_H 1
+ _ACEOF
+ 
+ fi
+-done
+ 
++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 library containing crypt" >&5
++$as_echo_n "checking for library containing crypt... " >&6; }
++if test "${ac_cv_search_ext_crypt+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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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.
@@ -46050,12 +44958,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#else
 -# include <assert.h>
 -#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.  */
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -43095,1082 +11189,653 @@
+@@ -42461,216 +10894,170 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -46102,8 +45014,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
@@ -46125,7 +45062,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 +else
-+   LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o"
++   LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -46136,7 +45073,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -   if test "x$as_val" = x""yes; then
 +
 +
-+for ac_func in syslog printf memset memcpy
++for ac_func in printf memset memcpy
 +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"
@@ -46152,16 +45089,46 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  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
+-# Find a method of generating a stack trace
+-
++echo "LIBREPLACE_BROKEN_CHECKS: END"
+ 
++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
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lexc  $LIBS"
+-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.  */
-+echo "LIBREPLACE_BROKEN_CHECKS: END"
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
++  as_fn_error "Required function not found" "$LINENO" 5
++fi
++done
 +
 +
 +echo "LIBREPLACE_NETWORK_CHECKS: START"
@@ -46181,28 +45148,47 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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.  */
- 
--/* 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 ();
--int
--main ()
--{
--return trace_back_stack ();
--  ;
--  return 0;
--}
-+fi
-+
-+done
-+
+-#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"
@@ -46210,7 +45196,188 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_NETINET_IN_SYSTM_H 1
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
+-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 <sys/types.h>
++	#ifdef HAVE_NETINET_IN_H
++	#include <netinet/in.h>
++	#endif
++	#ifdef HAVE_NETINET_IN_SYSTM_H
++	#include <netinet/in_systm.h>
++	#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 <sys/socket.h>
++		#endif
++		#include <net/if.h>
++		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
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -46231,97 +45398,58 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_exc_trace_back_stack=yes
--else
+-  ac_cv_search_backtrace_symbols=$ac_res
++if ac_fn_c_try_compile "$LINENO"; then :
++  libreplace_cv_USABLE_NET_IF_H=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
++  libreplace_cv_USABLE_NET_IF_H=no
  
--	ac_cv_lib_exc_trace_back_stack=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
--LIBS=$ac_check_lib_save_LIBS
-+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 <sys/types.h>
-+	#ifdef HAVE_NETINET_IN_H
-+	#include <netinet/in.h>
-+	#endif
-+	#ifdef HAVE_NETINET_IN_SYSTM_H
-+	#include <netinet/in_systm.h>
-+	#endif
-+
-+"
-+if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_NETINET_IP_H 1
-+_ACEOF
-+
+-      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_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
+-{ $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
 +
-+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 HAVE_LIBEXC 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--  LIBS="-lexc $LIBS"
-+fi
-+
-+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
++$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
  
  fi
  
-+done
  
--# check for sysctlbyname for BSD systems
-+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
- 
--for ac_func in sysctlbyname
+-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
-+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 :
++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 >conftest.$ac_ext <<_ACEOF
@@ -46329,48 +45457,25 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+		$ac_includes_default
-+		#if HAVE_SYS_SOCKET_H
-+		# include <sys/socket.h>
-+		#endif
-+		#include <net/if.h>
-+		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
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+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
-+
-+$as_echo "#define HAVE_NET_IF_H 1" >>confdefs.h
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+fi
- 
+-
 -#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.  */
@@ -46385,15 +45490,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -choke me
 -#endif
  
-+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 <sys/socket.h>
  int
@@ -46475,6 +45571,245 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 <sys/socket.h>
+ 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.  */
++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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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 <netdb.h>
+ 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
+ 
+ 
 -#############################
 -# check if building with gpfs
  
@@ -46485,9 +45820,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+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; }
++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
 -fi
@@ -46513,7 +45848,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +int
 +main ()
 +{
-+sa_family_t foo;
++struct sockaddr foo;
 +  ;
 +  return 0;
 +}
@@ -46555,23 +45890,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++  ac_tr_hdr=HAVE_`echo struct sockaddr | 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 :
++	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 :
  
 -# 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 <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR 1
+ _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 HAVE_SA_FAMILY_T 1
++#define $ac_tr_hdr 1
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -46596,8 +45939,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
 -$as_echo "$ac_header_preproc" >&6; }
@@ -46635,38 +45978,77 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
++
++cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
++$as_echo_n "checking for struct sockaddr_storage... " >&6; }
++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"
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++$ac_includes_default
++
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++int
++main ()
++{
++struct sockaddr_storage foo;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "ac_cv_type_$cv=yes"
++else
++  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; }
- 
+-
++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
++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_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
++if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+ _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
  
- fi
- 
--done
--
--if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GPFS 1
--_ACEOF
- 
 -    default_shared_modules="$default_shared_modules vfs_gpfs"
--fi
+ fi
  
 -#############################################
 -# check if building on Isilon OneFS
@@ -46678,9 +46060,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+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; }
++
++
++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
@@ -46689,12 +46073,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#include <isi_version/isi_version.h>
 +
 +$ac_includes_default
-+#include <netdb.h>
++
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
  int
  main ()
  {
 -get_isilon_copyright()
-+struct addrinfo foo;
++struct sockaddr_in6 foo;
    ;
    return 0;
  }
@@ -46726,31 +46114,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	samba_cv_HAVE_ONEFS=no
 +  eval "ac_cv_type_$cv=no"
- fi
++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____%'`
++  ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | 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 :
++	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 :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_SOCKADDR_IN6 1
++_ACEOF
++
+ 
+-	samba_cv_HAVE_ONEFS=no
+ fi
  
 -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
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_ONEFS 1
 +cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_ADDRINFO 1
++#define $ac_tr_hdr 1
  _ACEOF
  
 -    default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
@@ -46758,11 +46153,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
 -    # Need to also add general libs for oplocks support
 -    save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
-+
  fi
  
 -LIBS="$save_LIBS"
-+fi
  
 -# Note that all the libunwind symbols in the API are defined to internal
 -# platform-specific version, so we must include libunwind.h before checking
@@ -46770,9 +46163,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: checking for libunwind" >&5
 -$as_echo_n "checking for libunwind... " >&6; }
 -save_LIBS=$LIBS
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
-+_ACEOF
++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 <sys/socket.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++
++"
++if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
++
++$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
  
 -UNWIND_ARCH="unknown"
 -if test x"$UNAME_I" != x"unknown"; then
@@ -46805,422 +46205,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--#ifdef HAVE_LIBUNWIND_H
--#include <libunwind.h>
--#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 <sys/socket.h>
- int
- main ()
- {
--
--	unw_context_t ctx; unw_cursor_t cur;
--	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 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
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "ac_cv_type_$cv=yes"
-+else
-+  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 :
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR 1
-+_ACEOF
-+
-+
-+fi
-+
-+fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND 1
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
- _ACEOF
- 
-+fi
- 
--	# If we have libunwind, test whether we also have libunwind-ptrace
--	# which would let us unwind arbitrary processes.
--	save_LIBS=$LIBS
- 
--for ac_header in libunwind-ptrace.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_storage" | sed 'y%./+- %__p__%'`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
-+if { as_var=ac_cv_type_$cv; 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
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+
- $ac_includes_default
--#include <$ac_header>
-+
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+int
-+main ()
-+{
-+struct sockaddr_storage foo;
-+  ;
-+  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 :
-+  eval "ac_cv_type_$cv=yes"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
-+  eval "ac_cv_type_$cv=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
-+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_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+if false; then
-+	ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
-+if test "x$ac_cv_type_struct_sockaddr_storage" = 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
--/* end confdefs.h.  */
--#include <$ac_header>
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 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; }
- 
- 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
- 
--	{ $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
--$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
--if test "${ac_cv_lib_unwind_ptrace__UPT_create+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
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lunwind-ptrace  $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 _UPT_create ();
-+$ac_includes_default
-+
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
- int
- main ()
- {
--return _UPT_create ();
-+struct sockaddr_in6 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_unwind_ptrace__UPT_create=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_unwind_ptrace__UPT_create=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_unwind_ptrace__UPT_create" >&5
--$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
--if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
--
--		LIBUNWIND_PTRACE="-lunwind-ptrace";
-+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_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
-+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 :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LIBUNWIND_PTRACE 1
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SOCKADDR_IN6 1
- _ACEOF
- 
- 
--else
--   LIBUNWIND_PTRACE=""
- fi
- 
-+fi
- 
--	LIBS=$save_LIBS
-+cat >>confdefs.h <<_ACEOF
-+#define $ac_tr_hdr 1
-+_ACEOF
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
- 
- 
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--	LIBS=$save_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 <sys/socket.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+
-+"
-+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
-+
-+$as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
- 
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
- 
--# To use libunwind-ptrace, we also need to make some ptrace system calls.
--if test x"$LIBUNWIND_PTRACE" != x"" ; then
 +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 <sys/socket.h>
@@ -47231,8 +46215,83 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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.  */
  
--for ac_header in sys/ptrace.h
+-#ifdef HAVE_LIBUNWIND_H
+-#include <libunwind.h>
+-#endif
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ 
+ int
+ main ()
+ {
+ 
+-	unw_context_t ctx; unw_cursor_t cur;
+-	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);
+ 
+   ;
+   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
++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 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
+ 
+-for ac_header in libunwind-ptrace.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
@@ -47280,17 +46339,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
  
 -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 "$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 :
++############################################
++# 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
  
@@ -47305,7 +46370,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++
++int
++main ()
++{
++
++struct sockaddr_un sunaddr;
++sunaddr.sun_family = AF_UNIX;
++
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -47324,32 +46406,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++
++		libreplace_cv_HAVE_UNIXSOCKET=yes
++
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -  ac_header_preproc=no
 -fi
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
++		libreplace_cv_HAVE_UNIXSOCKET=no
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+int
-+main ()
-+{
-+
-+struct sockaddr_in sock; sock.sin_len = sizeof(sock);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
@@ -47385,41 +46458,372 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+
-+		libreplace_cv_HAVE_SOCK_SIN_LEN=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_ext
++{ $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
 -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"
++if test "x$ac_cv_func_connect" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_CONNECT 1
+ _ACEOF
+ 
+ fi
+-
+ done
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for _UPT_create in -lunwind-ptrace" >&5
+-$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
+-if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then
++if test x"$ac_cv_func_connect" = x"no"; then
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
++
++
++
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
++$as_echo_n "checking for connect in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lunwind-ptrace  $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.
+@@ -43538,349 +11587,197 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char _UPT_create ();
++char connect ();
+ int
+ main ()
+ {
+-return _UPT_create ();
++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
+-  ac_cv_lib_unwind_ptrace__UPT_create=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_ext_nsl_s_connect=yes;
++		  ac_cv_lib_ext_nsl_s=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_unwind_ptrace__UPT_create=no
++  ac_cv_lib_ext_nsl_s_connect=no;
++		  ac_cv_lib_ext_nsl_s=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
+-LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
+-$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
+-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then
+-
+-		LIBUNWIND_PTRACE="-lunwind-ptrace";
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBUNWIND_PTRACE 1
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_s_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
++    if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
+ _ACEOF
+ 
+-
+-else
+-   LIBUNWIND_PTRACE=""
+ fi
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
++if test $ac_cv_lib_ext_nsl_s = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL_S 1
++_ACEOF
+ 
+-	LIBS=$save_LIBS
++		case "$LIBREPLACE_NETWORK_LIBS" in
++		    *-lnsl_s*)
++			;;
++		    *)
++			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
++			;;
++		esac
+ 
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
++fi
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-	LIBS=$save_LIBS
+ 
+-fi
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ 
+-# To use libunwind-ptrace, we also need to make some ptrace system calls.
+-if test x"$LIBUNWIND_PTRACE" != x"" ; then
+ 
+-for ac_header in sys/ptrace.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 connect in -lnsl" >&5
++$as_echo_n "checking for connect in -lnsl... " >&6; }
++if test "${ac_cv_lib_ext_nsl_connect+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>
++
++/* 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
+-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 :
++  ac_cv_lib_ext_nsl_connect=yes;
++		  ac_cv_lib_ext_nsl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_ext_nsl_connect=no;
++		  ac_cv_lib_ext_nsl=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+-	ac_header_compiler=no
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_connect" >&5
++$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
++    if test $ac_cv_lib_ext_nsl_connect = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_CONNECT 1
++_ACEOF
+ 
+-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
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-# 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>
++if test $ac_cv_lib_ext_nsl = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBNSL 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
++		case "$LIBREPLACE_NETWORK_LIBS" in
++		    *-lnsl*)
++			;;
++		    *)
++			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
++			;;
++		esac
+ 
+-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
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+{ $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
  
- fi
+-fi
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
 -done
-+############################################
-+# 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
  
 -    { $as_echo "$as_me:$LINENO: checking for the Linux ptrace(2) interface" >&5
 -$as_echo_n "checking for the Linux ptrace(2) interface... " >&6; }
@@ -47428,31 +46832,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++
++        { $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
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 -#if HAVE_SYS_TYPES_H
- #include <sys/types.h>
+-#include <sys/types.h>
 -#endif
 -#if HAVE_SYS_PTRACE_H
 -#include <sys/ptrace.h>
--#endif
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.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 ()
  {
- 
+-
 -		pid_t me = (pid_t)-1;
 -		ptrace(PTRACE_ATTACH, me, 0, 0);
 -		ptrace(PTRACE_DETACH, me, 0, 0);
 -		return 0;
-+struct sockaddr_un sunaddr;
-+sunaddr.sun_family = AF_UNIX;
- 
+-
++return connect ();
    ;
    return 0;
  }
@@ -47485,427 +46896,29 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LINUX_PTRACE 1
 -_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
-+		libreplace_cv_HAVE_UNIXSOCKET=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=""
-+		libreplace_cv_HAVE_UNIXSOCKET=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
-+{ $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
- 
-+for ac_func in connect
-+do :
-+  ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-+if test "x$ac_cv_func_connect" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_CONNECT 1
-+_ACEOF
- 
-+fi
-+done
- 
-+if test x"$ac_cv_func_connect" = x"no"; then
- 
- 
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $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 "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
-+$as_echo_n "checking for connect in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_connect+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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
-@@ -44178,106 +11843,65 @@
- #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_nsl_s_connect=yes;
-+		  ac_cv_lib_ext_nsl_s=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_nsl_s_connect=no;
-+		  ac_cv_lib_ext_nsl_s=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
--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_lib_ext_nsl_s_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_s_connect" >&6; }
-+    if test $ac_cv_lib_ext_nsl_s_connect = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_CONNECT 1
- _ACEOF
- 
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL_S 1
-+_ACEOF
- 
-+		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lnsl_s*)
-+			;;
-+		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
-+			;;
-+		esac
- 
- 
-+fi
- 
- 
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl $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 "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
-+$as_echo_n "checking for connect in -lnsl... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_connect+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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
-@@ -44285,101 +11909,65 @@
- #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_nsl_connect=yes;
-+		  ac_cv_lib_ext_nsl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_ext_nsl_connect=no;
-+		  ac_cv_lib_ext_nsl=no
-+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_nsl_connect" >&5
-+$as_echo "$ac_cv_lib_ext_nsl_connect" >&6; }
-+    if test $ac_cv_lib_ext_nsl_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_nsl = yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBNSL 1
- _ACEOF
- 
-+		case "$LIBREPLACE_NETWORK_LIBS" in
-+		    *-lnsl*)
-+			;;
-+		    *)
-+			LIBREPLACE_NETWORK_LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS"
-+			;;
-+		esac
-+
-+
- fi
--done
-+
-+
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
- 
- 
- 
--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 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
--  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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
-@@ -44387,102 +11975,65 @@
- #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_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
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  
--	eval "$as_ac_var=no"
+-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; }
@@ -47914,24 +46927,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#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
++fi
 +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
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSOCKET 1
- _ACEOF
++_ACEOF
  
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lsocket*)
@@ -47940,35 +46942,32 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			LIBREPLACE_NETWORK_LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
- fi
--done
  
  
++fi
++
++
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-linet $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
  
--for ac_func in __xstat __fxstat __lxstat
+ 
+-
+-
+-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 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
+-  $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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -47985,10 +46984,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#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
-@@ -44490,105 +12041,88 @@
+@@ -43888,106 +11785,88 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -48038,14 +47044,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_inet_connect=no;
 +		  ac_cv_lib_ext_inet=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_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
@@ -48057,22 +47070,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_inet_connect" >&5
-+$as_echo "$ac_cv_lib_ext_inet_connect" >&6; }
-+    if test $ac_cv_lib_ext_inet_connect = 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_CONNECT 1
- _ACEOF
- 
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
-+if test $ac_cv_lib_ext_inet = yes; then :
-+  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBINET 1
-+_ACEOF
+ _ACEOF
  
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-linet*)
@@ -48081,9 +47085,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			LIBREPLACE_NETWORK_LIBS="-linet $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
- 
- 
-+fi
++
++
+ 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" ||
@@ -48091,66 +47096,67 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +	then
  
 +$as_echo "#define HAVE_CONNECT 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 gethostbyname
 +do :
 +  ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETHOSTBYNAME 1
- _ACEOF
++_ACEOF
+ 
++fi
++done
+ 
++if test x"$ac_cv_func_gethostbyname" = x"no"; then
+ 
+ 
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lnsl_s $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 "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
++$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
++if test "${ac_cv_lib_ext_nsl_s_gethostbyname+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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+done
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+if test x"$ac_cv_func_gethostbyname" = x"no"; then
- 
+-
 -#undef $ac_func
-+
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS  $LIBS"
-+
-+
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
-+if test "${ac_cv_lib_ext_nsl_s_gethostbyname+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
-@@ -44596,107 +12130,131 @@
+@@ -43995,101 +11874,65 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -48200,14 +47206,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_nsl_s_gethostbyname=no;
 +		  ac_cv_lib_ext_nsl_s=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_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 :
++  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
@@ -48219,22 +47232,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_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 :
++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_GETHOSTBYNAME 1
- _ACEOF
- 
- fi
--done
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
-+if test $ac_cv_lib_ext_nsl_s = yes; then :
-+  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBNSL_S 1
-+_ACEOF
+ _ACEOF
  
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl_s*)
@@ -48243,22 +47247,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			LIBREPLACE_NETWORK_LIBS="-lnsl_s $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
- 
- 
-+fi
++
++
+ fi
+-done
  
  
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lnsl $LIBREPLACE_NETWORK_LIBS  $LIBS"
  
- 
- 
--for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+-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 -lnsl" >&5
 +$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
 +if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
@@ -48279,52 +47284,101 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.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
+-
+-#undef $ac_func
+ 
+ /* 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 @@
+ #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 gethostbyname ();
-+int
-+main ()
-+{
+ int
+ main ()
+ {
+-return $ac_func ();
 +return gethostbyname ();
-+  ;
-+  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_link "$LINENO"; then :
 +  ac_cv_lib_ext_nsl_gethostbyname=yes;
 +		  ac_cv_lib_ext_nsl=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_lib_ext_nsl_gethostbyname=no;
 +		  ac_cv_lib_ext_nsl=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+
-+fi
+ 
+-	eval "$as_ac_var=no"
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_nsl_gethostbyname" >&5
 +$as_echo "$ac_cv_lib_ext_nsl_gethostbyname" >&6; }
 +    if test $ac_cv_lib_ext_nsl_gethostbyname = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_GETHOSTBYNAME 1
 +_ACEOF
-+
-+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
 +LIBS=$ac_check_lib_ext_save_LIBS
 +
 +if test $ac_cv_lib_ext_nsl = yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_LIBNSL 1
-+_ACEOF
-+
+ _ACEOF
+ 
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lnsl*)
 +			;;
@@ -48334,26 +47388,53 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		esac
 +
 +
-+fi
-+
-+
+ fi
+-done
+ 
+ 
 +ac_check_lib_ext_save_LIBS=$LIBS
 +LIBS="-lsocket $LIBREPLACE_NETWORK_LIBS  $LIBS"
 +
  
--#undef $ac_func
-+
+ 
+-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 gethostbyname in -lsocket" >&5
 +$as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
 +if test "${ac_cv_lib_ext_socket_gethostbyname+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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
-@@ -44704,105 +12262,87 @@
+@@ -44200,105 +12006,87 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -48403,51 +47484,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-+
-+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
-+
-+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
-+			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
- 
--	eval "$as_ac_var=no"
--fi
-+$as_echo "#define HAVE_GETHOSTBYNAME 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"'`
@@ -48456,66 +47503,99 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+for ac_func in if_nametoindex
-+do :
-+  ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-+if test "x$ac_cv_func_if_nametoindex" = 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 :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_IF_NAMETOINDEX 1
++#define HAVE_GETHOSTBYNAME 1
  _ACEOF
  
  fi
- done
+-done
++LIBS=$ac_check_lib_ext_save_LIBS
  
-+if test x"$ac_cv_func_if_nametoindex" = x"no"; then
++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
  
  
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS  $LIBS"
++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 _close __close _fchdir __fchdir _fcntl __fcntl
+-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 "$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
+-  $as_echo_n "(cached) " >&6
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++for ac_func in if_nametoindex
++do :
++  ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
++if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_IF_NAMETOINDEX 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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> 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 <limits.h>
 -#else
 -# include <assert.h>
 -#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
-@@ -44810,2967 +12350,2216 @@
+@@ -44306,2754 +12094,2283 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -48565,21 +47645,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_ipv6_if_nametoindex=no;
 +		  ac_cv_lib_ext_ipv6=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_ipv6_if_nametoindex" >&5
-+$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
-+    if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_IF_NAMETOINDEX 1
-+_ACEOF
- 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -48591,14 +47664,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_ipv6 = yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_ipv6_if_nametoindex" >&5
++$as_echo "$ac_cv_lib_ext_ipv6_if_nametoindex" >&6; }
++    if test $ac_cv_lib_ext_ipv6_if_nametoindex = yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_LIBIPV6 1
++#define HAVE_IF_NAMETOINDEX 1
  _ACEOF
  
+ fi
+-done
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
++if test $ac_cv_lib_ext_ipv6 = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBIPV6 1
++_ACEOF
+ 
 +		case "$LIBREPLACE_NETWORK_LIBS" in
 +		    *-lipv6*)
 +			;;
@@ -48606,10 +47688,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			LIBREPLACE_NETWORK_LIBS="-lipv6 $LIBREPLACE_NETWORK_LIBS"
 +			;;
 +		esac
-+
-+
- fi
--done
+ 
+ 
++fi
 +			if test x"$ac_cv_lib_ext_ipv6_if_nametoindex" = x"yes"
 +	then
  
@@ -48632,22 +47713,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define HAVE_SOCKETPAIR 1
 +_ACEOF
  
-+else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"
-+fi
-+done
- 
- 
--for ac_func in getdents __getdents _lseek __lseek _read __read
+-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
 -$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 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
+-  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -48658,44 +47730,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++{ $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.  */
  
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#ifdef HAVE_ARPA_INET_H
-+#include <arpa/inet.h>
- #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); }
-+exit(1);}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  libreplace_cv_REPLACE_INET_NTOA=yes
-+else
-+  libreplace_cv_REPLACE_INET_NTOA=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--#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.  */
@@ -48708,11 +47769,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#endif
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_REPLACE_INET_NTOA" >&5
-+$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
- 
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <netinet/in.h>
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
+ #endif
+-
 -int
 -main ()
 -{
@@ -48720,12 +47784,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+for ac_func in inet_ntoa
-+do :
-+  ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-+if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_NTOA 1
++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); }
++exit(1);}
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -48749,24 +47811,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++  libreplace_cv_REPLACE_INET_NTOA=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	eval "$as_ac_var=no"
-+else
-+  libreplace_cv_REPLACE_INET_NTOA=yes
++  libreplace_cv_REPLACE_INET_NTOA=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
-+
-+if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
  
 -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 REPLACE_INET_NTOA 1" >>confdefs.h
-+
-+    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -48775,20 +47835,42 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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: $libreplace_cv_REPLACE_INET_NTOA" >&5
++$as_echo "$libreplace_cv_REPLACE_INET_NTOA" >&6; }
 +
++for ac_func in inet_ntoa
++do :
++  ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
++if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_INET_NTOA 1
+ _ACEOF
+ 
++else
++  libreplace_cv_REPLACE_INET_NTOA=yes
+ fi
+ 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"
++fi
+ 
 +for ac_func in inet_aton
 +do :
 +  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
 +if test "x$ac_cv_func_inet_aton" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_INET_ATON 1
- _ACEOF
++_ACEOF
  
 +else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"
- fi
- done
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"
++fi
++done
  
  
 +for ac_func in inet_ntop
@@ -48799,21 +47881,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define HAVE_INET_NTOP 1
 +_ACEOF
  
-+else
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"
-+fi
-+done
- 
- 
-+for ac_func in inet_pton
-+do :
-+  ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-+if test "x$ac_cv_func_inet_pton" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_INET_PTON 1
-+_ACEOF
- 
--for ac_func in getdirentries _write __write _fork __fork
+-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
@@ -48823,37 +47891,47 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"
++fi
++done
++
++
++for ac_func in inet_pton
++do :
++  ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
++if test "x$ac_cv_func_inet_pton" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_INET_PTON 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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"
-+fi
-+done
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++else
++  LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"
++fi
++done
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
+ 
+-#undef $ac_func
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
 +$as_echo_n "checking for getaddrinfo... " >&6; }
 +if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
  
--#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.  */
@@ -48866,12 +47944,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    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 <sys/types.h>
 +#if STDC_HEADERS
 +#include <stdlib.h>
 +#include <stddef.h>
- #endif
--
++#endif
 +#include <sys/socket.h>
 +#include <netdb.h>
  int
@@ -48948,7 +48029,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +$as_echo "#define HAVE_GAI_STRERROR 1" >>confdefs.h
 +
 +else
-+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
++	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -48986,7 +48067,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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
@@ -49087,12 +48168,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
++  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
-+  libreplace_cv_HAVE_GETIFADDRS=no
++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"'`
@@ -49104,16 +48187,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 conftest.$ac_ext
- fi
--done
--
 +{ $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
  
  
@@ -49124,7 +48203,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +fi
  
--for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+-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
@@ -49191,7 +48270,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -#undef $ac_func
 +else
-+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
++	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
 +fi
  
 -/* Override any GCC internal prototype to avoid an error.
@@ -49343,7 +48422,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +fi
  
--for ac_func in pread _pread __pread pread64 _pread64 __pread64
+-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
@@ -49360,7 +48439,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++
++if test "$cross_compiling" = yes; then :
++  libreplace_cv_HAVE_IFACE_IFREQ=cross
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
@@ -49369,17 +48453,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+if test "$cross_compiling" = yes; then :
-+  libreplace_cv_HAVE_IFACE_IFREQ=cross
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
 +#define HAVE_IFACE_IFREQ 1
 +#define NO_CONFIG_H 1
 +#define AUTOCONF_TEST 1
@@ -49400,7 +48473,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--#undef $ac_func
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_IFACE_IFREQ" >&5
 +$as_echo "$libreplace_cv_HAVE_IFACE_IFREQ" >&6; }
@@ -49408,6 +48485,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    iface=yes;
 +$as_echo "#define HAVE_IFACE_IFREQ 1" >>confdefs.h
  
+-#undef $ac_func
++fi
++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.  */
@@ -49421,9 +48502,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
-+fi
-+
 +{ $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 :
@@ -49528,7 +48606,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +echo "LIBREPLACE_NETWORK_CHECKS: END"
  
  
--for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
++CPPFLAGS="${SAVE_CPPFLAGS}"
+ 
+-for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49545,25 +48625,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+CPPFLAGS="${SAVE_CPPFLAGS}"
++LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e "s;${srcdir};;" -e "s;^/;;"`
++LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+LIBREPLACE_OBJS=""
-+for obj in ${LIBREPLACEOBJ}; do
-+	LIBREPLACE_OBJS="${LIBREPLACE_OBJS} ${LIBREPLACE_DIR}/${obj}"
-+done
  
 -#undef $ac_func
++LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -49578,9 +48655,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+# add -ldl to the global LIBS
-+LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
-+AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
  
 -int
 -main ()
@@ -49589,16 +48663,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+
-+for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.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
@@ -49626,7 +48691,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -	eval "$as_ac_var=no"
- fi
+-fi
++# add -ldl to the global LIBS
++LIBS="${LIBS} ${LIBDL} ${LIBREPLACE_NETWORK_LIBS}"
++AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -49639,9 +48707,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 unistd.h grp.h sys/id.h memory.h alloca.h
++for ac_header in aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.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"
@@ -49653,11 +48720,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
--done
++
+ done
  
-+done
- 
-+for ac_header in limits.h float.h pthread.h libintl.h
++for ac_header in unistd.h grp.h sys/id.h memory.h alloca.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"
@@ -49671,7 +48737,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +done
  
--for ac_func in open64 _open64 __open64 creat64
++for ac_header in limits.h float.h libintl.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 pread _pread __pread pread64 _pread64 __pread64
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49696,30 +48776,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
  
 -#undef $ac_func
-+for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.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
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -49734,7 +48804,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
++done
  
 -int
 -main ()
@@ -49743,9 +48813,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+done
-+
-+for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h
++for ac_header in sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.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"
@@ -49796,7 +48864,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -   if test "x$as_val" = x""yes; then
 +done
 +
-+for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h
++for ac_header in sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.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"
@@ -49808,11 +48876,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
--done
++
+ done
+ 
++for ac_header in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h 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
+ 
++fi
  
 +done
  
--for ac_func in prctl
++for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.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 pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -49822,14 +48917,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_header in sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h
++for ac_header in sys/sysmacros.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 :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_SYSMACROS_H 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -49837,28 +48930,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+done
  
 -#undef $ac_func
-+for ac_header in sys/sysmacros.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_SYSMACROS_H 1
-+_ACEOF
++fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -49873,7 +48958,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
++done
  
 -int
 -main ()
@@ -49882,8 +48967,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+done
-+
 +for ac_header in sys/syslog.h syslog.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -49951,14 +49034,323 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +done
  
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
 +for ac_header in xfs/libxfs.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
 +if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_XFS_LIBXFS_H 1
++_ACEOF
+ 
++fi
+ 
++done
+ 
+-for ac_func in open64 _open64 __open64 creat64
+-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_header in netgroup.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
++if test "x$ac_cv_header_netgroup_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_NETGROUP_H 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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++done
+ 
+-#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
++for ac_header in rpcsvc/yp_prot.h
++do :
++  ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
++#if HAVE_RPC_RPC_H
++#include <rpc/rpc.h>
+ #endif
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
++"
++if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_RPCSVC_YP_PROT_H 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_var=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
+-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
++
++
++## These fail to compile on IRIX so just check for their presence
++for ac_header in sys/mode.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_SYS_MODE_H 1
+ _ACEOF
+ 
+ fi
++
+ done
+ 
+ 
+-for ac_func in prctl
+-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
++# Look for Darwin headers
++old_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="-Iinclude $CPPFLAGS"
++for ac_header in CoreFoundation/CFStringEncodingConverter.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++_ACEOF
++
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++  for ac_header in CFStringEncodingConverter.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
++if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_CFSTRINGENCODINGCONVERTER_H 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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++done
+ 
+-#undef $ac_func
++fi
++
++done
++
++CPPFLAGS="$old_CPPFLAGS"
++
++# In valgrind 1.0.x, it's just valgrind.h.  In 1.9.x+ there's a
++# subdirectory of headers.
++for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.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
+ 
+-/* 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
+ 
++#
++# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
++# This causes configure to fail to detect it. Check for shadow separately on HPUX.
++#
++case "$host_os" in
++    *hpux*)
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <shadow.h>
+ int
+ main ()
+ {
+-return $ac_func ();
++struct spwd testme
+   ;
+   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_header_shadow_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
++  ac_cv_header_shadow_h=no
+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		if test x"$ac_cv_header_shadow_h" = x"yes"; then
+ 
+-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
++$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
++
++		fi
++	;;
++esac
++for ac_header in shadow.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
++if test "x$ac_cv_header_shadow_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_SHADOW_H 1
+ _ACEOF
+ 
+ fi
+-done
+ 
++done
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++for ac_header in nss.h nss_common.h nsswitch.h ns_api.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
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -49999,12 +49391,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PRCTL 1
-+for ac_header in netgroup.h
++for ac_header in syscall.h sys/syscall.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-+if test "x$ac_cv_header_netgroup_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_NETGROUP_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
 -else
@@ -50013,16 +49407,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
  
 +done
++
++
++for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.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
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+for ac_header in rpcsvc/yp_prot.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
-+#if HAVE_RPC_RPC_H
-+#include <rpc/rpc.h>
-+#endif
++done
  
 -#
 -#
@@ -50030,21 +49430,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -case "$host_os" in
 -    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 -       # glibc <= 2.3.2 has a broken getgrouplist
--       if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-       { $as_echo "$as_me:$LINENO: checking for good getgrouplist" >&5
+-$as_echo_n "checking for good getgrouplist... " >&6; }
+-if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  samba_cv_linux_getgrouplist_ok=cross
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+"
-+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
++for ac_header in sys/ea.h sys/proplist.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 HAVE_RPCSVC_YP_PROT_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -50069,13 +49472,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       exit(0);
 -}
  
-+## These fail to compile on IRIX so just check for their presence
-+for ac_header in sys/mode.h
++for ac_header in sys/cdefs.h glob.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_mode_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_SYS_MODE_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -50099,14 +49503,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  linux_getgrouplist_ok=yes
+-  samba_cv_linux_getgrouplist_ok=yes
 -else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
 -( exit $ac_status )
--linux_getgrouplist_ok=no
+-samba_cv_linux_getgrouplist_ok=no
 -fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -50114,53 +49518,73 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +done
  
--       if test x"$linux_getgrouplist_ok" = x"yes"; then
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_linux_getgrouplist_ok" >&5
+-$as_echo "$samba_cv_linux_getgrouplist_ok" >&6; }
+-       if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GETGROUPLIST 1
-+# Look for Darwin headers
-+old_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="-Iinclude $CPPFLAGS"
-+for ac_header in CoreFoundation/CFStringEncodingConverter.h
++# For experimental utmp support (lastlog on some BSD-like systems)
++for ac_header in utmp.h utmpx.h lastlog.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_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_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
 -       fi
 -       ;;
 -    *)
--
++fi
+ 
 -for ac_func in getgrouplist
 -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
++done
++
++
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
++$as_echo_n "checking size of int... " >&6; }
++if test "${ac_cv_sizeof_int+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+  for ac_header in CFStringEncodingConverter.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
-+if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_CFSTRINGENCODINGCONVERTER_H 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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
--
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
++else
++  if test "$ac_cv_type_int" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (int)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi
++fi
  
 -#ifdef __STDC__
 -# include <limits.h>
@@ -50168,9 +49592,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -# include <assert.h>
 -#endif
 +fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
  
 -#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
@@ -50185,7 +49610,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+fi
  
 -int
 -main ()
@@ -50194,7 +49618,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -50220,16 +49646,35 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+done
  
 -	eval "$as_ac_var=no"
 -fi
-+CPPFLAGS="$old_CPPFLAGS"
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
++if test "${ac_cv_sizeof_long+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
++
++else
++  if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -50237,60 +49682,47 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+# In valgrind 1.0.x, it's just valgrind.h.  In 1.9.x+ there's a
-+# subdirectory of headers.
-+for ac_header in valgrind.h valgrind/valgrind.h valgrind/memcheck.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
+-  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
+-_ACEOF
  
  fi
-+
- done
+-done
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
  
 -       ;;
 -esac
  
- #
+-#
 -# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
-+# HPUX has a bug in that including shadow.h causes a re-definition of MAXINT.
-+# This causes configure to fail to detect it. Check for shadow separately on HPUX.
- #
--
+-#
+ 
 -if test x$ac_cv_func_stat64 = xno ; then
 -  { $as_echo "$as_me:$LINENO: checking for stat64 in <sys/stat.h>" >&5
 -$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+case "$host_os" in
-+    *hpux*)
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
+-/* end confdefs.h.  */
+ 
 -#if defined(HAVE_UNISTD_H)
 -#include <unistd.h>
 -#endif
 -#include <sys/stat.h>
--
-+#include <shadow.h>
- int
- main ()
- {
+ 
+-int
+-main ()
+-{
 -struct stat64 st64; exit(stat64(".",&st64));
-+struct spwd testme
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -50313,29 +49745,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_stat64=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_shadow_h=yes
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
++$as_echo_n "checking size of long long... " >&6; }
++if test "${ac_cv_sizeof_long_long+set}" = set; then :
++  $as_echo_n "(cached) " >&6
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_header_shadow_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+		if test x"$ac_cv_header_shadow_h" = x"yes"; then
-+
-+$as_echo "#define HAVE_SHADOW_H 1" >>confdefs.h
- 
-+		fi
-+	;;
-+esac
-+for ac_header in shadow.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
-+if test "x$ac_cv_header_shadow_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SHADOW_H 1
-+_ACEOF
+-
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
  
++else
++  if test "$ac_cv_type_long_long" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (long long)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_long_long=0
++   fi
  fi
  
 -rm -rf conftest.dSYM
@@ -50344,38 +49777,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat64" >&5
 -$as_echo "$ac_cv_func_stat64" >&6; }
 -  if test x$ac_cv_func_stat64 = xyes ; then
-+done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
++$as_echo "$ac_cv_sizeof_long_long" >&6; }
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STAT64 1
-+for ac_header in nss.h nss_common.h nsswitch.h ns_api.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
+-_ACEOF
  
 -  fi
- fi
+-fi
  
 -if test x$ac_cv_func_lstat64 = xno ; then
 -  { $as_echo "$as_me:$LINENO: checking for lstat64 in <sys/stat.h>" >&5
 -$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+done
-+
-+for ac_header in syscall.h sys/syscall.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 SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
@@ -50385,7 +49804,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#include <unistd.h>
 -#endif
 -#include <sys/stat.h>
-+fi
  
 -int
 -main ()
@@ -50417,407 +49835,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_lstat64=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+done
- 
- 
-+for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.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
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
--$as_echo "$ac_cv_func_lstat64" >&6; }
--  if test x$ac_cv_func_lstat64 = xyes ; then
--    cat >>confdefs.h <<\_ACEOF
--#define HAVE_LSTAT64 Whether lstat64() is available
-+done
-+
-+for ac_header in sys/ea.h sys/proplist.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
- fi
- 
--if test x$ac_cv_func_fstat64 = xno ; then
--  { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
--$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+done
- 
--#if defined(HAVE_UNISTD_H)
--#include <unistd.h>
--#endif
--#include <sys/stat.h>
- 
--int
--main ()
--{
--struct stat64 st64; exit(fstat64(0,&st64));
--  ;
--  return 0;
--}
-+for ac_header in sys/cdefs.h glob.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 -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_func_fstat64=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- 
- fi
- 
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
--$as_echo "$ac_cv_func_fstat64" >&6; }
--  if test x$ac_cv_func_fstat64 = xyes ; then
-+done
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FSTAT64 1
-+
-+# For experimental utmp support (lastlog on some BSD-like systems)
-+for ac_header in utmp.h utmpx.h lastlog.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
- fi
- 
--#################################################
--# Check whether struct stat has timestamps with sub-second resolution.
--#
-+done
- 
--samba_cv_stat_hires=no
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-+$as_echo_n "checking size of int... " >&6; }
-+if test "${ac_cv_sizeof_int+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_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtim.tv_nsec)
--return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_cv_member_struct_stat_st_mtim_tv_nsec=yes
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if test "$ac_cv_type_int" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (int)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_int=0
-+   fi
-+fi
- 
--	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
--int
--main ()
--{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtim.tv_nsec)
--return 0;
--  ;
--  return 0;
--}
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
- _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_cv_member_struct_stat_st_mtim_tv_nsec=yes
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
-+if test "${ac_cv_sizeof_long+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
- 
--	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
-+else
-+  if test "$ac_cv_type_long" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
-+
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then
- 
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
- 
--# Linux, Solaris
--	samba_cv_stat_hires=yes
--fi
- 
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
--$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
-+# The cast to long int works around a bug in the HP C Compiler
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-+$as_echo_n "checking size of long long... " >&6; }
-+if test "${ac_cv_sizeof_long_long+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_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimensec)
--return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_cv_member_struct_stat_st_mtimensec=yes
-+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if test "$ac_cv_type_long_long" = yes; then
-+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (long long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_long_long=0
-+   fi
-+fi
- 
--	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
--int
--main ()
--{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimensec)
--return 0;
--  ;
--  return 0;
--}
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _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_cv_member_struct_stat_st_mtimensec=yes
-+
-+
 +# The cast to long int works around a bug in the HP C Compiler
 +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -50831,7 +49848,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
  
--	ac_cv_member_struct_stat_st_mtimensec=no
 +else
 +  if test "$ac_cv_type_short" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -50842,92 +49858,55 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +   else
 +     ac_cv_sizeof_short=0
 +   fi
- fi
++fi
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
 +$as_echo "$ac_cv_sizeof_short" >&6; }
-+
  
--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
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat64" >&5
+-$as_echo "$ac_cv_func_lstat64" >&6; }
+-  if test x$ac_cv_func_lstat64 = xyes ; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LSTAT64 Whether lstat64() is available
+-_ACEOF
+ 
+-  fi
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
  
- cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
+-if test x$ac_cv_func_fstat64 = xno ; then
+-  { $as_echo "$as_me:$LINENO: checking for fstat64 in <sys/stat.h>" >&5
+-$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
  
--# BSD, if defined _POSIX_SOURCE
--	samba_cv_stat_hires=yes
--fi
- 
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+set}" = set; then
+-#if defined(HAVE_UNISTD_H)
+-#include <unistd.h>
+-#endif
+-#include <sys/stat.h>
++
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 +if test "${ac_cv_c_const+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
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (ac_aggr.st_mtimespec.tv_nsec)
--return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval 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_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++/* end confdefs.h.  */
  
--	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
  int
  main ()
  {
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtimespec.tv_nsec)
--return 0;
+-struct stat64 st64; exit(fstat64(0,&st64));
 +/* FIXME: Include the comments suggested by Paul. */
 +#ifndef __cplusplus
 +  /* Ultrix mips cc rejects this.  */
@@ -50982,15 +49961,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    return 0;
  }
  _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-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
@@ -50999,34 +49978,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_fstat64=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_const=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
 +  ac_cv_c_const=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 +$as_echo "$ac_cv_c_const" >&6; }
 +if test $ac_cv_c_const = no; then
-+
+ 
 +$as_echo "#define const /**/" >>confdefs.h
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
  
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $ac_cv_func_fstat64" >&5
+-$as_echo "$ac_cv_func_fstat64" >&6; }
+-  if test x$ac_cv_func_fstat64 = xyes ; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 +$as_echo_n "checking for inline... " >&6; }
 +if test "${ac_cv_c_inline+set}" = set; then :
@@ -51041,7 +50020,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +static $ac_kw foo_t static_foo () {return 0; }
 +$ac_kw foo_t foo () {return 0; }
 +#endif
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FSTAT64 1
  _ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_inline=$ac_kw
@@ -51050,12 +50031,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  test "$ac_cv_c_inline" != no && break
 +done
  
--# BSD, if not defined _POSIX_SOURCE
--	samba_cv_stat_hires=yes
+-  fi
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 +$as_echo "$ac_cv_c_inline" >&6; }
-+
+ 
+-#################################################
+-# Check whether struct stat has timestamps with sub-second resolution.
+-#
 +case $ac_cv_c_inline in
 +  inline | yes) ;;
 +  *)
@@ -51071,9 +50054,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    ;;
 +esac
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
--$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
--if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
+-samba_cv_stat_hires=no
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtim.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtim.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtim_tv_nsec+set}" = set; then
 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 +if test "${ac_cv_c_bigendian+set}" = set; then :
@@ -51130,7 +50114,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (ac_aggr.st_mtime_n)
+-if (ac_aggr.st_mtim.tv_nsec)
 -return 0;
 +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
 +		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
@@ -51160,7 +50144,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtime_n=yes
+-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -51182,7 +50166,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_mtime_n)
+-if (sizeof ac_aggr.st_mtim.tv_nsec)
 -return 0;
 +#if BYTE_ORDER != BIG_ENDIAN
 +		 not big endian
@@ -51210,14 +50194,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_mtime_n=yes
+-  ac_cv_member_struct_stat_st_mtim_tv_nsec=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_bigendian=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_mtime_n=no
+-	ac_cv_member_struct_stat_st_mtim_tv_nsec=no
 +  ac_cv_c_bigendian=no
  fi
 -
@@ -51226,21 +50210,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
--$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
--if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtim_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtim_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then
 -
 -cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_MTIME_N 1
+-#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 -_ACEOF
 -
--# AIX
+-# Linux, Solaris
 -	samba_cv_stat_hires=yes
 -fi
 -
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
--$as_echo_n "checking for struct stat.st_umtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimensec" >&5
+-$as_echo_n "checking for struct stat.st_mtimensec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimensec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -51260,7 +50244,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (ac_aggr.st_umtime)
+-if (ac_aggr.st_mtimensec)
 -return 0;
 +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 +	      bogus endian macros
@@ -51288,7 +50272,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_umtime=yes
+-  ac_cv_member_struct_stat_st_mtimensec=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -51309,7 +50293,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_umtime)
+-if (sizeof ac_aggr.st_mtimensec)
 -return 0;
 +#ifndef _BIG_ENDIAN
 +		 not big endian
@@ -51337,14 +50321,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_umtime=yes
+-  ac_cv_member_struct_stat_st_mtimensec=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_bigendian=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_member_struct_stat_st_umtime=no
+-	ac_cv_member_struct_stat_st_mtimensec=no
 +  ac_cv_c_bigendian=no
  fi
 -
@@ -51353,27 +50337,36 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_umtime" >&5
--$as_echo "$ac_cv_member_struct_stat_st_umtime" >&6; }
--if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimensec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimensec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then
 -
 -cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_UMTIME 1
+-#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
 -_ACEOF
 -
--# Tru64
+-# BSD, if defined _POSIX_SOURCE
 -	samba_cv_stat_hires=yes
 -fi
 -
--
--if test x"$samba_cv_stat_hires" = x"yes" ; then
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtimespec.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_mtimespec.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtimespec_tv_nsec+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
 +    fi
 +    if test $ac_cv_c_bigendian = unknown; then
 +      # Compile a test program.
 +      if test "$cross_compiling" = yes; then :
 +  # Try to guess by grepping values from an object file.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
+-$ac_includes_default
 +short int ascii_mm[] =
 +		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +		short int ascii_ii[] =
@@ -51389,18 +50382,37 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		  return ebcdic_mm[i] + ebcdic_ii[i];
 +		}
 +		extern int foo;
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_HIRES_TIMESTAMPS 1
-+int
-+main ()
-+{
++
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (ac_aggr.st_mtimespec.tv_nsec)
+-return 0;
 +return use_ascii (foo) == use_ebcdic (foo);
-+  ;
-+  return 0;
-+}
+   ;
+   return 0;
+ }
  _ACEOF
--
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
 +	      ac_cv_c_bigendian=yes
@@ -51413,16 +50425,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		ac_cv_c_bigendian=unknown
 +	      fi
 +	    fi
- fi
--
--# recent FreeBSD, NetBSD have creation timestamps called birthtime:
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimespec.tv_nsec" >&5
--$as_echo_n "checking for struct stat.st_birthtimespec.tv_nsec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtimespec_tv_nsec+set}" = set; then
--  $as_echo_n "(cached) " >&6
++fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
--  cat >conftest.$ac_ext <<_ACEOF
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -51434,7 +50443,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtimespec.tv_nsec)
+-if (sizeof ac_aggr.st_mtimespec.tv_nsec)
 -return 0;
 +
 +	     /* Are we little or big endian?  From Harbison&Steele.  */
@@ -51468,25 +50477,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-  ac_cv_member_struct_stat_st_mtimespec_tv_nsec=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  ac_cv_c_bigendian=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_member_struct_stat_st_mtimespec_tv_nsec=no
 +  ac_cv_c_bigendian=yes
-+fi
+ fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
+ fi
  
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +    fi
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
 +$as_echo "$ac_cv_c_bigendian" >&6; }
 + case $ac_cv_c_bigendian in #(
@@ -51496,20 +50508,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +   no)
 +      ;; #(
 +   universal)
-+
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
+-_ACEOF
 +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
+ 
+-# BSD, if not defined _POSIX_SOURCE
+-	samba_cv_stat_hires=yes
+-fi
 +     ;; #(
 +   *)
 +     as_fn_error "unknown endianness
 + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
 + esac
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_mtime_n" >&5
+-$as_echo_n "checking for struct stat.st_mtime_n... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_mtime_n+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
 +$as_echo_n "checking whether char is unsigned... " >&6; }
 +if test "${ac_cv_c_char_unsigned+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.  */
  $ac_includes_default
@@ -51517,7 +50543,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
+-if (ac_aggr.st_mtime_n)
 -return 0;
 +static int test_array [1 - 2 * !(((char) -1) < 0)];
 +test_array [0] = 0
@@ -51544,50 +50570,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-  ac_cv_member_struct_stat_st_mtime_n=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_c_char_unsigned=no
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
 +  ac_cv_c_char_unsigned=yes
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
 +$as_echo "$ac_cv_c_char_unsigned" >&6; }
 +if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
 +  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
  
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
--if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
--_ACEOF
--
- 
--fi
- 
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
--$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
-+if test "${ac_cv_type_signal+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
+-	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
++$as_echo_n "checking return type of signal handlers... " >&6; }
++if test "${ac_cv_type_signal+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -$ac_includes_default
@@ -51598,7 +50608,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtime)
+-if (sizeof ac_aggr.st_mtime_n)
 -return 0;
 +return *(signal (0, 0)) (0) == 1;
    ;
@@ -51623,7 +50633,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtime=yes
+-  ac_cv_member_struct_stat_st_mtime_n=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_type_signal=int
  else
@@ -51635,14 +50645,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
 +$as_echo "$ac_cv_type_signal" >&6; }
- 
--	cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
++
 +cat >>confdefs.h <<_ACEOF
 +#define RETSIGTYPE $ac_cv_type_signal
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++_ACEOF
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
@@ -51651,47 +50657,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--$ac_includes_default
--int
--main ()
--{
--static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtime)
--return 0;
--  ;
--  return 0;
--}
++/* end confdefs.h.  */
 +#include <sys/types.h>
-+
- _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_cv_member_struct_stat_st_birthtime=yes
+ 
+-	ac_cv_member_struct_stat_st_mtime_n=no
++_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "uid_t" >/dev/null 2>&1; then :
 +  ac_cv_type_uid_t=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_member_struct_stat_st_birthtime=no
++else
 +  ac_cv_type_uid_t=no
  fi
 +rm -f conftest*
@@ -51709,9 +50683,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
--$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
--if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_mtime_n" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_mtime_n" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then
 +
 +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 :
@@ -51719,23 +50693,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +else
  
  cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+-#define HAVE_STRUCT_STAT_ST_MTIME_N 1
 +#define mode_t int
  _ACEOF
  
--{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimensec" >&5
--$as_echo_n "checking for struct stat.st_birthtimensec... " >&6; }
--if test "${ac_cv_member_struct_stat_st_birthtimensec+set}" = set; then
+-# AIX
+-	samba_cv_stat_hires=yes
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_umtime" >&5
+-$as_echo_n "checking for struct stat.st_umtime... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_umtime+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+fi
-+
 +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 >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++
++cat >>confdefs.h <<_ACEOF
++#define off_t long int
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -51744,14 +50723,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -main ()
 -{
 -static struct stat ac_aggr;
--if (ac_aggr.st_birthtimensec)
+-if (ac_aggr.st_umtime)
 -return 0;
 -  ;
 -  return 0;
 -}
 +
++fi
++
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
++
++else
++
 +cat >>confdefs.h <<_ACEOF
-+#define off_t long int
++#define size_t unsigned int
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
@@ -51771,12 +50757,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_member_struct_stat_st_birthtimensec=yes
+-  ac_cv_member_struct_stat_st_umtime=yes
 +
 +fi
 +
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
++ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
++if test "x$ac_cv_type_pid_t" = x""yes; then :
 +
  else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -51784,6 +50770,553 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
++cat >>confdefs.h <<_ACEOF
++#define pid_t int
++_ACEOF
++
++fi
++
++ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_RDEV 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++
++
++$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
++
++fi
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
++$as_echo_n "checking for d_off in dirent... " >&6; }
++if test "${ac_cv_dirent_d_off+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++#include <unistd.h>
++#include <sys/types.h>
++#include <dirent.h>
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_umtime)
+-return 0;
++struct dirent d; d.d_off;
+   ;
+   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_cv_member_struct_stat_st_umtime=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_dirent_d_off=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_member_struct_stat_st_umtime=no
++  ac_cv_dirent_d_off=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_off" >&5
++$as_echo "$ac_cv_dirent_d_off" >&6; }
++if test $ac_cv_dirent_d_off = yes; then
++
++$as_echo "#define HAVE_DIRENT_D_OFF 1" >>confdefs.h
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_umtime" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_umtime" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then
++
++ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
++if test "x$ac_cv_type_ssize_t" = x""yes; then :
++
++else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_UMTIME 1
++#define ssize_t int
+ _ACEOF
+ 
+-# Tru64
+-	samba_cv_stat_hires=yes
+ fi
+ 
++ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
++if test "x$ac_cv_type_wchar_t" = x""yes; then :
+ 
+-if test x"$samba_cv_stat_hires" = x"yes" ; then
++else
++
++cat >>confdefs.h <<_ACEOF
++#define wchar_t unsigned short
++_ACEOF
++
++fi
++
++
++############################################
++# for cups support we need libcups, and a handful of header files
++
++# Check whether --enable-cups was given.
++if test "${enable_cups+set}" = set; then :
++  enableval=$enable_cups;
++fi
++
++
++if test x$enable_cups != xno; then
++	# Extract the first word of "cups-config", so it can be a program name with args.
++set dummy cups-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $CUPS_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
++if test -n "$CUPS_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5
++$as_echo "$CUPS_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++        if test "x$CUPS_CONFIG" != x; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT_HIRES_TIMESTAMPS 1
++		ac_save_CFLAGS=$CFLAGS
++		ac_save_LDFLAGS=$LDFLAGS
++		ac_save_PRINT_LIBS=$PRINT_LIBS
++		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
++		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
++		PRINT_LIBS="$PRINT_LIBS -lcups"
++		for ac_header in cups/cups.h cups/language.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
++fi
++
++done
++
++		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
++		        x"$ac_cv_header_cups_language_h" = xyes; then
++
++$as_echo "#define HAVE_CUPS 1" >>confdefs.h
++
++			samba_cv_HAVE_CUPS=yes
++
++
++ac_check_lib_ext_save_LIBS=$LIBS
++LIBS="-lcups $PRINT_LIBS  $LIBS"
++
++
+ 
+-# recent FreeBSD, NetBSD have creation timestamps called birthtime:
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimespec.tv_nsec" >&5
+-$as_echo_n "checking for struct stat.st_birthtimespec.tv_nsec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtimespec_tv_nsec+set}" = set; then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for httpConnectEncrypt in -lcups" >&5
++$as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
++if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+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.  */
+-$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 httpConnectEncrypt ();
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (ac_aggr.st_birthtimespec.tv_nsec)
+-return 0;
++return httpConnectEncrypt ();
+   ;
+   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_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_ext_cups_httpConnectEncrypt=yes;
++		  ac_cv_lib_ext_cups=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_ext_cups_httpConnectEncrypt=no;
++		  ac_cv_lib_ext_cups=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_cups_httpConnectEncrypt" >&5
++$as_echo "$ac_cv_lib_ext_cups_httpConnectEncrypt" >&6; }
++    if test $ac_cv_lib_ext_cups_httpConnectEncrypt = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_HTTPCONNECTENCRYPT 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtimespec.tv_nsec)
+-return 0;
+-  ;
+-  return 0;
+-}
++
++fi
++LIBS=$ac_check_lib_ext_save_LIBS
++
++if test $ac_cv_lib_ext_cups = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCUPS 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_cv_member_struct_stat_st_birthtimespec_tv_nsec=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_member_struct_stat_st_birthtimespec_tv_nsec=no
++		case "$PRINT_LIBS" in
++		    *-lcups*)
++			;;
++		    *)
++			PRINT_LIBS="-lcups $PRINT_LIBS"
++			;;
++		esac
++
++
+ fi
++		else
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups-config around but cups-devel not installed" >&5
++$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
++			CFLAGS=$ac_save_CFLAGS
++			LDFLAGS=$ac_save_LDFLAGS
++			PRINT_LIBS=$ac_save_PRINT_LIBS
++		fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++	elif test x"$enable_cups" = x"yes"; then
++		as_fn_error "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
++        fi
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Check whether --enable-iprint was given.
++if test "${enable_iprint+set}" = set; then :
++  enableval=$enable_iprint;
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
+-_ACEOF
+ 
++if test x$enable_iprint != xno; then
++	if test x"$samba_cv_HAVE_CUPS" = xyes; then
++
++$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
+ 
++	elif test x"$enable_iprint" = x"yes"; then
++		as_fn_error "iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
++        fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtime" >&5
+-$as_echo_n "checking for struct stat.st_birthtime... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtime+set}" = set; then
++############################################
++# check if the compiler will optimize out function calls
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
++$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
++if test "${samba_cv_optimize_out_funcation_calls+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.  */
+-$ac_includes_default
++
++#include <stdio.h>
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (ac_aggr.st_birthtime)
+-return 0;
++
++		if (0) {
++		   this_function_does_not_exist();
++		} else {
++		  return 1;
++		}
++
++
+   ;
+   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_cv_member_struct_stat_st_birthtime=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  samba_cv_optimize_out_funcation_calls=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  samba_cv_optimize_out_funcation_calls=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: $samba_cv_optimize_out_funcation_calls" >&5
++$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
++if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++$as_echo "#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1" >>confdefs.h
++
++fi
++
++#############################################
++# check for fd passing struct via msg_control
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_control" >&5
++$as_echo_n "checking for fd passing via msg_control... " >&6; }
++if test "${samba_cv_msghdr_msg_control+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-$ac_includes_default
++
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtime)
+-return 0;
++
++	struct msghdr msg;
++	union {
++	      struct cmsghdr cm;
++	      char control[CMSG_SPACE(sizeof(int))];
++	} control_un;
++	msg.msg_control = control_un.control;
++	msg.msg_controllen = sizeof(control_un.control);
++
+   ;
+   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_cv_member_struct_stat_st_birthtime=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_msghdr_msg_control=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_member_struct_stat_st_birthtime=no
++  samba_cv_msghdr_msg_control=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_control" >&5
++$as_echo "$samba_cv_msghdr_msg_control" >&6; }
++if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtime" >&5
+-$as_echo "$ac_cv_member_struct_stat_st_birthtime" >&6; }
+-if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then
++$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
+ 
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
+-_ACEOF
++fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for struct stat.st_birthtimensec" >&5
+-$as_echo_n "checking for struct stat.st_birthtimensec... " >&6; }
+-if test "${ac_cv_member_struct_stat_st_birthtimensec+set}" = set; then
++#############################################
++# check for fd passing struct via msg_acctrights
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
++$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
++if test "${samba_cv_msghdr_msg_acctrights+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
@@ -51793,14 +51326,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -main ()
 -{
 -static struct stat ac_aggr;
--if (sizeof ac_aggr.st_birthtimensec)
+-if (ac_aggr.st_birthtimensec)
 -return 0;
 -  ;
 -  return 0;
 -}
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -51824,63 +51355,123 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
+-	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 <sys/types.h>
++#include <stdlib.h>
++#include <stddef.h>
++#include <sys/socket.h>
++#include <sys/un.h>
+ int
+ main ()
+ {
+-static struct stat ac_aggr;
+-if (sizeof ac_aggr.st_birthtimensec)
+-return 0;
++
++	struct msghdr msg;
++	int fd;
++	msg.msg_acctrights = (caddr_t) &fd;
++	msg.msg_acctrightslen = sizeof(fd);
++
+   ;
+   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_cv_member_struct_stat_st_birthtimensec=yes
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_msghdr_msg_acctrights=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -	ac_cv_member_struct_stat_st_birthtimensec=no
++  samba_cv_msghdr_msg_acctrights=no
  fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
-+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-+if test "x$ac_cv_type_pid_t" = x""yes; then :
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$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
 +
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
++$as_echo "#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1" >>confdefs.h
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_birthtimensec" >&5
 -$as_echo "$ac_cv_member_struct_stat_st_birthtimensec" >&6; }
 -if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then
-+
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
  
- cat >>confdefs.h <<_ACEOF
+-cat >>confdefs.h <<_ACEOF
 -#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
-+#define HAVE_STRUCT_STAT_ST_RDEV 1
++for ac_func in dirfd
++do :
++  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
++if test "x$ac_cv_func_dirfd" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DIRFD 1
  _ACEOF
  
+-
+ fi
++done
  
--fi
-+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
- 
++if test x"$ac_cv_func_dirfd" = x"yes"; then
++	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
  fi
  
- 
+-
 -
 -{ $as_echo "$as_me:$LINENO: checking whether there is DOS flags support in the stat struct" >&5
 -$as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
 -if test "${samba_cv_stat_dos_flags+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
-+$as_echo_n "checking for d_off in dirent... " >&6; }
-+if test "${ac_cv_dirent_d_off+set}" = set; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
++$as_echo_n "checking for struct sigevent type... " >&6; }
++if test "${samba_cv_struct_sigevent+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
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -#include <sys/stat.h>
 +
-+#include <unistd.h>
 +#include <sys/types.h>
-+#include <dirent.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <signal.h>
  int
  main ()
  {
@@ -51892,7 +51483,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		int i = UF_DOS_NOINDEX;
 -		int f = UF_DOS_FLAGS;
 -
-+struct dirent d; d.d_off;
++struct sigevent s;
    ;
    return 0;
  }
@@ -51917,753 +51508,72 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 -  samba_cv_stat_dos_flags=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_dirent_d_off=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_dirent_d_off=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dirent_d_off" >&5
-+$as_echo "$ac_cv_dirent_d_off" >&6; }
-+if test $ac_cv_dirent_d_off = yes; then
-+
-+$as_echo "#define HAVE_DIRENT_D_OFF 1" >>confdefs.h
- 
--	samba_cv_stat_dos_flags=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-+if test "x$ac_cv_type_ssize_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ssize_t int
-+_ACEOF
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
--$as_echo "$samba_cv_stat_dos_flags" >&6; }
- 
--if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
-+ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
-+if test "x$ac_cv_type_wchar_t" = x""yes; then :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STAT_DOS_FLAGS 1
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define wchar_t unsigned short
- _ACEOF
- 
- fi
- 
--#####################################
--# needed for SRV lookups
- 
--{ $as_echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
--$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
-+############################################
-+# for cups support we need libcups, and a handful of header files
-+
-+# Check whether --enable-cups was given.
-+if test "${enable_cups+set}" = set; then :
-+  enableval=$enable_cups;
-+fi
-+
-+
-+if test x$enable_cups != xno; then
-+	# Extract the first word of "cups-config", so it can be a program name with args.
-+set dummy cups-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+  case $CUPS_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_CUPS_CONFIG="$CUPS_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--/* 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 dn_expand ();
--int
--main ()
--{
--return dn_expand ();
--  ;
--  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_resolv_dn_expand=yes
-+fi
-+CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
-+if test -n "$CUPS_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_CONFIG" >&5
-+$as_echo "$CUPS_CONFIG" >&6; }
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv_dn_expand=no
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 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_resolv_dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
-+
-+
-+        if test "x$CUPS_CONFIG" != x; then
-+
-+		ac_save_CFLAGS=$CFLAGS
-+		ac_save_LDFLAGS=$LDFLAGS
-+		ac_save_PRINT_LIBS=$PRINT_LIBS
-+		CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
-+		LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
-+		PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
-+		for ac_header in cups/cups.h cups/language.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 HAVE_LIBRESOLV 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--  LIBS="-lresolv $LIBS"
-+fi
-+
-+done
-+
-+		if test x"$ac_cv_header_cups_cups_h" = xyes -a \
-+		        x"$ac_cv_header_cups_language_h" = xyes; then
-+
-+$as_echo "#define HAVE_CUPS 1" >>confdefs.h
-+
-+			samba_cv_HAVE_CUPS=yes
-+		else
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups-config around but cups-devel not installed" >&5
-+$as_echo "$as_me: WARNING: cups-config around but cups-devel not installed" >&2;}
-+			CFLAGS=$ac_save_CFLAGS
-+			LDFLAGS=$ac_save_LDFLAGS
-+			PRINT_LIBS=$ac_save_PRINT_LIBS
-+		fi
- 
-+	elif test x"$enable_cups" = x"yes"; then
-+		as_fn_error "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
-+        fi
- fi
- 
-+# Check whether --enable-iprint was given.
-+if test "${enable_iprint+set}" = set; then :
-+  enableval=$enable_iprint;
-+fi
- 
--{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
--$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
-+
-+if test x$enable_iprint != xno; then
-+	if test x"$samba_cv_HAVE_CUPS" = xyes; then
-+
-+$as_echo "#define HAVE_IPRINT 1" >>confdefs.h
-+
-+	elif test x"$enable_iprint" = x"yes"; then
-+		as_fn_error "iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
-+        fi
-+fi
-+
-+############################################
-+# check if the compiler will optimize out function calls
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
-+$as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-+if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $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 _dn_expand ();
-+#include <stdio.h>
- int
- main ()
- {
--return _dn_expand ();
-+
-+		if (0) {
-+		   this_function_does_not_exist();
-+		} else {
-+		  return 1;
-+		}
-+
-+
-   ;
-   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_resolv__dn_expand=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  samba_cv_optimize_out_funcation_calls=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv__dn_expand=no
-+  samba_cv_optimize_out_funcation_calls=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_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv__dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_optimize_out_funcation_calls" >&5
-+$as_echo "$samba_cv_optimize_out_funcation_calls" >&6; }
-+if test x"$samba_cv_optimize_out_funcation_calls" = x"yes"; then
- 
--  LIBS="-lresolv $LIBS"
-+$as_echo "#define HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS 1" >>confdefs.h
- 
- fi
- 
--
--{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
--$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
--if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
-+#############################################
-+# check for fd passing struct via msg_control
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_control" >&5
-+$as_echo_n "checking for fd passing via msg_control... " >&6; }
-+if test "${samba_cv_msghdr_msg_control+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv  $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 __dn_expand ();
-+#include <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
- int
- main ()
- {
--return __dn_expand ();
-+
-+	struct msghdr msg;
-+	union {
-+	      struct cmsghdr cm;
-+	      char control[CMSG_SPACE(sizeof(int))];
-+	} control_un;
-+	msg.msg_control = control_un.control;
-+	msg.msg_controllen = sizeof(control_un.control);
-+
-   ;
-   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_resolv___dn_expand=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  samba_cv_msghdr_msg_control=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_resolv___dn_expand=no
-+  samba_cv_msghdr_msg_control=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_resolv___dn_expand" >&5
--$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
--if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRESOLV 1
--_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_msghdr_msg_control" >&5
-+$as_echo "$samba_cv_msghdr_msg_control" >&6; }
-+if test x"$samba_cv_msghdr_msg_control" = x"yes"; then
- 
--  LIBS="-lresolv $LIBS"
-+$as_echo "#define HAVE_MSGHDR_MSG_CONTROL 1" >>confdefs.h
- 
- fi
- 
--
--#
--# Check for the functions putprpwnam, set_auth_parameters,
--# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
--# Needed for OSF1 and HPUX.
--#
--
--
--
--for ac_func in putprpwnam
--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 fd passing struct via msg_acctrights
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
-+$as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-+if test "${samba_cv_msghdr_msg_acctrights+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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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 <sys/types.h>
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
- int
- main ()
- {
--return $ac_func ();
-+
-+	struct msghdr msg;
-+	int fd;
-+	msg.msg_acctrights = (caddr_t) &fd;
-+	msg.msg_acctrightslen = sizeof(fd);
-+
-   ;
-   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 :
-+  samba_cv_msghdr_msg_acctrights=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+  samba_cv_msghdr_msg_acctrights=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: $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
- 
--        # putprpwnam was found in libc or existing $LIBS
-+$as_echo "#define HAVE_MSGHDR_MSG_ACCTRIGHTS 1" >>confdefs.h
- 
-+fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
-+for ac_func in dirfd
-+do :
-+  ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-+if test "x$ac_cv_func_dirfd" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DIRFD 1
- _ACEOF
- 
-+fi
-+done
- 
-+if test x"$ac_cv_func_dirfd" = x"yes"; then
-+	default_shared_modules="$default_shared_modules vfs_syncops vfs_dirsort"
-+fi
- 
--else
--
--        # putprpwnam was not found, try adding libsecurity
--	case " $LIBS " in
--          *\ -lsecurity\ *)
--
--		    # putprpwnam was not found and we already had libsecurity
--		    # nothing to do here by default
--		    true
--
--	    ;;
--          *)
--	    # putprpwnam was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
--$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
-+$as_echo_n "checking for struct sigevent type... " >&6; }
-+if test "${samba_cv_struct_sigevent+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $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"
-+#include <sys/types.h>
-+#if STDC_HEADERS
-+#include <stdlib.h>
-+#include <stddef.h>
- #endif
--char putprpwnam ();
-+#include <signal.h>
- int
- main ()
- {
--return putprpwnam ();
-+struct sigevent s;
-   ;
-   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_security_putprpwnam=yes
-+if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_struct_sigevent=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_security_putprpwnam=no
+-	samba_cv_stat_dos_flags=no
 +  samba_cv_struct_sigevent=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
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
--$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
--if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_stat_dos_flags" >&5
+-$as_echo "$samba_cv_stat_dos_flags" >&6; }
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_sigevent" >&5
 +$as_echo "$samba_cv_struct_sigevent" >&6; }
 +if test x"$samba_cv_struct_sigevent" = x"yes"; then
  
--		LIBS="-lsecurity $LIBS"
+-if test x"$samba_cv_stat_dos_flags" = x"yes" ; then
 +$as_echo "#define HAVE_STRUCT_SIGEVENT 1" >>confdefs.h
- 
++
 +   ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
 +"
 +if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
++
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
- _ACEOF
- 
- 
++_ACEOF
++
++
 +fi
 +ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sigval_ptr" "ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" "#include <signal.h>
 +"
 +if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then :
  
--else
--
--
--			# putprpwnam was not found in libsecurity
--			# nothing to do here by default
--			true
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STAT_DOS_FLAGS 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
-+_ACEOF
- 
+ _ACEOF
  
++
  fi
  
--	  ;;
--        esac
--
- fi
--done
+-#####################################
+-# needed for SRV lookups
++fi
  
--
--
--
--for ac_func in putprpwnam
--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:$LINENO: checking for dn_expand in -lresolv" >&5
+-$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$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
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $LIBS"
+-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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
++
 +    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
@@ -52675,12 +51585,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#include <stdlib.h>
 +#include <stddef.h>
  #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
+-char dn_expand ();
 +#if TIME_WITH_SYS_TIME
 +# include <sys/time.h>
 +# include <time.h>
@@ -52690,12 +51595,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +# else
 +#  include <time.h>
 +# endif
- #endif
- 
++#endif
++
  int
  main ()
  {
--return $ac_func ();
+-return dn_expand ();
 +struct timespec ts;
    ;
    return 0;
@@ -52722,51 +51627,72 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_resolv_dn_expand=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  samba_cv_struct_timespec=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_resolv_dn_expand=no
 +  samba_cv_struct_timespec=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
--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_resolv_dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-#define HAVE_LIBRESOLV 1
 -_ACEOF
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_struct_timespec" >&5
 +$as_echo "$samba_cv_struct_timespec" >&6; }
 +if test x"$samba_cv_struct_timespec" = x"yes"; then
  
--        # putprpwnam was found in libc or existing $LIBS
+-  LIBS="-lresolv $LIBS"
 +$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h
  
-+fi
+ fi
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
+-
+-{ $as_echo "$as_me:$LINENO: checking for _dn_expand in -lresolv" >&5
+-$as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then
 +# and glibc has setresuid under linux but the function does
 +# nothing until kernel 2.1.44! very dumb.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
 +$as_echo_n "checking for real setresuid... " >&6; }
 +if test "${samba_cv_have_setresuid+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
+   $as_echo_n "(cached) " >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lresolv  $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 _dn_expand ();
+-int
+-main ()
+-{
+-return _dn_expand ();
+-  ;
+-  return 0;
+-}
 +    if test "$cross_compiling" = yes; then :
 +  samba_cv_have_setresuid=cross
 +else
@@ -52775,35 +51701,68 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#include <errno.h>
 +main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0: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
+-  ac_cv_lib_resolv__dn_expand=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  samba_cv_have_setresuid=yes
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  samba_cv_have_setresuid=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
+ 
+-	ac_cv_lib_resolv__dn_expand=no
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresuid" >&5
 +$as_echo "$samba_cv_have_setresuid" >&6; }
 +if test x"$samba_cv_have_setresuid" = x"yes"; then
- 
++
 +$as_echo "#define HAVE_SETRESUID 1" >>confdefs.h
  
-+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_resolv__dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
+-_ACEOF
  
+-  LIBS="-lresolv $LIBS"
 +# Do the same check for setresguid...
 +#
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresgid" >&5
 +$as_echo_n "checking for real setresgid... " >&6; }
 +if test "${samba_cv_have_setresgid+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
- else
- 
--        # putprpwnam was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
++else
++
 +    if test "$cross_compiling" = yes; then :
 +  samba_cv_have_setresgid=cross
 +else
@@ -52822,22 +51781,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--		    # putprpwnam was not found and we already had libsec
--		    # nothing to do here by default
--		    true
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_have_setresgid" >&5
 +$as_echo "$samba_cv_have_setresgid" >&6; }
 +if test x"$samba_cv_have_setresgid" = x"yes"; then
  
--	    ;;
--          *)
--	    # putprpwnam was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
--$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
 +$as_echo "#define HAVE_SETRESGID 1" >>confdefs.h
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
+-$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
 +fi
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
@@ -52846,7 +51799,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
+-LIBS="-lresolv  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -52864,12 +51817,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--char putprpwnam ();
+-char __dn_expand ();
 +$ac_includes_default
  int
  main ()
  {
--return putprpwnam ();
+-return __dn_expand ();
 +
 +  /* Some versions of memcmp are not 8-bit clean.  */
 +  char c0 = '\100', c1 = '\200', c2 = '\201';
@@ -52920,14 +51873,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_putprpwnam=yes
+-  ac_cv_lib_resolv___dn_expand=yes
 +if ac_fn_c_try_run "$LINENO"; then :
 +  ac_cv_func_memcmp_working=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_sec_putprpwnam=no
+-	ac_cv_lib_resolv___dn_expand=no
 +  ac_cv_func_memcmp_working=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -52939,9 +51892,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
--$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
--if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
+-$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
 +$as_echo "$ac_cv_func_memcmp_working" >&6; }
 +test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -52949,46 +51902,46 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 + ;;
 +esac
- 
--		LIBS="-lsec $LIBS"
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PUTPRPWNAM 1
--_ACEOF
++
++
++
 +###############################################
 +# Readline included by default unless explicitly asked not to
 +test "${with_readline+set}" != "set" && with_readline=yes
- 
++
 +# test for where we get readline() from
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
 +$as_echo_n "checking whether to use readline... " >&6; }
- 
++
 +# 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:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
- 
--else
++
 +    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`
 +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
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRESOLV 1
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+ _ACEOF
  
-+fi
+-  LIBS="-lresolv $LIBS"
+-
+ fi
  
--			# putprpwnam was not found in libsec
--			# nothing to do here by default
--			true
 +done
  
+-#
+-# Check for the functions putprpwnam, set_auth_parameters,
+-# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
+-# Needed for OSF1 and HPUX.
+-#
 +    for ac_header in readline/history.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
@@ -52996,14 +51949,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_READLINE_HISTORY_H 1
 +_ACEOF
- 
- fi
- 
--	  ;;
--        esac
--
--fi
- done
++
++fi
++
++done
  
  
 +    for ac_header in readline.h readline/readline.h
@@ -53016,9 +51965,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
--
--
--for ac_func in set_auth_parameters
+-for ac_func in putprpwnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -53059,7 +52006,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -47778,100 +14567,41 @@
+@@ -47061,100 +14378,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53133,22 +52080,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
--        # set_auth_parameters was found in libc or existing $LIBS
+-        # putprpwnam was found in libc or existing $LIBS
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
 -_ACEOF
 -
 -
 -
 -else
 -
--        # set_auth_parameters was not found, try adding libsecurity
+-        # putprpwnam was not found, try adding libsecurity
 -	case " $LIBS " in
 -          *\ -lsecurity\ *)
 -
--		    # set_auth_parameters was not found and we already had libsecurity
+-		    # putprpwnam was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
 +eval as_val=\$$as_ac_Lib
@@ -53158,10 +52105,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	    ;;
 -          *)
--	    # set_auth_parameters was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
--$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
+-	    # putprpwnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsecurity" >&5
+-$as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_putprpwnam+set}" = set; then
 +      done
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
 +$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
@@ -53180,16 +52127,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -47880,111 +14610,149 @@
+@@ -47163,111 +14421,106 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char set_auth_parameters ();
+-char putprpwnam ();
 +char rl_callback_handler_install ();
  int
  main ()
  {
--return set_auth_parameters ();
+-return putprpwnam ();
 +return rl_callback_handler_install ();
    ;
    return 0;
@@ -53216,14 +52163,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_set_auth_parameters=yes
+-  ac_cv_lib_security_putprpwnam=yes
 +if ac_fn_c_try_link "$LINENO"; 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_security_set_auth_parameters=no
+-	ac_cv_lib_security_putprpwnam=no
 +  ac_cv_lib_readline_rl_callback_handler_install=no
  fi
 -
@@ -53234,9 +52181,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then
 -
 -		LIBS="-lsecurity $LIBS"
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
@@ -53247,7 +52194,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
 -_ACEOF
 +       break
 +else
@@ -53273,7 +52220,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    _ldflags=${LDFLAGS}
 +    _cppflags=${CPPFLAGS}
  
--			# set_auth_parameters was not found in libsecurity
+-			# putprpwnam was not found in libsecurity
 -			# nothing to do here by default
 -			true
 +    # Add additional search path
@@ -53320,7 +52267,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
--for ac_func in set_auth_parameters
+-for ac_func in putprpwnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -53350,58 +52297,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$as_ac_Lib=yes"
-+else
-+  eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Lib
-+   if test "x$as_val" = x""yes; then :
-+  TERMLIBS="-l${termlib}"; break
-+fi
- 
+-#endif
+-
 -#undef $ac_func
-+      done
-+      { $as_echo "$as_me:${as_lineno-$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 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
-@@ -47992,100 +14760,67 @@
+@@ -47275,100 +14528,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53413,11 +52320,125 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -choke me
 -#endif
 -
-+char rl_callback_handler_install ();
++char tgetent ();
  int
  main ()
  {
 -return $ac_func ();
++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_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "$as_ac_Lib=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
++  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
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$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
+-
+-        # putprpwnam was found in libc or existing $LIBS
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PUTPRPWNAM 1
+-_ACEOF
+-
+-
+-
+-else
+-
+-        # putprpwnam was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
+-
+-		    # putprpwnam was not found and we already had libsec
+-		    # nothing to do here by default
+-		    true
++eval as_val=\$$as_ac_Lib
++   if test "x$as_val" = x""yes; then :
++  TERMLIBS="-l${termlib}"; break
++fi
+ 
+-	    ;;
+-          *)
+-	    # putprpwnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for putprpwnam in -lsec" >&5
+-$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then
++      done
++      { $as_echo "$as_me:${as_lineno-$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="-lsec  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lreadline $TERMLIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -47377,112 +14571,68 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char putprpwnam ();
++char rl_callback_handler_install ();
+ int
+ main ()
+ {
+-return putprpwnam ();
 +return rl_callback_handler_install ();
    ;
    return 0;
@@ -53444,14 +52465,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  eval "$as_ac_var=yes"
+-  ac_cv_lib_sec_putprpwnam=yes
 +if ac_fn_c_try_link "$LINENO"; 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
 -
--	eval "$as_ac_var=no"
+-	ac_cv_lib_sec_putprpwnam=no
 +  ac_cv_lib_readline_rl_callback_handler_install=no
  fi
 -
@@ -53459,198 +52480,73 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- 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: $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 :
-+  TERMLDFLAGS="-L$with_readline/lib"
-+       TERMCPPFLAGS="-I$with_readline/include"
-+       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
-+       TERMLIBS="-lreadline $TERMLIBS"
- 
--        # set_auth_parameters was found in libc or existing $LIBS
-+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
- 
-+       break
-+else
-+  TERMLIBS= CPPFLAGS=$_cppflags
-+fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
--_ACEOF
-+fi
- 
-+done
- 
- 
-+    LDFLAGS=$_ldflags
-+    ;;
-+  esac
- else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- 
--        # set_auth_parameters was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
-+fi
- 
--		    # set_auth_parameters was not found and we already had libsec
--		    # nothing to do here by default
--		    true
- 
--	    ;;
--          *)
--	    # set_auth_parameters was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
--$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
-+
-+
-+# 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.
-+{ $as_echo "$as_me:${as_lineno-$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_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-lreadline $TERMLIBS $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -48094,113 +14829,55 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char set_auth_parameters ();
-+char rl_completion_matches ();
- int
- main ()
- {
--return set_auth_parameters ();
-+return rl_completion_matches ();
-   ;
-   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_sec_set_auth_parameters=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_readline_rl_completion_matches=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_sec_set_auth_parameters=no
-+  ac_cv_lib_readline_rl_completion_matches=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_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
--$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
--if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_putprpwnam" >&5
+-$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
+-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then
 -
 -		LIBS="-lsec $LIBS"
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_SET_AUTH_PARAMETERS 1
+-#define HAVE_PUTPRPWNAM 1
 -_ACEOF
 -
--
--
--else
--
--
--			# set_auth_parameters was not found in libsec
++{ $as_echo "$as_me:${as_lineno-$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 :
++  TERMLDFLAGS="-L$with_readline/lib"
++       TERMCPPFLAGS="-I$with_readline/include"
++       CPPFLAGS="-I$with_readline/include $CPPFLAGS"
++       TERMLIBS="-lreadline $TERMLIBS"
+ 
++$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+ 
++       break
+ else
++  TERMLIBS= CPPFLAGS=$_cppflags
++fi
+ 
++fi
+ 
+-			# putprpwnam was not found in libsec
 -			# nothing to do here by default
 -			true
-+{ $as_echo "$as_me:${as_lineno-$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 :
+-
++done
  
-+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
- 
- fi
+-fi
  
 -	  ;;
 -        esac
- 
-+# not all readline libs have rl_event_hook or history_list
-+ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
-+"
-+if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
-+  ac_have_decl=1
++    LDFLAGS=$_ldflags
++    ;;
++  esac
 +else
-+  ac_have_decl=0
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
  fi
 -done
 -
--
--
--# UnixWare 7.x has its getspnam in -lgen
  
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
-+_ACEOF
  
--for ac_func in getspnam
+ 
+ 
+-for ac_func in set_auth_parameters
 -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 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 :
++# 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.
++{ $as_echo "$as_me:${as_lineno-$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_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -53681,7 +52577,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48208,100 +14885,42 @@
+@@ -47490,100 +14640,54 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -53693,12 +52589,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -choke me
 -#endif
 -
-+char history_list ();
++char rl_completion_matches ();
  int
  main ()
  {
 -return $ac_func ();
-+return history_list ();
++return rl_completion_matches ();
    ;
    return 0;
  }
@@ -53726,13 +52622,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 -  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_readline_history_list=yes
++  ac_cv_lib_readline_rl_completion_matches=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  ac_cv_lib_readline_history_list=no
++  ac_cv_lib_readline_rl_completion_matches=no
  fi
 -
 -rm -rf conftest.dSYM
@@ -53753,36 +52649,159 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
 -
--        # getspnam was found in libc or existing $LIBS
+-        # set_auth_parameters was found in libc or existing $LIBS
+-
++{ $as_echo "$as_me:${as_lineno-$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 :
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
+-_ACEOF
++$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
+ 
++fi
+ 
+ 
++# not all readline libs have rl_event_hook or history_list
++ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
++"
++if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
++  ac_have_decl=1
+ else
++  ac_have_decl=0
++fi
+ 
+-        # set_auth_parameters was not found, try adding libsecurity
+-	case " $LIBS " in
+-          *\ -lsecurity\ *)
+-
+-		    # set_auth_parameters was not found and we already had libsecurity
+-		    # nothing to do here by default
+-		    true
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
++_ACEOF
+ 
+-	    ;;
+-          *)
+-	    # set_auth_parameters was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsecurity" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then
++{ $as_echo "$as_me:${as_lineno-$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
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsecurity  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-lreadline $TERMLIBS $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -47592,111 +14696,43 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char set_auth_parameters ();
++char history_list ();
+ int
+ main ()
+ {
+-return set_auth_parameters ();
++return history_list ();
+   ;
+   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_security_set_auth_parameters=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_readline_history_list=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_security_set_auth_parameters=no
++  ac_cv_lib_readline_history_list=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then
+-
+-		LIBS="-lsecurity $LIBS"
 -
 -
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-#define HAVE_SET_AUTH_PARAMETERS 1
 -_ACEOF
 -
 -
+-
+-else
+-
+-
+-			# set_auth_parameters was not found in libsecurity
+-			# nothing to do here by default
+-			true
+-
+-
+-fi
 +{ $as_echo "$as_me:${as_lineno-$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 :
  
--else
+-	  ;;
+-        esac
 +$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
  
--        # getspnam was not found, try adding libgen
--	case " $LIBS " in
--          *\ -lgen\ *)
-+fi
+ fi
+-done
  
--		    # getspnam was not found and we already had libgen
--		    # nothing to do here by default
--		    true
  
--	    ;;
--          *)
--	    # getspnam was not found, try adding libgen
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
--$as_echo_n "checking for getspnam in -lgen... " >&6; }
--if test "${ac_cv_lib_gen_getspnam+set}" = set; then
+-
+-
+-for ac_func in set_auth_parameters
+-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
 +###############################################
 +# test for where we get yp_get_default_domain() from
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_get_default_domain" >&5
@@ -53790,9 +52809,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgen  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -53800,18 +52817,42 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48310,213 +14929,299 @@
+    Use char because int might match the return type of a GCC
+@@ -47704,316 +14740,299 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char getspnam ();
+-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 yp_get_default_domain ();
  int
  main ()
  {
--return getspnam ();
+-return $ac_func ();
 +return yp_get_default_domain ();
    ;
    return 0;
@@ -53838,7 +52879,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_gen_getspnam=yes
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +for ac_lib in '' nsl; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -53856,44 +52900,48 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
 +if test "${ac_cv_search_yp_get_default_domain+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_yp_get_default_domain=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$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"
  
--	ac_cv_lib_gen_getspnam=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_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_func in yp_get_default_domain
 +do :
 +  ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
 +if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_YP_GET_DEFAULT_DOMAIN 1
-+_ACEOF
-+
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5
--$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
--if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
+ _ACEOF
+ 
+-        # set_auth_parameters was found in libc or existing $LIBS
++fi
 +done
  
--		LIBS="-lgen $LIBS"
  
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
 +# Check if we have execl, if not we need to compile smbrun.
 +for ac_func in execl
 +do :
@@ -53901,17 +52949,82 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test "x$ac_cv_func_execl" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_EXECL 1
-+_ACEOF
-+
+ _ACEOF
+ 
 +fi
 +done
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
 +if test x"$ac_cv_func_execl" = x"no"; then
 +    EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbrun\$(EXEEXT)"
 +fi
-+
+ 
+-else
+-
+-        # set_auth_parameters was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
+-
+-		    # set_auth_parameters was not found and we already had libsec
+-		    # nothing to do here by default
+-		    true
+-
+-	    ;;
+-          *)
+-	    # set_auth_parameters was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for set_auth_parameters in -lsec" >&5
+-$as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsec  $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 set_auth_parameters ();
+-int
+-main ()
+-{
+-return set_auth_parameters ();
+-  ;
+-  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_sec_set_auth_parameters=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +for ac_func in getcwd fchown chmod fchmod mknod mknod64
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -53921,8 +53034,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
-+
-+fi
+ 
+-	ac_cv_lib_sec_set_auth_parameters=no
+ fi
 +done
 +
 +for ac_func in strtol
@@ -53931,12 +53045,48 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test "x$ac_cv_func_strtol" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRTOL 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_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_set_auth_parameters" >&5
+-$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
+-if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then
++done
+ 
+-		LIBS="-lsec $LIBS"
++for ac_func in strchr chflags
++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
++done
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SET_AUTH_PARAMETERS 1
++for ac_func in getrlimit fsync fdatasync setpgid
++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
 +done
  
-+for ac_func in strchr chflags
++for ac_func in setsid glob strpbrk crypt16 getauthuid
 +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"
@@ -53950,7 +53100,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
  
-+for ac_func in getrlimit fsync fdatasync setpgid
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53960,13 +53110,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--			# getspnam was not found in libgen
+-			# set_auth_parameters was not found in libsec
 -			# nothing to do here by default
 -			true
 +fi
 +done
  
-+for ac_func in setsid glob strpbrk crypt16 getauthuid
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53981,7 +53131,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	  ;;
 -        esac
-+for ac_func in sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -53994,7 +53144,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  done
  
-+for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -54007,7 +53157,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
  
-+for ac_func in setpriv setgidx setuidx setgroups sysconf stat64 fstat64
+-# UnixWare 7.x has its getspnam in -lgen
++for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
 +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"
@@ -54030,7 +53181,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in lstat64 fopen64 atexit grantpt lseek64 ftruncate64
++for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
 +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"
@@ -54050,28 +53201,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+fi
-+done
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam
-+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
- 
--#undef $ac_func
 +fi
 +done
  
+-#undef $ac_func
++for ac_func in getpwent_r
++do :
++  ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
++if test "x$ac_cv_func_getpwent_r" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETPWENT_R 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.  */
@@ -54085,15 +53232,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+for ac_func in opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64
-+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
++done
  
 -int
 -main ()
@@ -54102,15 +53242,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+fi
-+done
-+
-+for ac_func in getpwent_r
++for ac_func in getdents64
 +do :
-+  ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
-+if test "x$ac_cv_func_getpwent_r" = x""yes; then :
++  ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
++if test "x$ac_cv_func_getdents64" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETPWENT_R 1
++#define HAVE_GETDENTS64 1
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -54141,19 +53278,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	eval "$as_ac_var=no"
  fi
 +done
-+
-+for ac_func in getdents64
-+do :
-+  ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
-+if test "x$ac_cv_func_getdents64" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETDENTS64 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
@@ -54161,8 +53290,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 setenv strcasecmp fcvt fcvtl
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54176,7 +53303,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -        # getspnam was found in libc or existing $LIBS
 +fi
 +done
- 
++
 +for ac_func in syslog vsyslog timegm
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54187,11 +53314,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
 +fi
 +done
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
 +for ac_func in setlocale nl_langinfo
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -54215,11 +53342,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  else
  
--        # getspnam was not found, try adding libsecurity
+-        # getspnam was not found, try adding libgen
 -	case " $LIBS " in
--          *\ -lsecurity\ *)
+-          *\ -lgen\ *)
  
--		    # getspnam was not found and we already had libsecurity
+-		    # getspnam was not found and we already had libgen
 -		    # nothing to do here by default
 -		    true
 +ac_check_lib_ext_save_LIBS=$LIBS
@@ -54227,10 +53354,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	    ;;
 -          *)
--	    # getspnam was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
--$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_getspnam+set}" = set; then
+-	    # getspnam was not found, try adding libgen
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5
+-$as_echo_n "checking for getspnam in -lgen... " >&6; }
+-if test "${ac_cv_lib_gen_getspnam+set}" = set; then
 +
 +
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
@@ -54239,7 +53366,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
+-LIBS="-lgen  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54249,7 +53376,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48525,111 +15230,155 @@
+@@ -48022,112 +15041,179 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54285,31 +53412,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_getspnam=yes
+-  ac_cv_lib_gen_getspnam=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_ext_rt_nanosleep=yes;
 +		  ac_cv_lib_ext_rt=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_security_getspnam=no
 +  ac_cv_lib_ext_rt_nanosleep=no;
 +		  ac_cv_lib_ext_rt=no
- fi
++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
--LIBS=$ac_check_lib_save_LIBS
+-	ac_cv_lib_gen_getspnam=no
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
--$as_echo "$ac_cv_lib_security_getspnam" >&6; }
--if test "x$ac_cv_lib_security_getspnam" = x""yes; then
--
--		LIBS="-lsecurity $LIBS"
 +{ $as_echo "$as_me:${as_lineno-$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 :
@@ -54317,16 +53434,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define HAVE_NANOSLEEP 1
 +_ACEOF
  
-+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_gen_getspnam" >&5
+-$as_echo "$ac_cv_lib_gen_getspnam" >&6; }
+-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then
 +LIBS=$ac_check_lib_ext_save_LIBS
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
+-		LIBS="-lgen $LIBS"
 +if test $ac_cv_lib_ext_rt = yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBRT 1
- _ACEOF
- 
++_ACEOF
++
 +		case "$LIBS" in
 +		    *-lrt*)
 +			;;
@@ -54336,10 +53459,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		esac
  
  
--else
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
 +fi
 +fi
 +done
++
++for ac_func in utimensat
++do :
++  ac_fn_c_check_func "$LINENO" "utimensat" "ac_cv_func_utimensat"
++if test "x$ac_cv_func_utimensat" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_UTIMENSAT 1
+ _ACEOF
+ 
++fi
++done
  
 +for ac_func in mlock munlock mlockall munlockall
 +do :
@@ -54351,9 +53486,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--			# getspnam was not found in libsecurity
--			# nothing to do here by default
--			true
+-else
 +fi
 +done
  
@@ -54367,11 +53500,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
- fi
+-			# getspnam was not found in libgen
+-			# nothing to do here by default
+-			true
++fi
 +done
  
--	  ;;
--        esac
 +for ac_header in sys/mman.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
@@ -54381,9 +53515,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +_ACEOF
  
  fi
-+
- done
  
+-	  ;;
+-        esac
++done
++
 +# setbuffer, shmget, shm_open are needed for smbtorture
 +for ac_func in shmget shm_open
 +do :
@@ -54394,11 +53530,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
-+
+ 
+ fi
+ done
+ 
++for ac_func in gettext dgettext
++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
 +done
  
-+for ac_func in gettext dgettext
++for ac_func in bindtextdomain textdomain
 +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"
@@ -54476,7 +53625,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -48637,100 +15386,66 @@
+@@ -48135,100 +15221,66 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54588,27 +53737,27 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -else
 -
--        # getspnam was not found, try adding libsec
+-        # getspnam was not found, try adding libsecurity
 -	case " $LIBS " in
--          *\ -lsec\ *)
+-          *\ -lsecurity\ *)
 -
--		    # getspnam was not found and we already had libsec
+-		    # getspnam was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
 -
 -	    ;;
 -          *)
--	    # getspnam was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
--$as_echo_n "checking for getspnam in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_getspnam+set}" = set; then
+-	    # getspnam was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsecurity" >&5
+-$as_echo_n "checking for getspnam in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_getspnam+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$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 :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
+-LIBS="-lsecurity  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54619,7 +53768,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48739,213 +15454,191 @@
+@@ -48237,212 +15289,191 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -54655,14 +53804,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_getspnam=yes
+-  ac_cv_lib_security_getspnam=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_exc_trace_back_stack=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_sec_getspnam=no
+-	ac_cv_lib_security_getspnam=no
 +  ac_cv_lib_exc_trace_back_stack=no
  fi
 -
@@ -54673,25 +53822,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
--$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
--if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getspnam" >&5
+-$as_echo "$ac_cv_lib_security_getspnam" >&6; }
+-if test "x$ac_cv_lib_security_getspnam" = x""yes; then
+-
+-		LIBS="-lsecurity $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
 +{ $as_echo "$as_me:${as_lineno-$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
+ _ACEOF
  
--		LIBS="-lsec $LIBS"
+-
+-
+-else
+-
+-
+-			# getspnam was not found in libsecurity
+-			# nothing to do here by default
+-			true
+-
 +  LIBS="-lexc $LIBS"
  
-+fi
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETSPNAM 1
--_ACEOF
+ fi
  
+-	  ;;
+-        esac
++
 +# check for sysctlbyname for BSD systems
 +for ac_func in sysctlbyname
 +do :
@@ -54701,77 +53863,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define HAVE_SYSCTLBYNAME 1
 +_ACEOF
  
-+fi
-+done
- 
--else
- 
-+#############################
-+# check if building with gpfs
-+for ac_header in gpfs_gpl.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GPFS_GPL_H 1
-+_ACEOF
- 
--			# getspnam was not found in libsec
--			# nothing to do here by default
--			true
-+fi
- 
-+done
- 
--fi
-+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes"; then
- 
--	  ;;
--        esac
-+$as_echo "#define HAVE_GPFS 1" >>confdefs.h
- 
-+    default_shared_modules="$default_shared_modules vfs_gpfs"
  fi
--done
+ done
  
-+#############################################
-+# check if building on Isilon OneFS
-+printf "%s" "checking for Isilon OneFS... "
-+save_LIBS="$LIBS"
-+LIBS="$LIBS -lisi_version"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <isi_version/isi_version.h>
-+int
-+main ()
-+{
-+get_isilon_copyright()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  samba_cv_HAVE_ONEFS=yes
-+else
-+  samba_cv_HAVE_ONEFS=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+echo $samba_cv_HAVE_ONEFS
-+if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
  
-+$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
- 
-+    default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
-+    default_static_modules="$default_static_modules"
-+    ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
-+    # Need to also add general libs for oplocks support
-+    save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
-+fi
- 
-+LIBS="$save_LIBS"
- 
--for ac_func in bigcrypt
+-
+-
+-for ac_func in getspnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -54781,31 +53879,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++#############################
++# check if building with gpfs
++for ac_header in gpfs_gpl.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
++if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GPFS_GPL_H 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 <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
-+# Note that all the libunwind symbols in the API are defined to internal
-+# platform-specific version, so we must include libunwind.h before checking
-+# any of them.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
-+$as_echo_n "checking for libunwind... " >&6; }
-+save_LIBS=$LIBS
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+UNWIND_ARCH="unknown"
-+if test x"$UNAME_I" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_I"
-+elif test x"$UNAME_M" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_M"
-+elif test x"$UNAME_P" != x"unknown"; then
-+	UNWIND_ARCH="$UNAME_P"
 +fi
  
 -#ifdef __STDC__
@@ -54813,26 +53906,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#else
 -# include <assert.h>
 -#endif
-+case "$UNWIND_ARCH" in
-+	unknown)
-+		# This probably won't link without
-+		# the platform-specific libunwind.
-+		LIBS="$LIBS -lunwind"
-+		;;
-+	i386|i586|i686)
-+		# Add the platform-specific libunwind module.
-+		LIBS="$LIBS -lunwind -lunwind-x86"
-+		;;
-+	*)
-+		# Add the platform-specific libunwind module.
-+		# based on uname -i, uname -m or uname -p
-+		LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
-+		;;
-+esac
++done
  
 -#undef $ac_func
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++if test x"$ac_cv_header_gpfs_gpl_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
@@ -54846,20 +53923,25 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
-+#ifdef HAVE_LIBUNWIND_H
-+#include <libunwind.h>
- #endif
+-#endif
++$as_echo "#define HAVE_GPFS 1" >>confdefs.h
++
++    default_shared_modules="$default_shared_modules vfs_gpfs"
++fi
  
++#############################################
++# check if building on Isilon OneFS
++printf "%s" "checking for Isilon OneFS... "
++save_LIBS="$LIBS"
++LIBS="$LIBS -lisi_version"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <isi_version/isi_version.h>
  int
  main ()
  {
 -return $ac_func ();
-+
-+	unw_context_t ctx; unw_cursor_t cur;
-+	char buf[256]; unw_word_t off;
-+	unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
-+	unw_get_proc_name(&cur, buf, sizeof(buf), &off);
-+
++get_isilon_copyright()
    ;
    return 0;
  }
@@ -54886,18 +53968,48 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_link "$LINENO"; then :
++  samba_cv_HAVE_ONEFS=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  samba_cv_HAVE_ONEFS=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++echo $samba_cv_HAVE_ONEFS
++if test x"$samba_cv_HAVE_ONEFS" = x"yes"; then
+ 
 -	eval "$as_ac_var=no"
--fi
-+if ac_fn_c_try_link "$LINENO"; then :
++$as_echo "#define HAVE_ONEFS 1" >>confdefs.h
++
++    default_shared_modules="$default_shared_modules vfs_onefs vfs_onefs_shadow_copy perfcount_onefs"
++    default_static_modules="$default_static_modules"
++    ONEFS_LIBS="-lisi_acl -lisi_ecs -lisi_event -lisi_util"
++    # Need to also add general libs for oplocks support
++    save_LIBS="$save_LIBS -lisi_ecs -lisi_event -lisi_util -ldevstat"
+ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++LIBS="$save_LIBS"
++
++# Note that all the libunwind symbols in the API are defined to internal
++# platform-specific version, so we must include libunwind.h before checking
++# any of them.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libunwind" >&5
++$as_echo_n "checking for libunwind... " >&6; }
++save_LIBS=$LIBS
++
++UNWIND_ARCH="unknown"
++if test x"$UNAME_I" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_I"
++elif test x"$UNAME_M" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_M"
++elif test x"$UNAME_P" != x"unknown"; then
++	UNWIND_ARCH="$UNAME_P"
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -54908,15 +54020,59 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 -_ACEOF
+ 
+-        # getspnam was found in libc or existing $LIBS
++case "$UNWIND_ARCH" in
++	unknown)
++		# This probably won't link without
++		# the platform-specific libunwind.
++		LIBS="$LIBS -lunwind"
++		;;
++	i386|i586|i686)
++		# Add the platform-specific libunwind module.
++		LIBS="$LIBS -lunwind -lunwind-x86"
++		;;
++	*)
++		# Add the platform-specific libunwind module.
++		# based on uname -i, uname -m or uname -p
++		LIBS="$LIBS -lunwind -lunwind-$UNWIND_ARCH"
++		;;
++esac
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#ifdef HAVE_LIBUNWIND_H
++#include <libunwind.h>
++#endif
++
++int
++main ()
++{
+ 
++	unw_context_t ctx; unw_cursor_t cur;
++	char buf[256]; unw_word_t off;
++	unw_getcontext(&ctx); unw_init_local(&cur, &ctx);
++	unw_get_proc_name(&cur, buf, sizeof(buf), &off);
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETSPNAM 1
++  ;
++  return 0;
++}
+ _ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
  
--        # bigcrypt was found in libc or existing $LIBS
 +$as_echo "#define HAVE_LIBUNWIND 1" >>confdefs.h
  
+-else
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-        # getspnam was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
 +	# If we have libunwind, test whether we also have libunwind-ptrace
 +	# which would let us unwind arbitrary processes.
 +	save_LIBS=$LIBS
@@ -54926,35 +54082,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBUNWIND_PTRACE_H 1
- _ACEOF
++_ACEOF
  
-+fi
- 
-+done
- 
--else
--
--        # bigcrypt was not found, try adding libsecurity
--	case " $LIBS " in
--          *\ -lsecurity\ *)
--
--		    # bigcrypt was not found and we already had libsecurity
+-		    # getspnam was not found and we already had libsec
 -		    # nothing to do here by default
 -		    true
--
++fi
+ 
 -	    ;;
 -          *)
--	    # bigcrypt was not found, try adding libsecurity
--	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
--$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
--if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
+-	    # getspnam was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for getspnam in -lsec" >&5
+-$as_echo_n "checking for getspnam in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_getspnam+set}" = set; then
++done
++
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
 +$as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
 +if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsecurity  $LIBS"
+-LIBS="-lsec  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54965,16 +54114,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -48954,754 +15647,594 @@
+@@ -48451,969 +15482,594 @@
  #ifdef __cplusplus
  extern "C"
  #endif
--char bigcrypt ();
+-char getspnam ();
 +char _UPT_create ();
  int
  main ()
  {
--return bigcrypt ();
+-return getspnam ();
 +return _UPT_create ();
    ;
    return 0;
@@ -55001,14 +54150,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_security_bigcrypt=yes
+-  ac_cv_lib_sec_getspnam=yes
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_unwind_ptrace__UPT_create=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_lib_security_bigcrypt=no
+-	ac_cv_lib_sec_getspnam=no
 +  ac_cv_lib_unwind_ptrace__UPT_create=no
  fi
 -
@@ -55019,18 +54168,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
--$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
--if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_getspnam" >&5
+-$as_echo "$ac_cv_lib_sec_getspnam" >&6; }
+-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then
 -
--		LIBS="-lsecurity $LIBS"
+-		LIBS="-lsec $LIBS"
 -
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
 +$as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
 +if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
  
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_BIGCRYPT 1
+-#define HAVE_GETSPNAM 1
 -_ACEOF
 +		LIBUNWIND_PTRACE="-lunwind-ptrace";
  
@@ -55040,7 +54189,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
 -
 -
--			# bigcrypt was not found in libsecurity
+-			# getspnam was not found in libsec
 -			# nothing to do here by default
 -			true
 -
@@ -55050,9 +54199,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	  ;;
 -        esac
- 
+-
 -fi
 -done
+ 
 +	LIBS=$save_LIBS
  
 +else
@@ -55193,19 +54343,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_exeext conftest.$ac_ext
 +fi
++
++
++
++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`
++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
  
 -        # bigcrypt was found in libc or existing $LIBS
- 
+-
++fi
++done
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
-+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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -55218,23 +54379,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
  
-+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`
-+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
- 
--else
-+fi
-+done
- 
--        # bigcrypt was not found, try adding libsec
--	case " $LIBS " in
--          *\ -lsec\ *)
 +for ac_func in __getcwd _getcwd
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55245,7 +54389,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--		    # bigcrypt was not found and we already had libsec
+-else
++fi
++done
+ 
+-        # bigcrypt was not found, try adding libsecurity
+-	case " $LIBS " in
+-          *\ -lsecurity\ *)
++for ac_func in __xstat __fxstat __lxstat
++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
+ 
+-		    # bigcrypt was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
 +fi
@@ -55253,17 +54414,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	    ;;
 -          *)
--	    # bigcrypt was not found, try adding libsec
--	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
--$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
--if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
+-	    # bigcrypt was not found, try adding libsecurity
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsecurity" >&5
+-$as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
+-if test "${ac_cv_lib_security_bigcrypt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsec  $LIBS"
+-LIBS="-lsecurity  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in __xstat __fxstat __lxstat
++for ac_func in _stat _lstat _fstat __stat __lstat __fstat
 +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"
@@ -55293,7 +54454,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
 +
-+for ac_func in _stat _lstat _fstat __stat __lstat __fstat
++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`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -55323,16 +54484,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_sec_bigcrypt=yes
+-  ac_cv_lib_security_bigcrypt=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--	ac_cv_lib_sec_bigcrypt=no
+-	ac_cv_lib_security_bigcrypt=no
  fi
 +done
 +
-+for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
++for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
 +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"
@@ -55347,13 +54508,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
  fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sec_bigcrypt" >&5
--$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
--if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then
 +done
  
--		LIBS="-lsec $LIBS"
-+for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
+-		LIBS="-lsecurity $LIBS"
++for ac_func in getdents __getdents _lseek __lseek _read __read
 +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"
@@ -55368,7 +54529,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BIGCRYPT 1
-+for ac_func in getdents __getdents _lseek __lseek _read __read
++for ac_func in getdirentries _write __write _fork __fork
 +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"
@@ -55381,20 +54542,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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`
-+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
- 
--else
-+fi
-+done
- 
 +for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55405,13 +54552,27 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
  
--			# bigcrypt was not found in libsec
+-else
++fi
++done
+ 
++for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
++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
+ 
+-			# bigcrypt was not found in libsecurity
 -			# nothing to do here by default
 -			true
 +fi
 +done
  
-+for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
++for ac_func in pread _pread __pread pread64 _pread64 __pread64
 +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"
@@ -55426,7 +54587,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	  ;;
 -        esac
-+for ac_func in pread _pread __pread pread64 _pread64 __pread64
++for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
 +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"
@@ -55439,19 +54600,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  done
  
-+for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
-+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
-+done
- 
 +for ac_func in open64 _open64 __open64 creat64
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55465,7 +54613,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
  
--for ac_func in getprpwnam
+-
+-for ac_func in bigcrypt
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -55573,8 +54722,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
+-
+-        # bigcrypt was found in libc or existing $LIBS
+-
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
 +#
 +#
 +#
@@ -55582,63 +54739,277 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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
  
--        # getprpwnam was found in libc or existing $LIBS
 +fi
 +done
  
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
--_ACEOF
+-else
+-
+-        # bigcrypt was not found, try adding libsec
+-	case " $LIBS " in
+-          *\ -lsec\ *)
+-
+-		    # bigcrypt was not found and we already had libsec
+-		    # nothing to do here by default
+-		    true
 +#
 +# stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
 +#
  
+-	    ;;
+-          *)
+-	    # bigcrypt was not found, try adding libsec
+-	    { $as_echo "$as_me:$LINENO: checking for bigcrypt in -lsec" >&5
+-$as_echo_n "checking for bigcrypt in -lsec... " >&6; }
+-if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsec  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +if test x$ac_cv_func_stat64 = xno ; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stat64 in <sys/stat.h>" >&5
 +$as_echo_n "checking for stat64 in <sys/stat.h>... " >&6; }
 +  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"
 +#if defined(HAVE_UNISTD_H)
 +#include <unistd.h>
-+#endif
+ #endif
+-char bigcrypt ();
 +#include <sys/stat.h>
- 
--else
-+int
-+main ()
-+{
++
+ int
+ main ()
+ {
+-return bigcrypt ();
 +struct stat64 st64; exit(stat64(".",&st64));
-+  ;
-+  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_sec_bigcrypt=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_sec_bigcrypt=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_sec_bigcrypt" >&5
+-$as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
+-if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then
+-
+-		LIBS="-lsec $LIBS"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BIGCRYPT 1
+-_ACEOF
+-
+-
+-
+-else
+-
+-
+-			# bigcrypt was not found in libsec
+-			# nothing to do here by default
+-			true
+-
+-
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_func_stat64=yes
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat64" >&5
 +$as_echo "$ac_cv_func_stat64" >&6; }
 +  if test x$ac_cv_func_stat64 = xyes ; then
  
+-	  ;;
+-        esac
++$as_echo "#define HAVE_STAT64 1" >>confdefs.h
+ 
++  fi
+ fi
+-done
+-
+-
+ 
+-
+-
+-for ac_func in getprpwnam
+-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
++if test x$ac_cv_func_lstat64 = xno ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
++#if defined(HAVE_UNISTD_H)
++#include <unistd.h>
+ #endif
++#include <sys/stat.h>
+ 
+ int
+ main ()
+ {
+-return $ac_func ();
++struct stat64 st64; exit(lstat64(".",&st64));
+   ;
+   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
+-
+-	eval "$as_ac_var=no"
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_func_lstat64=yes
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat64" >&5
++$as_echo "$ac_cv_func_lstat64" >&6; }
++  if test x$ac_cv_func_lstat64 = xyes ; then
++    $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>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
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-        # getprpwnam was found in libc or existing $LIBS
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
+-_ACEOF
+-
+-
+-
+-else
+-
 -        # getprpwnam was not found, try adding libsecurity
 -	case " $LIBS " in
 -          *\ -lsecurity\ *)
-+$as_echo "#define HAVE_STAT64 1" >>confdefs.h
- 
+-
 -		    # getprpwnam was not found and we already had libsecurity
 -		    # nothing to do here by default
 -		    true
-+  fi
-+fi
- 
+-
 -	    ;;
 -          *)
 -	    # getprpwnam was not found, try adding libsecurity
@@ -55654,17 +55025,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+if test x$ac_cv_func_lstat64 = xno ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lstat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for lstat64 in <sys/stat.h>... " >&6; }
-+  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"
++if test x$ac_cv_func_fstat64 = xno ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
++$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
 +#if defined(HAVE_UNISTD_H)
 +#include <unistd.h>
  #endif
@@ -55675,7 +55048,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  main ()
  {
 -return getprpwnam ();
-+struct stat64 st64; exit(lstat64(".",&st64));
++struct stat64 st64; exit(fstat64(0,&st64));
    ;
    return 0;
  }
@@ -55708,19 +55081,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -	ac_cv_lib_security_getprpwnam=no
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_lstat64=yes
++  ac_cv_func_fstat64=yes
  fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat64" >&5
-+$as_echo "$ac_cv_func_lstat64" >&6; }
-+  if test x$ac_cv_func_lstat64 = xyes ; then
-+    $as_echo "#define HAVE_LSTAT64 Whether lstat64() is available" >>confdefs.h
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fstat64" >&5
++$as_echo "$ac_cv_func_fstat64" >&6; }
++  if test x$ac_cv_func_fstat64 = xyes ; then
  
 -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
++$as_echo "#define HAVE_FSTAT64 1" >>confdefs.h
++
 +  fi
  fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_security_getprpwnam" >&5
@@ -55728,42 +55102,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then
  
 -		LIBS="-lsecurity $LIBS"
-+if test x$ac_cv_func_fstat64 = xno ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fstat64 in <sys/stat.h>" >&5
-+$as_echo_n "checking for fstat64 in <sys/stat.h>... " >&6; }
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+#if defined(HAVE_UNISTD_H)
-+#include <unistd.h>
-+#endif
-+#include <sys/stat.h>
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETPRPWNAM 1
-+int
-+main ()
-+{
-+struct stat64 st64; exit(fstat64(0,&st64));
-+  ;
-+  return 0;
-+}
- _ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_func_fstat64=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fstat64" >&5
-+$as_echo "$ac_cv_func_fstat64" >&6; }
-+  if test x$ac_cv_func_fstat64 = xyes ; then
- 
-+$as_echo "#define HAVE_FSTAT64 1" >>confdefs.h
- 
-+  fi
-+fi
- 
--else
 +#################################################
 +# Check whether struct stat has timestamps with sub-second resolution.
 +#
@@ -55772,33 +55110,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
 +if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
  
--			# getprpwnam was not found in libsecurity
--			# nothing to do here by default
--			true
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETPRPWNAM 1
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+_ACEOF
-+
+ _ACEOF
+ 
 +# Linux, Solaris
 +	samba_cv_stat_hires=yes
 +fi
  
 +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
 +if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
-+
+ 
+-else
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
 +_ACEOF
  
 +# BSD, if defined _POSIX_SOURCE
 +	samba_cv_stat_hires=yes
- fi
++fi
  
--	  ;;
--        esac
+-			# getprpwnam was not found in libsecurity
+-			# nothing to do here by default
+-			true
 +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
 +if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then :
-+
+ 
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
 +_ACEOF
@@ -55806,8 +55145,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +# BSD, if not defined _POSIX_SOURCE
 +	samba_cv_stat_hires=yes
  fi
--done
  
+-	  ;;
+-        esac
 +ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
 +if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
 +
@@ -55817,11 +55157,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 +# AIX
 +	samba_cv_stat_hires=yes
-+fi
+ fi
+-done
  
 +ac_fn_c_check_member "$LINENO" "struct stat" "st_umtime" "ac_cv_member_struct_stat_st_umtime" "$ac_includes_default"
 +if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then :
  
++cat >>confdefs.h <<_ACEOF
++#define HAVE_STRUCT_STAT_ST_UMTIME 1
++_ACEOF
+ 
++# Tru64
++	samba_cv_stat_hires=yes
++fi
+ 
 -for ac_func in getprpwnam
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -55832,9 +55181,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_STAT_ST_UMTIME 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -55846,18 +55193,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Tru64
-+	samba_cv_stat_hires=yes
-+fi
++if test x"$samba_cv_stat_hires" = x"yes" ; then
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++$as_echo "#define HAVE_STAT_HIRES_TIMESTAMPS 1" >>confdefs.h
  
 -#undef $ac_func
-+if test x"$samba_cv_stat_hires" = x"yes" ; then
++fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -55872,7 +55218,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
-+$as_echo "#define HAVE_STAT_HIRES_TIMESTAMPS 1" >>confdefs.h
++# recent FreeBSD, NetBSD have creation timestamps called birthtime:
++ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "$ac_includes_default"
++if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
  
 -int
 -main ()
@@ -55881,12 +55229,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
-+fi
-+
-+# recent FreeBSD, NetBSD have creation timestamps called birthtime:
-+ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "$ac_includes_default"
-+if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
-+
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
  _ACEOF
@@ -56081,9 +55423,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
 -done
+-
+-
  
--
--
 -
 -for ac_func in strsignal
 -do
@@ -56126,7 +55468,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49709,85 +16242,43 @@
+@@ -49421,85 +16077,43 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56232,7 +55574,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -49796,108 +16287,44 @@
+@@ -49508,108 +16122,44 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56363,7 +55705,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -49905,103 +16332,80 @@
+@@ -49617,103 +16167,80 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56412,28 +55754,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_resolv___dn_expand=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
-+$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
-+if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBRESOLV 1
-+_ACEOF
-+
-+  LIBS="-lresolv $LIBS"
- 
+-
 -	eval "$as_ac_var=no"
++  ac_cv_lib_resolv___dn_expand=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
++LIBS=$ac_check_lib_save_LIBS
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -56441,7 +55773,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_resolv___dn_expand" >&5
++$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
++if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LIBRESOLV 1
+ _ACEOF
+ 
++  LIBS="-lresolv $LIBS"
 +
+ fi
+-done
+ 
+ 
 +#
 +# Check for the functions putprpwnam, set_auth_parameters,
 +# getspnam, bigcrypt and getprpwnam in -lsec and -lsecurity
@@ -56453,16 +55798,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +do :
 +  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
 +if test "x$ac_cv_func_putprpwnam" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_PUTPRPWNAM 1
- _ACEOF
- 
--fi
--done
++_ACEOF
++
 +        # putprpwnam was found in libc or existing $LIBS
- 
- 
++
++
 +$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
  
@@ -56518,7 +55860,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50009,100 +16413,90 @@
+@@ -49721,183 +16248,89 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -56567,12 +55909,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_security_putprpwnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_putprpwnam" >&5
 +$as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
 +if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then :
@@ -56592,15 +55936,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			true
 +
  
--	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
-+	  ;;
-+        esac
-+
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -56609,26 +55947,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 putprpwnam
-+do :
-+  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-+if test "x$ac_cv_func_putprpwnam" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_PUTPRPWNAM 1
- _ACEOF
+-_ACEOF
++
++	  ;;
++        esac
  
--fi
--done
-+        # putprpwnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-+
+ fi
+ done
  
  
 -for ac_func in sizeof_proplist_entry
@@ -56638,10 +55965,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -$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
++
++  for ac_func in putprpwnam
++do :
++  ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
++if test "x$ac_cv_func_putprpwnam" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_PUTPRPWNAM 1
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -56653,39 +55987,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # putprpwnam was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
++        # putprpwnam was found in libc or existing $LIBS
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+		    # putprpwnam was not found and we already had libsec
-+		    # nothing to do here by default
-+		    true
  
 -#undef $ac_func
-+	    ;;
-+          *)
-+	    # putprpwnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
-+$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -50110,82 +16504,90 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* 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
@@ -56693,17 +56011,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
-+char putprpwnam ();
- int
- main ()
- {
+ 
+-int
+-main ()
+-{
 -return $ac_func ();
-+return putprpwnam ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -56726,46 +56042,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_sec_putprpwnam=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_sec_putprpwnam=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_putprpwnam" >&5
-+$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
-+if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then :
-+
-+		LIBS="-lsec $LIBS"
-+
-+
-+$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
-+			# putprpwnam was not found in libsec
-+			# nothing to do here by default
-+			true
-+
  
 -	eval "$as_ac_var=no"
- fi
+-fi
++else
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+	  ;;
-+        esac
-+
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -56773,50 +56061,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 set_auth_parameters
-+do :
-+  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
-+if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SET_AUTH_PARAMETERS 1
- _ACEOF
+-_ACEOF
++        # putprpwnam was not found, try adding libsec
++	case " $LIBS " in
++          *\ -lsec\ *)
  
 -fi
 -done
-+        # set_auth_parameters was found in libc or existing $LIBS
++		    # putprpwnam was not found and we already had libsec
++		    # nothing to do here by default
++		    true
  
 -  ;;
 -  *)
 -	{ $as_echo "$as_me:$LINENO: checking for library containing getxattr" >&5
 -$as_echo_n "checking for library containing getxattr... " >&6; }
 -if test "${ac_cv_search_getxattr+set}" = set; then
-+
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+        # set_auth_parameters was not found, try adding libsecurity
-+	case " $LIBS " in
-+          *\ -lsecurity\ *)
-+
-+		    # set_auth_parameters was not found and we already had libsecurity
-+		    # nothing to do here by default
-+		    true
-+
 +	    ;;
 +          *)
-+	    # set_auth_parameters was not found, try adding libsecurity
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
-+$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
-+if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
++	    # putprpwnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
++$as_echo_n "checking for putprpwnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  ac_func_search_save_LIBS=$LIBS
@@ -56826,22 +56094,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsecurity  $LIBS"
++LIBS="-lsec  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -50194,109 +16596,90 @@
+@@ -49906,109 +16339,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char getxattr ();
-+char set_auth_parameters ();
++char putprpwnam ();
  int
  main ()
  {
 -return getxattr ();
-+return set_auth_parameters ();
++return putprpwnam ();
    ;
    return 0;
  }
@@ -56876,24 +56144,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 -  ac_cv_search_getxattr=$ac_res
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_security_set_auth_parameters=yes
++  ac_cv_lib_sec_putprpwnam=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_security_set_auth_parameters=no
++  ac_cv_lib_sec_putprpwnam=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_set_auth_parameters" >&5
-+$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
-+if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_putprpwnam" >&5
++$as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
++if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then :
 +
-+		LIBS="-lsecurity $LIBS"
++		LIBS="-lsec $LIBS"
 +
 +
-+$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++$as_echo "#define HAVE_PUTPRPWNAM 1" >>confdefs.h
  
  
 -fi
@@ -56914,7 +56182,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -LIBS=$ac_func_search_save_LIBS
 +
 +
-+			# set_auth_parameters was not found in libsecurity
++			# putprpwnam was not found in libsec
 +			# nothing to do here by default
 +			true
 +
@@ -56931,9 +56199,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
 +done
-+
-+
-+
+ 
+ 
+ 
+ 
 +  for ac_func in set_auth_parameters
 +do :
 +  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
@@ -56941,15 +56210,180 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SET_AUTH_PARAMETERS 1
 +_ACEOF
- 
++
 +        # set_auth_parameters was found in libc or existing $LIBS
++
++
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++
  
  
+-for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++        # set_auth_parameters was not found, try adding libsecurity
++	case " $LIBS " in
++          *\ -lsecurity\ *)
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++		    # set_auth_parameters was not found and we already had libsecurity
++		    # nothing to do here by default
++		    true
+ 
+-#undef $ac_func
++	    ;;
++          *)
++	    # set_auth_parameters was not found, try adding libsecurity
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
++$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
++if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsecurity  $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
+@@ -50016,105 +16431,90 @@
+ #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 set_auth_parameters ();
+ int
+ main ()
+ {
+-return $ac_func ();
++return set_auth_parameters ();
+   ;
+   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_security_set_auth_parameters=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
++  ac_cv_lib_security_set_auth_parameters=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_set_auth_parameters" >&5
++$as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
++if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then :
++
++		LIBS="-lsecurity $LIBS"
++
++
++$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
++
++
++
++else
++
++
++			# set_auth_parameters was not found in libsecurity
++			# nothing to do here by default
++			true
++
+ 
+-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
++
++	  ;;
++        esac
+ 
+ fi
+ done
+ 
+ 
+ 
++  for ac_func in set_auth_parameters
++do :
++  ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
++if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SET_AUTH_PARAMETERS 1
++_ACEOF
++
++        # set_auth_parameters was found in libc or existing $LIBS
++
+ 
 +$as_echo "#define HAVE_SET_AUTH_PARAMETERS 1" >>confdefs.h
  
  
  
--for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
+-for ac_func in getea fgetea lgetea listea flistea llistea
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57000,7 +56434,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50304,105 +16687,92 @@
+@@ -50122,105 +16522,92 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57052,11 +56486,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -	eval "$as_ac_var=no"
 +  ac_cv_lib_sec_set_auth_parameters=no
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_set_auth_parameters" >&5
 +$as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
 +if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then :
@@ -57116,7 +56550,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
--for ac_func in getea fgetea lgetea listea flistea llistea
+-for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57167,7 +56601,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50410,65 +16780,47 @@
+@@ -50228,103 +16615,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57216,10 +56650,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_gen_getspnam=no
- fi
++fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
@@ -57243,9 +56675,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +			true
 +
  
+-	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
++	  ;;
++        esac
++
  fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
@@ -57254,35 +56692,30 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
++done
++
++
++
 +
-+	  ;;
-+        esac
- 
- fi
- done
-@@ -50476,39 +16828,43 @@
- 
- 
- 
 +  for ac_func in getspnam
 +do :
 +  ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
 +if test "x$ac_cv_func_getspnam" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETSPNAM 1
-+_ACEOF
-+
+ _ACEOF
+ 
+-fi
+-done
 +        # getspnam was found in libc or existing $LIBS
-+
-+
+ 
+ 
 +$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
  
  
  
--for ac_func in removeea fremoveea lremoveea setea fsetea lsetea
+-for ac_func in flistxattr removexattr lremovexattr fremovexattr
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57333,7 +56766,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50516,103 +16872,90 @@
+@@ -50332,102 +16707,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57440,65 +56873,64 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -done
 +        # getspnam was found in libc or existing $LIBS
-+
+ 
  
 +$as_echo "#define HAVE_GETSPNAM 1" >>confdefs.h
- 
- 
- 
-+else
 +
-+        # getspnam was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
-+
-+		    # getspnam was not found and we already had libsec
-+		    # nothing to do here by default
-+		    true
  
--for ac_func in flistxattr removexattr lremovexattr fremovexattr
+ 
+-for ac_func in setxattr lsetxattr fsetxattr
 -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
-+	    ;;
-+          *)
-+	    # getspnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
-+$as_echo_n "checking for getspnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $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
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+-/* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++        # getspnam was not found, try adding libsec
++	case " $LIBS " in
++          *\ -lsec\ *)
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++		    # getspnam was not found and we already had libsec
++		    # nothing to do here by default
++		    true
+ 
 -#undef $ac_func
++	    ;;
++          *)
++	    # getspnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
++$as_echo_n "checking for getspnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsec  $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
-@@ -50620,102 +16963,91 @@
+@@ -50435,103 +16798,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57609,10 +57041,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
 +$as_echo "#define HAVE_BIGCRYPT 1" >>confdefs.h
-+
  
  
--for ac_func in setxattr lsetxattr fsetxattr
+ 
+-for ac_func in attr_get attr_list attr_set attr_remove
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57629,25 +57061,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+        # bigcrypt was not found, try adding libsecurity
-+	case " $LIBS " in
-+          *\ -lsecurity\ *)
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
++        # bigcrypt was not found, try adding libsecurity
++	case " $LIBS " in
++          *\ -lsecurity\ *)
+ 
+-#undef $ac_func
 +		    # bigcrypt was not found and we already had libsecurity
 +		    # nothing to do here by default
 +		    true
- 
--#undef $ac_func
++
 +	    ;;
 +          *)
 +	    # bigcrypt was not found, try adding libsecurity
@@ -57663,7 +57096,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50723,103 +17055,90 @@
+@@ -50539,103 +16890,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57776,7 +57209,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
--for ac_func in attr_get attr_list attr_set attr_remove
+-for ac_func in attr_getf attr_listf attr_setf attr_removef
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57827,7 +57260,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50827,103 +17146,91 @@
+@@ -50643,107 +16981,91 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -57935,13 +57368,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -done
 +        # getprpwnam was found in libc or existing $LIBS
- 
- 
++
++
 +$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
  
+-  ;;
+-esac
  
+-########################################################
+-# Check if attropen() is present if this is Solaris
+-case "$host_os" in
+-  *solaris*)
  
--for ac_func in attr_getf attr_listf attr_setf attr_removef
+-for ac_func in attropen
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -57992,7 +57431,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -50931,107 +17238,90 @@
+@@ -50751,190 +17073,90 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58041,185 +57480,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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_security_getprpwnam=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5
-+$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
-+if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then :
-+
-+		LIBS="-lsecurity $LIBS"
-+
-+
-+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
-+
-+
-+
-+else
-+
-+
-+			# getprpwnam was not found in libsecurity
-+			# nothing to do here by default
-+			true
-+
- 
--	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
-+	  ;;
-+        esac
-+
- 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 getprpwnam
-+do :
-+  ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
-+if test "x$ac_cv_func_getprpwnam" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_GETPRPWNAM 1
- _ACEOF
- 
--fi
--done
-+        # getprpwnam was found in libc or existing $LIBS
-+
-+
-+$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
- 
--  ;;
--esac
- 
--########################################################
--# Check if attropen() is present if this is Solaris
--case "$host_os" in
--  *solaris*)
- 
--for ac_func in attropen
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
-+        # getprpwnam was not found, try adding libsec
-+	case " $LIBS " in
-+          *\ -lsec\ *)
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+		    # getprpwnam was not found and we already had libsec
-+		    # nothing to do here by default
-+		    true
- 
--#undef $ac_func
-+	    ;;
-+          *)
-+	    # getprpwnam was not found, try adding libsec
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsec" >&5
-+$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
-+if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsec  $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
-@@ -51039,190 +17329,77 @@
- #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 getprpwnam ();
- int
- main ()
- {
--return $ac_func ();
-+return getprpwnam ();
-   ;
-   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_sec_getprpwnam=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
-+  ac_cv_lib_sec_getprpwnam=no
- fi
+-fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -58239,9 +57508,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -  ;;
 -esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_getprpwnam" >&5
-+$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
-+if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5
++$as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
++if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then :
  
 -########################################################
 -# Do xattr functions take additional options like on Darwin?
@@ -58251,7 +57520,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "${smb_attr_cv_xattr_add_opt+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
-+		LIBS="-lsec $LIBS"
++		LIBS="-lsecurity $LIBS"
  
 -		old_LIBS=$LIBS
 -		LIBS="$LIBS $ACL_LIBS"
@@ -58307,7 +57576,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+			# getprpwnam was not found in libsec
++			# getprpwnam was not found in libsecurity
 +			# nothing to do here by default
 +			true
 +
@@ -58333,23 +57602,186 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -cat >>confdefs.h <<\_ACEOF
 -#define BROKEN_EXTATTR 1
--_ACEOF
++
++  for ac_func in getprpwnam
++do :
++  ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
++if test "x$ac_cv_func_getprpwnam" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GETPRPWNAM 1
+ _ACEOF
  
 -    ;;
 -  *)
++        # getprpwnam was found in libc or existing $LIBS
++
++
++$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
+ 
+ 
+ 
+-for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++        # getprpwnam was not found, try adding libsec
++	case " $LIBS " in
++          *\ -lsec\ *)
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++		    # getprpwnam was not found and we already had libsec
++		    # nothing to do here by default
++		    true
+ 
+-#undef $ac_func
++	    ;;
++          *)
++	    # getprpwnam was not found, try adding libsec
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsec" >&5
++$as_echo_n "checking for getprpwnam in -lsec... " >&6; }
++if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsec  $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
+@@ -50942,102 +17164,77 @@
+ #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 getprpwnam ();
+ int
+ main ()
+ {
+-return $ac_func ();
++return getprpwnam ();
+   ;
+   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_sec_getprpwnam=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_sec_getprpwnam=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_getprpwnam" >&5
++$as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
++if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then :
++
++		LIBS="-lsec $LIBS"
++
++
++$as_echo "#define HAVE_GETPRPWNAM 1" >>confdefs.h
++
++
++
++else
++
++
++			# getprpwnam was not found in libsec
++			# nothing to do here by default
++			true
++
+ 
+-	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
++	  ;;
++        esac
++
+ 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 strsignal
 +do :
 +  ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
 +if test "x$ac_cv_func_strsignal" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_STRSIGNAL 1
-+_ACEOF
+ _ACEOF
  
-+fi
-+done
+ fi
+ done
  
  
--for ac_func in extattr_delete_fd extattr_delete_file extattr_delete_link
+-
+-
+-for ac_func in extattr_get_fd extattr_get_file extattr_get_link
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -58391,7 +57823,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -51230,62 +17407,66 @@
+@@ -51045,62 +17242,53 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58435,6 +57867,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 '' proplist; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -58452,41 +57887,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
 +if test "${ac_cv_search_getproplist+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_getproplist=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
-+fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getproplist" >&5
 +$as_echo "$ac_cv_search_getproplist" >&6; }
 +ac_res=$ac_cv_search_getproplist
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+	for ac_func in getproplist fgetproplist setproplist fsetproplist
-+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
- 
--	eval "$as_ac_var=no"
- fi
-+done
  
 -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
@@ -58494,7 +57912,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+	for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
++
++	for ac_func in getproplist fgetproplist setproplist fsetproplist
 +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"
@@ -58503,10 +57922,23 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51293,39 +17474,27 @@
+@@ -51108,39 +17296,40 @@
  fi
  done
  
++	for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
++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
++done
+ 
 +	for ac_func in sizeof_proplist_entry
 +do :
 +  ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
@@ -58518,8 +57950,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
  
--
--for ac_func in extattr_get_fd extattr_get_file extattr_get_link
+-for ac_func in extattr_list_fd extattr_list_file extattr_list_link
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -58559,7 +57990,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -51333,62 +17502,53 @@
+@@ -51148,62 +17337,118 @@
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -58603,9 +58034,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 '' attr; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -58623,31 +58051,22 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +fi
 +done
 +if test "${ac_cv_search_getxattr+set}" = set; then :
- 
--	eval "$as_ac_var=no"
-+else
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  ac_cv_search_getxattr=no
 +fi
 +rm conftest.$ac_ext
 +LIBS=$ac_func_search_save_LIBS
- fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getxattr" >&5
 +$as_echo "$ac_cv_search_getxattr" >&6; }
 +ac_res=$ac_cv_search_getxattr
 +if test "$ac_res" != no; then :
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
--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
++
++fi
 +
 +	for ac_func in getxattr lgetxattr fgetxattr listxattr llistxattr
 +do :
@@ -58655,13 +58074,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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
-@@ -51396,102 +17556,64 @@
- fi
- done
- 
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
 +	for ac_func in getea fgetea lgetea listea flistea llistea
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58671,21 +58090,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +_ACEOF
- 
++
 +fi
 +done
- 
--
--for ac_func in extattr_list_fd extattr_list_file extattr_list_link
--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 removeea fremoveea lremoveea setea fsetea lsetea
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58694,28 +58102,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
++_ACEOF
++
 +fi
 +done
- 
--#undef $ac_func
++
 +	for ac_func in flistxattr removexattr lremovexattr fremovexattr
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58726,29 +58117,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define `$as_echo "HAVE_$ac_func" | $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.  */
--#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
-+fi
+-	eval "$as_ac_var=no"
+ fi
 +done
- 
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
++
 +	for ac_func in setxattr lsetxattr fsetxattr
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58757,41 +58129,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
--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
- 
--	eval "$as_ac_var=no"
- fi
-+done
++_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
@@ -58799,6 +58142,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 attr_get attr_list attr_set attr_remove
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -58808,7 +58153,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51499,102 +17621,141 @@
+@@ -51211,102 +17456,141 @@
  fi
  done
  
@@ -59025,7 +58370,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -51606,7 +17767,7 @@
+@@ -51318,7 +17602,7 @@
  esac
  
  # Check whether --enable-static was given.
@@ -59034,7 +58379,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_static; p=${PACKAGE-default}
  case $enableval in
  yes) enable_static=yes ;;
-@@ -51628,7 +17789,7 @@
+@@ -51340,7 +17624,7 @@
  fi
  
  # Check whether --enable-shared was given.
@@ -59043,7 +58388,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_shared; p=${PACKAGE-default}
  case $enableval in
  yes) enable_shared=yes ;;
-@@ -51655,16 +17816,16 @@
+@@ -51367,16 +17651,16 @@
  PIE_CFLAGS=""
  PIE_LDFLAGS=""
  # Check whether --enable-pie was given.
@@ -59063,7 +58408,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51673,11 +17834,11 @@
+@@ -51385,11 +17669,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -59078,7 +58423,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		then
  			samba_cv_fpie=yes
  		else
-@@ -51686,7 +17847,7 @@
+@@ -51398,7 +17682,7 @@
  		rm -f conftest*
  
  fi
@@ -59087,7 +58432,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_fpie" >&6; }
  	if test x"${samba_cv_fpie}" = x"yes"
  	then
-@@ -51698,16 +17859,16 @@
+@@ -51410,16 +17694,16 @@
  # Set defaults
  RELRO_LDFLAGS=""
  # Check whether --enable-relro was given.
@@ -59107,7 +58452,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -51716,11 +17877,11 @@
+@@ -51428,11 +17712,11 @@
  main () { return 0;}
  EOF
  		if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -59122,7 +58467,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		then
  			samba_cv_relro=yes
  		else
-@@ -51729,7 +17890,7 @@
+@@ -51441,7 +17725,7 @@
  		rm -f conftest*
  
  fi
@@ -59131,7 +58476,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_relro" >&6; }
  	if test x"${samba_cv_relro}" = x"yes"
  	then
-@@ -51758,7 +17919,7 @@
+@@ -51470,7 +17754,7 @@
  # You need to specify how to create a shared library and
    # how to compile C code to produce PIC object files
  
@@ -59140,7 +58485,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking ability to build shared libraries... " >&6; }
  
    # and these are for particular systems
-@@ -51766,14 +17927,10 @@
+@@ -51478,14 +17762,10 @@
  		*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
  			case "$host_os" in
  				*linux*)
@@ -59157,7 +58502,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
   ;;
  			esac
  			BLDSHARED="true"
-@@ -51785,15 +17942,11 @@
+@@ -51496,15 +17776,11 @@
  			DYNEXP="-Wl,--export-dynamic"
  			PICFLAG="-fPIC"
  			SONAMEFLAG="-Wl,-soname="
@@ -59175,7 +58520,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			BLDSHARED="true"
  			LDSHFLAGS="-G"
-@@ -51811,33 +17964,23 @@
+@@ -51522,33 +17798,23 @@
  				LDSHFLAGS="-G \${CFLAGS}"
  			fi
  
@@ -59214,7 +58559,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			;;
  		*netbsd* | *freebsd* | *dragonfly* )
-@@ -51847,14 +17990,10 @@
+@@ -51558,14 +17824,10 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC -DPIC"
  
@@ -59231,7 +58576,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			;;
  		*openbsd*)  BLDSHARED="true"
-@@ -51863,26 +18002,18 @@
+@@ -51574,26 +17836,18 @@
  			SONAMEFLAG="-Wl,-soname,"
  			PICFLAG="-fPIC"
  
@@ -59262,7 +58607,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			;;
  			esac
-@@ -51896,15 +18027,11 @@
+@@ -51607,15 +17861,11 @@
  				PICFLAG="-KPIC"
  			fi
  
@@ -59280,7 +58625,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			BLDSHARED="true"
  			# use expfull to export underscored symbols
-@@ -51920,25 +18047,17 @@
+@@ -51631,25 +17881,17 @@
  			fi
  
  
@@ -59310,7 +58655,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			# Use special PIC flags for the native HP-UX compiler.
  				BLDSHARED="true"
-@@ -51960,74 +18079,52 @@
+@@ -51671,74 +17913,52 @@
  				DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
  			fi
  
@@ -59398,7 +58743,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ROFF"; then
-@@ -52038,91 +18135,71 @@
+@@ -51749,91 +17969,71 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -59505,7 +58850,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			BLDSHARED="true"
  			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -52136,16 +18213,12 @@
+@@ -51847,16 +18047,12 @@
                          # actually support the PIE stuff.
                          PIE_LDFLAGS=
                          PIE_CFLAGS=
@@ -59524,7 +58869,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			;;
    esac
-@@ -52162,53 +18235,53 @@
+@@ -51873,19 +18069,15 @@
  	LDFLAGS="$LDFLAGS -L./bin"
  fi
  
@@ -59532,6 +58877,141 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BLDSHARED" >&5
  $as_echo "$BLDSHARED" >&6; }
  
+ for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
+ 	saved_ldflags="$LDFLAGS"
+-	{ $as_echo "$as_me:$LINENO: checking if $flags works" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+ 	LDFLAGS="$flags $saved_ldflags"
+-	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.  */
+ 
+ int
+@@ -51896,42 +18088,17 @@
+   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
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		LD_AS_NEEDED_FLAG=$flags
+ 		ld_as_needed_flag_found=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 "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 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 conftest.$ac_ext
+ 	LDFLAGS="$LD_AS_NEEDED_FLAG $saved_ldflags"
+ 	test x"$ld_as_needed_flag_found" = xyes && break
+ done
+@@ -51944,14 +18111,10 @@
+ 
+ for flags in "-Wl,-z,defs" "-error_unresolved" "-Wl,-error_unresolved" ; do
+ 	saved_ldflags="$LDFLAGS"
+-	{ $as_echo "$as_me:$LINENO: checking if $flags works" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $flags works" >&5
+ $as_echo_n "checking if $flags works... " >&6; }
+ 	LDFLAGS="$flags $saved_ldflags"
+-	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.  */
+ 
+ int
+@@ -51962,94 +18125,69 @@
+   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
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	LDSHFLAGS_Z_DEFS=$flags
+ 	ldshflags_z_defs_found=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 "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 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 conftest.$ac_ext
+ 	LDFLAGS=$saved_ldflags
+ 	test x"$ldshflags_z_defs_found" = xyes && break
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking LDSHFLAGS_Z_DEFS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDSHFLAGS_Z_DEFS" >&5
+ $as_echo_n "checking LDSHFLAGS_Z_DEFS... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $LDSHFLAGS_Z_DEFS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDSHFLAGS_Z_DEFS" >&5
+ $as_echo "$LDSHFLAGS_Z_DEFS" >&6; }
 -{ $as_echo "$as_me:$LINENO: checking LDFLAGS" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LDFLAGS" >&5
  $as_echo_n "checking LDFLAGS... " >&6; }
@@ -59597,7 +59077,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -52224,7 +18297,7 @@
+@@ -52065,7 +18203,7 @@
  
  
  fi
@@ -59606,8 +59086,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_shlib_works" >&6; }
  if test $ac_cv_shlib_works = no; then
     BLDSHARED=false
-@@ -52240,9 +18313,9 @@
- 	SHLIBEXT="shared_libraries_disabled"
+@@ -52082,9 +18220,9 @@
+ 	merged_build_possible=no
  fi
  
 -{ $as_echo "$as_me:$LINENO: checking used PICFLAG" >&5
@@ -59618,7 +59098,1842 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$PICFLAG" >&6; }
  
  
-@@ -52284,165 +18357,39 @@
+@@ -52156,10 +18294,10 @@
+ USESHARED=false
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use shared libraries internally" >&5
+ $as_echo_n "checking whether to use shared libraries internally... " >&6; }
+ # Check whether --enable-shared-libs was given.
+-if test "${enable_shared_libs+set}" = set; then
++if test "${enable_shared_libs+set}" = set; then :
+   enableval=$enable_shared_libs; enable_shared_libs=$enableval
+ else
+   enable_shared_libs=yes
+@@ -52170,11 +18308,11 @@
+ 	USESHARED=$BLDSHARED
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $USESHARED" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USESHARED" >&5
+ $as_echo "$USESHARED" >&6; }
+ 
+ if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-shared-libs: no support for shared libraries" >&5
+ $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
+ fi
+ 
+@@ -52202,14 +18340,13 @@
+ 
+ 
+ # Check whether --with-static-libs was given.
+-if test "${with_static_libs+set}" = set; then
+-  withval=$with_static_libs; if test $withval; then
++if test "${with_static_libs+set}" = set; then :
++  withval=$with_static_libs; if test $withval; then :
+   for lib in `echo $withval | sed -e 's/,/ /g'` ; do
+ 			lib=`echo $lib | tr '[a-z]' '[A-Z]'`
+ 			eval LINK_$lib=STATIC
+ 		done
+ fi
+-
+ fi
+ 
+ 
+@@ -52231,7 +18368,7 @@
+ #  be extracted from their respective source directories
+ #
+ # Check whether --enable-external_libtalloc was given.
+-if test "${enable_external_libtalloc+set}" = set; then
++if test "${enable_external_libtalloc+set}" = set; then :
+   enableval=$enable_external_libtalloc;  enable_external_libtalloc=$enableval
+ else
+    enable_external_libtalloc=auto
+@@ -52246,9 +18383,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -52261,14 +18398,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -52276,10 +18413,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -52289,9 +18426,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -52304,14 +18441,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -52319,10 +18456,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -52331,7 +18468,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -52344,13 +18481,13 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ 	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+@@ -52358,7 +18495,7 @@
+ fi
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBTALLOC" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTALLOC" >&5
+ $as_echo_n "checking for LIBTALLOC... " >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+@@ -52366,11 +18503,11 @@
+         pkg_cv_LIBTALLOC_CFLAGS="$LIBTALLOC_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBTALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc >= 2.0.1" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -52384,11 +18521,11 @@
+         pkg_cv_LIBTALLOC_LIBS="$LIBTALLOC_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc >= 2.0.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "talloc >= 2.0.1") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBTALLOC_LIBS=`$PKG_CONFIG --libs "talloc >= 2.0.1" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -52415,768 +18552,112 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBTALLOC_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+                 if test x$enable_external_libtalloc = xyes; then
+-			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
+-$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "Unable to find libtalloc" "$LINENO" 5
+ 		  else
+ 			enable_external_libtalloc=no
+ 		  fi
+ 
+ elif test $pkg_failed = untried; then
+ 	if test x$enable_external_libtalloc = xyes; then
+-			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtalloc" >&5
+-$as_echo "$as_me: error: Unable to find libtalloc" >&2;}
+-   { (exit 1); exit 1; }; }
+-		  else
+-			enable_external_libtalloc=no
+-		  fi
+-
+-else
+-	LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
+-	LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	 enable_external_libtalloc=yes
+-fi
+-fi
+-
+-if test "x$enable_external_libtalloc" = xno
+-then
+-	tallocdir=""
+-tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
+-for d in $tallocpaths; do
+-	if test -f "$srcdir/$d/talloc.c"; then
+-		tallocdir="$d"
+-
+-		break;
+-	fi
+-done
+-if test x"$tallocdir" = "x"; then
+-   { { $as_echo "$as_me:$LINENO: error: cannot find talloc source in $tallocpaths" >&5
+-$as_echo "$as_me: error: cannot find talloc source in $tallocpaths" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-TALLOC_OBJ="talloc.o"
+-
+-
+-TALLOC_CFLAGS="-I$srcdir/$tallocdir"
+-
+-
+-TALLOC_LIBS=""
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# 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.
+-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
+-$as_echo_n "checking size of size_t... " >&6; }
+-if test "${ac_cv_sizeof_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_size_t=0
+-   fi ;;
+-esac
+-else
+-  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
+-static long int longval () { return (long int) (sizeof (size_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (size_t))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (size_t))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (size_t))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_size_t=`cat conftest.val`
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_size_t=0
+-   fi
+-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
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-$as_echo "$ac_cv_sizeof_size_t" >&6; }
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+-_ACEOF
+-
+-
+-# The cast to long int works around a bug in the HP C Compiler
+-# 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.
+-{ $as_echo "$as_me:$LINENO: checking size of void *" >&5
+-$as_echo_n "checking size of void *... " >&6; }
+-if test "${ac_cv_sizeof_void_p+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
++			as_fn_error "Unable to find libtalloc" "$LINENO" 5
++		  else
++			enable_external_libtalloc=no
++		  fi
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	LIBTALLOC_CFLAGS=$pkg_cv_LIBTALLOC_CFLAGS
++	LIBTALLOC_LIBS=$pkg_cv_LIBTALLOC_LIBS
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	 enable_external_libtalloc=yes
++fi
++fi
+ 
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
++if test "x$enable_external_libtalloc" = xno
++then
++	tallocdir=""
++tallocpaths=". lib/talloc talloc ../talloc ../lib/talloc"
++for d in $tallocpaths; do
++	if test -f "$srcdir/$d/talloc.c"; then
++		tallocdir="$d"
++
++		break;
++	fi
++done
++if test x"$tallocdir" = "x"; then
++   as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
+ fi
++TALLOC_OBJ="talloc.o"
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) < 0)];
+-test_array [0] = 0
++TALLOC_CFLAGS="-I$srcdir/$tallocdir"
+ 
+-  ;
+-  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_hi=-1 ac_mid=-1
+-  while :; do
+-    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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) >= $ac_mid)];
+-test_array [0] = 0
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++TALLOC_LIBS=""
+ 
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
++$as_echo_n "checking size of size_t... " >&6; }
++if test "${ac_cv_sizeof_size_t+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+ 
+-	ac_lo= ac_hi=
++else
++  if test "$ac_cv_type_size_t" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (size_t)
++See \`config.log' for more details." "$LINENO" 5; }; }
++   else
++     ac_cv_sizeof_size_t=0
++   fi
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
++$as_echo "$ac_cv_sizeof_size_t" >&6; }
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (void *))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_void_p=$ac_lo;;
+-'') if test "$ac_cv_type_void_p" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_void_p=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (void *)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (void *)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+ 
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (void *))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (void *))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (void *))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_sizeof_void_p=`cat conftest.val`
++# The cast to long int works around a bug in the HP C Compiler
++# 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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
++$as_echo_n "checking size of void *... " >&6; }
++if test "${ac_cv_sizeof_void_p+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
+ 
+-( exit $ac_status )
+-if test "$ac_cv_type_void_p" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++else
++  if test "$ac_cv_type_void_p" = yes; then
++     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (void *)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++{ as_fn_set_status 77
++as_fn_error "cannot compute sizeof (void *)
++See \`config.log' for more details." "$LINENO" 5; }; }
+    else
+      ac_cv_sizeof_void_p=0
+    fi
+ 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
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+ $as_echo "$ac_cv_sizeof_void_p" >&6; }
+ 
+ 
+@@ -53188,17 +18669,15 @@
+ 
+ 
+ if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: size_t cannot represent the amount of used memory of a process" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: size_t cannot represent the amount of used memory of a process" >&5
+ $as_echo "$as_me: WARNING: size_t cannot represent the amount of used memory of a process" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: please report this to <samba-technical@samba.org>" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please report this to <samba-technical@samba.org>" >&5
+ $as_echo "$as_me: WARNING: please report this to <samba-technical@samba.org>" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&5
+ $as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
+-	{ $as_echo "$as_me:$LINENO: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
+ $as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
+-	{ { $as_echo "$as_me:$LINENO: error: sizeof(size_t) < sizeof(void *)" >&5
+-$as_echo "$as_me: error: sizeof(size_t) < sizeof(void *)" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
+ fi
+ 
+ if test x"$VERSIONSCRIPT" != "x"; then
+@@ -53233,16 +18712,16 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtalloc shared library" >&5
+ $as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libtalloc was given.
+-if test "${with_libtalloc+set}" = set; then
++if test "${with_libtalloc+set}" = set; then :
+   withval=$with_libtalloc;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -53268,7 +18747,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
+ 		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -53281,12 +18760,12 @@
+ 		enable_static=yes
+ 		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
+ 		LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -53312,7 +18791,7 @@
+ 
+ 
+ # Check whether --enable-external_libtdb was given.
+-if test "${enable_external_libtdb+set}" = set; then
++if test "${enable_external_libtdb+set}" = set; then :
+   enableval=$enable_external_libtdb;  enable_external_libtalloc=$enableval
+ else
+    enable_external_libtalloc=auto
+@@ -53323,7 +18802,7 @@
+ then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBTDB" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBTDB" >&5
+ $as_echo_n "checking for LIBTDB... " >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+@@ -53331,11 +18810,11 @@
+         pkg_cv_LIBTDB_CFLAGS="$LIBTDB_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.1") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBTDB_CFLAGS=`$PKG_CONFIG --cflags "tdb >= 1.2.1" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -53349,11 +18828,11 @@
+         pkg_cv_LIBTDB_LIBS="$LIBTDB_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tdb >= 1.2.1\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "tdb >= 1.2.1") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBTDB_LIBS=`$PKG_CONFIG --libs "tdb >= 1.2.1" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -53380,13 +18859,11 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBTDB_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ 		if test x$enable_external_libtdb = xyes; then
+-			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtdb" >&5
+-$as_echo "$as_me: error: Unable to find libtdb" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "Unable to find libtdb" "$LINENO" 5
+ 		else
+ 			enable_external_libtdb=no
+ 		fi
+@@ -53394,9 +18871,7 @@
+ elif test $pkg_failed = untried; then
+ 
+ 		if test x$enable_external_libtdb = xyes; then
+-			{ { $as_echo "$as_me:$LINENO: error: Unable to find libtdb" >&5
+-$as_echo "$as_me: error: Unable to find libtdb" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "Unable to find libtdb" "$LINENO" 5
+ 		else
+ 			enable_external_libtdb=no
+ 		fi
+@@ -53404,7 +18879,7 @@
+ else
+ 	LIBTDB_CFLAGS=$pkg_cv_LIBTDB_CFLAGS
+ 	LIBTDB_LIBS=$pkg_cv_LIBTDB_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	 enable_external_libtdb=yes
+ fi
+@@ -53423,9 +18898,7 @@
+ 	fi
+ done
+ if test x"$tdbdir" = "x"; then
+-   { { $as_echo "$as_me:$LINENO: error: cannot find tdb source in $tdbpaths" >&5
+-$as_echo "$as_me: error: cannot find tdb source in $tdbpaths" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
+ 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 @@
+ TDB_CFLAGS="-I$tdbdir/include"
+ 
+ 
+-
+-
+-
+-
+-
+ for ac_func in mmap pread pwrite getpagesize utime
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++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
+@@ -53543,151 +18924,12 @@
+ fi
+ done
+ 
+-
+-
+-
+ for ac_header in getopt.h sys/select.h sys/time.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
++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
+@@ -53698,17 +18940,13 @@
+ 
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for pread declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pread declaration" >&5
+ $as_echo_n "checking for pread declaration... " >&6; }
+-if test "${ac_cv_have_pread_decl+set}" = set; then
++if test "${ac_cv_have_pread_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
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <unistd.h>
+ int
+@@ -53719,56 +18957,29 @@
+   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
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_pread_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_pread_decl=no
++  ac_cv_have_pread_decl=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pread_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pread_decl" >&5
+ $as_echo "$ac_cv_have_pread_decl" >&6; }
+  if test x"$ac_cv_have_pread_decl" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PREAD_DECL 1
+-_ACEOF
++$as_echo "#define HAVE_PREAD_DECL 1" >>confdefs.h
+ 
+  fi
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for pwrite declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pwrite declaration" >&5
+ $as_echo_n "checking for pwrite declaration... " >&6; }
+-if test "${ac_cv_have_pwrite_decl+set}" = set; then
++if test "${ac_cv_have_pwrite_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
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <unistd.h>
+ int
+@@ -53779,41 +18990,18 @@
+   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
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_pwrite_decl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_pwrite_decl=no
++  ac_cv_have_pwrite_decl=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_pwrite_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pwrite_decl" >&5
+ $as_echo "$ac_cv_have_pwrite_decl" >&6; }
+  if test x"$ac_cv_have_pwrite_decl" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PWRITE_DECL 1
+-_ACEOF
++$as_echo "#define HAVE_PWRITE_DECL 1" >>confdefs.h
+ 
+  fi
+ 
+@@ -53850,16 +19038,16 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtdb shared library" >&5
+ $as_echo_n "checking whether to build the libtdb shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libtdb was given.
+-if test "${with_libtdb+set}" = set; then
++if test "${with_libtdb+set}" = set; then :
+   withval=$with_libtdb;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -53885,7 +19073,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
+ 		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -53898,12 +19086,12 @@
+ 		enable_static=yes
+ 		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
+ 		LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -53959,16 +19147,16 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libnetapi shared library" >&5
+ $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libnetapi was given.
+-if test "${with_libnetapi+set}" = set; then
++if test "${with_libnetapi+set}" = set; then :
+   withval=$with_libnetapi;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -53994,7 +19182,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
+ 		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -54007,12 +19195,12 @@
+ 		enable_static=yes
+ 		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
+ 		LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54050,16 +19238,16 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbclient shared library" >&5
+ $as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libsmbclient was given.
+-if test "${with_libsmbclient+set}" = set; then
++if test "${with_libsmbclient+set}" = set; then :
+   withval=$with_libsmbclient;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -54085,7 +19273,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
+ 		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -54098,12 +19286,12 @@
+ 		enable_static=yes
+ 		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
+ 		LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54141,16 +19329,16 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbsharemodes shared library" >&5
+ $as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libsmbsharemodes was given.
+-if test "${with_libsmbsharemodes+set}" = set; then
++if test "${with_libsmbsharemodes+set}" = set; then :
+   withval=$with_libsmbsharemodes;
+ case "$withval" in
+ 	no)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -54176,7 +19364,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
+ 		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -54189,12 +19377,12 @@
+ 		enable_static=yes
+ 		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
+ 		LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54232,19 +19420,19 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libaddns shared library" >&5
+ $as_echo_n "checking whether to build the libaddns shared library... " >&6; }
+ 
+ 
+ # Check whether --with-libaddns was given.
+-if test "${with_libaddns+set}" = set; then
++if test "${with_libaddns+set}" = set; then :
+   withval=$with_libaddns;
+ case "$withval" in
+ 	yes)
+ 		build_lib=yes
+ 		;;
+ 	*)
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		build_lib=no
+ 		;;
+@@ -54253,7 +19441,7 @@
+ else
+ 
+ # if unspecified, default is not to build
+-{ $as_echo "$as_me:$LINENO: result: no" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ build_lib=no
+ 
+@@ -54269,7 +19457,7 @@
+ 	if eval $BLDSHARED = true; then
+ 		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
+ 		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
+ 			enable_static=yes
+@@ -54282,12 +19470,12 @@
+ 		enable_static=yes
+ 		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
+ 		LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
+-		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
+ $as_echo "no shared library support -- will supply static library" >&6; }
+ 	fi
+ else
+ 	enable_static=yes
+-	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
+ $as_echo "shared library not selected" >&6; }
+ fi
+ if test $enable_static = yes; then
+@@ -54304,165 +19492,39 @@
  
  ################
  
@@ -59796,7 +61111,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -52452,102 +18399,9 @@
+@@ -54472,102 +19534,9 @@
  fi
  
  else
@@ -59887,11 +61202,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-
+-fi
 +    ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
 +if test "x$ac_cv_type_intptr_t" = x""yes; then :
  
--fi
--
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
@@ -59901,7 +61216,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -52562,17 +18416,13 @@
+@@ -54582,17 +19551,13 @@
  # Check if the compiler supports the LL prefix on long long integers.
  # AIX needs this.
  
@@ -59922,7 +61237,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -52583,190 +18433,97 @@
+@@ -54603,190 +19568,97 @@
    return 0;
  }
  _ACEOF
@@ -60065,8 +61380,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  #include <sys/stat.h>
- main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
- _ACEOF
+-main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -60089,6 +61404,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
++main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
++_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
    samba_cv_SIZEOF_OFF_T=yes
  else
@@ -60141,7 +61458,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -52776,67 +18533,34 @@
+@@ -54796,67 +19668,34 @@
  #include <sys/stat.h>
  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
@@ -60219,7 +61536,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -52846,67 +18570,34 @@
+@@ -54866,67 +19705,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -60297,12 +61614,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -52914,69 +18605,36 @@
- #endif
- #include <stdio.h>
+@@ -54936,67 +19742,34 @@
  #include <sys/stat.h>
--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
+ 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
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -60325,8 +61640,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+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
 +if ac_fn_c_try_run "$LINENO"; then :
    samba_cv_HAVE_INO64_T=yes
  else
@@ -60379,7 +61692,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -52986,67 +18644,34 @@
+@@ -55006,67 +19779,34 @@
  #include <sys/stat.h>
  main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
  _ACEOF
@@ -60457,7 +61770,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53056,64 +18681,31 @@
+@@ -55076,64 +19816,31 @@
  #include <sys/stat.h>
  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
@@ -60531,7 +61844,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53129,55 +18721,28 @@
+@@ -55149,55 +19856,28 @@
    return 0;
  }
  _ACEOF
@@ -60594,7 +61907,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53193,58 +18758,31 @@
+@@ -55213,58 +19893,31 @@
    return 0;
  }
  _ACEOF
@@ -60661,7 +61974,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53253,67 +18791,34 @@
+@@ -55273,67 +19926,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = major(dev); return 0; }
  _ACEOF
@@ -60739,7 +62052,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53322,67 +18827,34 @@
+@@ -55342,67 +19962,34 @@
  #include <sys/types.h>
  main() { dev_t dev; int i = minor(dev); return 0; }
  _ACEOF
@@ -60817,7 +62130,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -53391,129 +18863,63 @@
+@@ -55411,129 +19998,63 @@
  #include <sys/types.h>
  main() { dev_t dev = makedev(1,2); return 0; }
  _ACEOF
@@ -60966,7 +62279,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -53526,55 +18932,28 @@
+@@ -55546,55 +20067,28 @@
    return 0;
  }
  _ACEOF
@@ -61029,7 +62342,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdio.h>
  int
-@@ -53585,55 +18964,28 @@
+@@ -55605,55 +20099,28 @@
    return 0;
  }
  _ACEOF
@@ -61092,7 +62405,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/time.h>
-@@ -53646,46 +18998,19 @@
+@@ -55666,46 +20133,19 @@
    return 0;
  }
  _ACEOF
@@ -61145,7 +62458,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -53697,120 +19022,24 @@
+@@ -55717,120 +20157,24 @@
      # which rely on signals.
  
  
@@ -61274,7 +62587,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -53834,58 +19063,27 @@
+@@ -55854,58 +20198,27 @@
    return 0;
  }
  _ACEOF
@@ -61341,7 +62654,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -53909,58 +19107,27 @@
+@@ -55929,58 +20242,27 @@
    return 0;
  }
  _ACEOF
@@ -61408,7 +62721,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -53984,49 +19151,22 @@
+@@ -56004,49 +20286,22 @@
    return 0;
  }
  _ACEOF
@@ -61464,7 +62777,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -54044,18 +19184,14 @@
+@@ -56064,18 +20319,14 @@
  	    ;;
            *)
  	    # clock_gettime was not found, try adding librt
@@ -61486,7 +62799,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -54073,60 +19209,29 @@
+@@ -56093,60 +20344,29 @@
    return 0;
  }
  _ACEOF
@@ -61556,7 +62869,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -54150,58 +19255,27 @@
+@@ -56170,58 +20390,27 @@
    return 0;
  }
  _ACEOF
@@ -61623,7 +62936,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -54225,58 +19299,27 @@
+@@ -56245,58 +20434,27 @@
    return 0;
  }
  _ACEOF
@@ -61690,7 +63003,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if TIME_WITH_SYS_TIME
-@@ -54300,49 +19343,22 @@
+@@ -56320,49 +20478,22 @@
    return 0;
  }
  _ACEOF
@@ -61746,7 +63059,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -54367,20 +19383,16 @@
+@@ -56387,20 +20518,16 @@
  
  fi
  
@@ -61771,7 +63084,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <dirent.h>
-@@ -54388,64 +19400,31 @@
+@@ -56408,216 +20535,67 @@
  if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
  di->d_name[0] == 0) exit(0); exit(1);}
  _ACEOF
@@ -61824,31 +63137,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_BROKEN_READDIR_NAME 1
 -_ACEOF
-+$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
- 
- fi
- 
+-
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking for utimbuf" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
- $as_echo_n "checking for utimbuf... " >&6; }
+-$as_echo_n "checking for utimbuf... " >&6; }
 -if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then
-+if test "${samba_cv_HAVE_UTIMBUF+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 <sys/types.h>
- #include <utime.h>
-@@ -54457,41 +19436,18 @@
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <utime.h>
+-int
+-main ()
+-{
+-struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -61867,40 +63180,37 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   samba_cv_HAVE_UTIMBUF=yes
- else
+-  samba_cv_HAVE_UTIMBUF=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_UTIMBUF=no
-+  samba_cv_HAVE_UTIMBUF=no
- fi
+-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
 -{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_UTIMBUF" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_UTIMBUF" >&5
- $as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
- if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
- 
+-$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
+-if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_UTIMBUF 1
 -_ACEOF
-+$as_echo "#define HAVE_UTIMBUF 1" >>confdefs.h
- 
- fi
- 
-@@ -54499,104 +19455,12 @@
- # Check utmp details, but only if our OS offers utmp.h
- if test x"$ac_cv_header_utmp_h" = x"yes"; then
- 
+-
+-fi
+-
+-##############
+-# Check utmp details, but only if our OS offers utmp.h
+-if test x"$ac_cv_header_utmp_h" = x"yes"; then
 -
 -
 -
 -
 -
- for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
+-
+-
+-for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -61945,14 +63255,29 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -choke me
 -#endif
 -
--int
--main ()
--{
++$as_echo "#define HAVE_BROKEN_READDIR_NAME 1" >>confdefs.h
++
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
++$as_echo_n "checking for utimbuf... " >&6; }
++if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <utime.h>
+ int
+ main ()
+ {
 -return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
++struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -61975,17 +63300,27 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  samba_cv_HAVE_UTIMBUF=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
--fi
--
++  samba_cv_HAVE_UTIMBUF=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_UTIMBUF" >&5
++$as_echo "$samba_cv_HAVE_UTIMBUF" >&6; }
++if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
++
++$as_echo "#define HAVE_UTIMBUF 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
@@ -61993,6 +63328,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++##############
++# Check utmp details, but only if our OS offers utmp.h
++if test x"$ac_cv_header_utmp_h" = x"yes"; then
++
++for ac_func in pututline pututxline updwtmp updwtmpx getutmpx getutxent
 +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"
@@ -62001,7 +63342,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -54605,17 +19469,13 @@
+@@ -56626,17 +20604,13 @@
  done
  
  
@@ -62022,7 +63363,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54627,55 +19487,28 @@
+@@ -56648,55 +20622,28 @@
    return 0;
  }
  _ACEOF
@@ -62085,7 +63426,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54687,55 +19520,28 @@
+@@ -56708,55 +20655,28 @@
    return 0;
  }
  _ACEOF
@@ -62148,7 +63489,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54747,55 +19553,28 @@
+@@ -56768,55 +20688,28 @@
    return 0;
  }
  _ACEOF
@@ -62211,7 +63552,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54807,55 +19586,28 @@
+@@ -56828,55 +20721,28 @@
    return 0;
  }
  _ACEOF
@@ -62274,14 +63615,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54863,59 +19615,32 @@
- main ()
- {
- struct utmp ut;  time_t t; ut.ut_time = t;
--  ;
--  return 0;
--}
--_ACEOF
+@@ -56888,55 +20754,28 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -62300,10 +63637,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_UT_UT_TIME=yes
  else
@@ -62345,7 +63678,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54927,55 +19652,28 @@
+@@ -56948,55 +20787,28 @@
    return 0;
  }
  _ACEOF
@@ -62408,7 +63741,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -54987,55 +19685,28 @@
+@@ -57008,55 +20820,28 @@
    return 0;
  }
  _ACEOF
@@ -62471,7 +63804,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -55047,55 +19718,28 @@
+@@ -57068,55 +20853,28 @@
    return 0;
  }
  _ACEOF
@@ -62534,7 +63867,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -55107,55 +19751,28 @@
+@@ -57128,55 +20886,28 @@
    return 0;
  }
  _ACEOF
@@ -62597,7 +63930,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -55167,55 +19784,28 @@
+@@ -57188,55 +20919,28 @@
    return 0;
  }
  _ACEOF
@@ -62660,7 +63993,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -55227,56 +19817,29 @@
+@@ -57248,56 +20952,29 @@
    return 0;
  }
  _ACEOF
@@ -62724,7 +64057,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmp.h>
-@@ -55288,56 +19851,29 @@
+@@ -57309,56 +20986,29 @@
    return 0;
  }
  _ACEOF
@@ -62788,7 +64121,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <utmpx.h>
-@@ -55349,41 +19885,18 @@
+@@ -57370,41 +21020,18 @@
    return 0;
  }
  _ACEOF
@@ -62834,7 +64167,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -55394,12 +19907,10 @@
+@@ -57415,12 +21042,10 @@
  ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
  
  # Check whether --with-libiconv was given.
@@ -62849,7 +64182,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    else
       if test "$withval" != "yes" ; then
  	ICONV_PATH_SPEC=yes
-@@ -55445,7 +19956,7 @@
+@@ -57466,7 +21091,7 @@
  		export LDFLAGS LIBS CPPFLAGS
  		# Try to find iconv(3)
  
@@ -62858,7 +64191,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking for iconv in $i/$l... " >&6; }
      jm_cv_func_iconv="no"
      jm_cv_lib_iconv=""
-@@ -55453,11 +19964,7 @@
+@@ -57474,11 +21099,7 @@
      jm_save_LIBS="$LIBS"
  
      if test "$jm_cv_func_iconv" != yes; then
@@ -62871,7 +64204,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -55471,48 +19978,17 @@
+@@ -57492,48 +21113,17 @@
    return 0;
  }
  _ACEOF
@@ -62924,7 +64257,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -55526,49 +20002,18 @@
+@@ -57547,49 +21137,18 @@
    return 0;
  }
  _ACEOF
@@ -62978,7 +64311,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -55582,53 +20027,22 @@
+@@ -57603,53 +21162,22 @@
    return 0;
  }
  _ACEOF
@@ -63036,7 +64369,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -55642,50 +20056,19 @@
+@@ -57663,50 +21191,19 @@
    return 0;
  }
  _ACEOF
@@ -63091,7 +64424,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <biconv.h>
-@@ -55699,42 +20082,15 @@
+@@ -57720,42 +21217,15 @@
    return 0;
  }
  _ACEOF
@@ -63137,7 +64470,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
              LIBS="$jm_save_LIBS"
            fi
-@@ -55745,36 +20101,30 @@
+@@ -57766,36 +21236,30 @@
    if test "$jm_cv_func_iconv" = yes; then
      if test "$jm_cv_giconv" = yes; then
  
@@ -63181,7 +64514,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
    fi
  
-@@ -55812,16 +20162,12 @@
+@@ -57833,16 +21297,12 @@
  	# check for default dos charset name
  	for j in CP850 IBM850 ; do
  
@@ -63201,7 +64534,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -55834,43 +20180,16 @@
+@@ -57855,43 +21315,16 @@
  }
  
  _ACEOF
@@ -63250,7 +64583,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_dos_charset="$ICONV_CHARSET"
-@@ -55882,16 +20201,12 @@
+@@ -57903,16 +21336,12 @@
  	# check for default display charset name
  	for j in ASCII 646 ; do
  
@@ -63270,7 +64603,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -55904,43 +20219,16 @@
+@@ -57925,43 +21354,16 @@
  }
  
  _ACEOF
@@ -63319,7 +64652,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_display_charset="$ICONV_CHARSET"
-@@ -55952,16 +20240,12 @@
+@@ -57973,16 +21375,12 @@
  	# check for default unix charset name
  	for j in UTF-8 UTF8 ; do
  
@@ -63339,7 +64672,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <$jm_cv_include>
-@@ -55974,43 +20258,16 @@
+@@ -57995,43 +21393,16 @@
  }
  
  _ACEOF
@@ -63388,7 +64721,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ICONV_CHARSET" >&6; }
  
  	    default_unix_charset="$ICONV_CHARSET"
-@@ -56049,9 +20306,9 @@
+@@ -58070,9 +21441,9 @@
  	    default_display_charset="ASCII"
  	    default_unix_charset="UTF-8"
  	    samba_cv_HAVE_NATIVE_ICONV=yes
@@ -63400,7 +64733,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
  	fi
  
-@@ -56075,9 +20332,7 @@
+@@ -58096,9 +21467,7 @@
  	    default_unix_charset="\"$default_unix_charset\""
  
  
@@ -63411,7 +64744,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  cat >>confdefs.h <<_ACEOF
-@@ -56111,7 +20366,7 @@
+@@ -58132,7 +21501,7 @@
  
  
  if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -63420,7 +64753,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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;}
-@@ -56133,20 +20388,16 @@
+@@ -58154,20 +21523,16 @@
  fi
  
  
@@ -63445,7 +64778,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -56160,67 +20411,34 @@
+@@ -58181,67 +21546,34 @@
  }
  
  _ACEOF
@@ -63523,7 +64856,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -56234,204 +20452,36 @@
+@@ -58255,204 +21587,36 @@
  }
  
  _ACEOF
@@ -63741,12 +65074,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -56440,119 +20490,25 @@
+@@ -58460,120 +21624,26 @@
+ fi
  
  done
- 
 -
- for ac_func in inotify_init
+-
+-for ac_func in inotify_init
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -63839,6 +65173,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++for ac_func in inotify_init
 +do :
 +  ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
 +if test "x$ac_cv_func_inotify_init" = x""yes; then :
@@ -63868,7 +65204,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -56563,54 +20519,29 @@
+@@ -58584,54 +21654,29 @@
    return 0;
  }
  _ACEOF
@@ -63929,7 +65265,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -56619,157 +20550,18 @@
+@@ -58640,157 +21685,18 @@
  #	http://oss.sgi.com/projects/fam/
  #	http://savannah.nongnu.org/projects/fam/
  # Check whether --enable-fam was given.
@@ -64093,7 +65429,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
   samba_cv_HAVE_FAM_H=yes
  else
-@@ -56781,18 +20573,14 @@
+@@ -58802,18 +21708,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.
@@ -64115,11 +65451,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -56809,44 +20597,19 @@
-   ;
+@@ -58831,43 +21733,18 @@
    return 0;
  }
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -64141,7 +65476,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_fam_FAMOpen2=yes
  else
@@ -64167,7 +65501,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
  else
    samba_cv_HAVE_LIBFAM=no
-@@ -56857,23 +20620,17 @@
+@@ -58878,23 +21755,17 @@
              samba_fam_xtra=-lC
  
  
@@ -64194,7 +65528,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -56891,72 +20648,41 @@
+@@ -58912,72 +21783,41 @@
    return 0;
  }
  _ACEOF
@@ -64275,7 +65609,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <fam.h>
  int
-@@ -56967,43 +20693,16 @@
+@@ -58988,43 +21828,16 @@
    return 0;
  }
  _ACEOF
@@ -64322,7 +65656,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      fi
  fi
  
-@@ -57016,18 +20715,14 @@
+@@ -59037,18 +21850,14 @@
      samba_dmapi_libs=""
  
      if test x"$samba_dmapi_libs" = x"" ; then
@@ -64344,7 +65678,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -57045,61 +20740,32 @@
+@@ -59066,61 +21875,32 @@
    return 0;
  }
  _ACEOF
@@ -64415,7 +65749,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -57117,61 +20783,32 @@
+@@ -59138,61 +21918,32 @@
    return 0;
  }
  _ACEOF
@@ -64467,77 +65801,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
      fi
  
-     if test x"$samba_dmapi_libs" = x"" ; then
--	{ $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -lxdsm" >&5
- $as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
--if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then
-+if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lxdsm  $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.
-@@ -57189,61 +20826,32 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_xdsm_dm_get_eventlist=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_xdsm_dm_get_eventlist=no
-+  ac_cv_lib_xdsm_dm_get_eventlist=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_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
- $as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
--if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then
-+if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then :
-   samba_dmapi_libs="-lxdsm"
- fi
- 
-     fi
- 
      if test x"$samba_dmapi_libs" = x"" ; then
 -        { $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -ldmapi" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ldmapi" >&5
@@ -64557,7 +65820,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -57261,43 +20869,18 @@
+@@ -59210,61 +21961,32 @@
    return 0;
  }
  _ACEOF
@@ -64607,7 +65870,78 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    samba_dmapi_libs="-ldmapi"
  fi
  
-@@ -57306,153 +20889,12 @@
+     fi
+ 
+     if test x"$samba_dmapi_libs" = x"" ; then
+-	{ $as_echo "$as_me:$LINENO: checking for dm_get_eventlist in -lxdsm" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -lxdsm" >&5
+ $as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
+-if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then
++if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lxdsm  $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.
+@@ -59282,43 +22004,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_xdsm_dm_get_eventlist=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_xdsm_dm_get_eventlist=no
++  ac_cv_lib_xdsm_dm_get_eventlist=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
+ $as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
+-if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then
++if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then :
+   samba_dmapi_libs="-lxdsm"
+ fi
+ 
+@@ -59327,153 +22024,12 @@
  
      # Only bother to test ehaders if we have a candidate DMAPI library
      if test x"$samba_dmapi_libs" != x"" ; then
@@ -64767,7 +66101,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -57466,11 +20908,7 @@
+@@ -59487,11 +22043,7 @@
      if test x"$samba_dmapi_libs" != x"" ; then
  	samba_dmapi_save_LIBS="$LIBS"
  	LIBS="$LIBS $samba_dmapi_libs"
@@ -64780,7 +66114,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <time.h>      /* needed by Tru64 */
-@@ -57505,50 +20943,25 @@
+@@ -59526,50 +22078,25 @@
    return 0;
  }
  _ACEOF
@@ -64835,7 +66169,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: DMAPI support not present" >&6;}
  
  	# DMAPI detection failure actions end
-@@ -57556,11 +20969,9 @@
+@@ -59577,11 +22104,9 @@
  	# DMAPI detection success actions start
  
  
@@ -64849,7 +66183,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
  
  	# DMAPI detection success actions end
-@@ -57574,20 +20985,16 @@
+@@ -59595,20 +22120,16 @@
      default_shared_modules="$default_shared_modules vfs_tsmsm"
  fi
  
@@ -64874,7 +66208,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -57603,65 +21010,32 @@
+@@ -59624,65 +22145,32 @@
  }
  
  _ACEOF
@@ -64949,7 +66283,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <fcntl.h>
-@@ -57673,185 +21047,29 @@
+@@ -59694,185 +22182,29 @@
    return 0;
  }
  _ACEOF
@@ -65142,7 +66476,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -57861,110 +21079,18 @@
+@@ -59882,110 +22214,18 @@
  
      ac_save_LIBS=$LIBS
  
@@ -65259,7 +66593,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -57981,18 +21107,14 @@
+@@ -60002,18 +22242,14 @@
  	    ;;
            *)
  	    # cap_get_proc was not found, try adding libcap
@@ -65281,7 +66615,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -58010,50 +21132,23 @@
+@@ -60031,50 +22267,23 @@
    return 0;
  }
  _ACEOF
@@ -65339,7 +66673,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -58075,20 +21170,16 @@
+@@ -60096,20 +22305,16 @@
  
  
  
@@ -65364,7 +66698,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -58104,52 +21195,23 @@
+@@ -60125,52 +22330,23 @@
   exit(0);
  }
  _ACEOF
@@ -65423,7 +66757,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  else
      LIBS=$ac_save_LIBS
-@@ -58162,17 +21224,13 @@
+@@ -60183,17 +22359,13 @@
  # This is *really* broken but some systems (DEC OSF1) do this.... JRA.
  #
  
@@ -65444,7 +66778,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -58186,55 +21244,28 @@
+@@ -60207,55 +22379,28 @@
    return 0;
  }
  _ACEOF
@@ -65507,7 +66841,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -58248,55 +21279,28 @@
+@@ -60269,55 +22414,28 @@
    return 0;
  }
  _ACEOF
@@ -65570,7 +66904,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -58310,55 +21314,28 @@
+@@ -60331,55 +22449,28 @@
    return 0;
  }
  _ACEOF
@@ -65594,11 +66928,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
++else
 +  samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no
  fi
 -
@@ -65633,7 +66968,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #if defined(HAVE_RPC_RPC_H)
-@@ -58372,56 +21349,29 @@
+@@ -60393,56 +22484,29 @@
    return 0;
  }
  _ACEOF
@@ -65697,7 +67032,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_SECURITY_H
-@@ -58439,238 +21389,112 @@
+@@ -60460,238 +22524,112 @@
    return 0;
  }
  _ACEOF
@@ -65972,7 +67307,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -58681,63 +21505,32 @@
+@@ -60702,63 +22640,32 @@
    return 0;
  }
  _ACEOF
@@ -65999,12 +67334,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
     samba_cv_SYSCONF_SC_NGROUPS_MAX=yes
--else
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	 samba_cv_SYSCONF_SC_NGROUPS_MAX=no
-+else
 +   samba_cv_SYSCONF_SC_NGROUPS_MAX=no
  fi
 -
@@ -66046,7 +67380,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -58748,63 +21541,32 @@
+@@ -60769,63 +22676,32 @@
    return 0;
  }
  _ACEOF
@@ -66119,7 +67453,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -58815,63 +21577,32 @@
+@@ -60836,63 +22712,32 @@
    return 0;
  }
  _ACEOF
@@ -66192,7 +67526,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -58882,147 +21613,30 @@
+@@ -60903,147 +22748,30 @@
    return 0;
  }
  _ACEOF
@@ -66350,7 +67684,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -59034,20 +21648,16 @@
+@@ -61055,20 +22783,16 @@
  seteuid=no;
  
  if test $seteuid = no; then
@@ -66375,7 +67709,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -59055,50 +21665,21 @@
+@@ -61076,50 +22800,21 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -66432,7 +67766,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  fi
-@@ -59106,20 +21687,16 @@
+@@ -61127,20 +22822,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
@@ -66457,7 +67791,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -59127,69 +21704,36 @@
+@@ -61148,69 +22839,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -66537,7 +67871,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -59197,69 +21741,36 @@
+@@ -61218,69 +22876,36 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -66617,7 +67951,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define AUTOCONF_TEST 1
-@@ -59267,64 +21778,31 @@
+@@ -61288,64 +22913,31 @@
  #include "confdefs.h"
  #include "${srcdir-.}/lib/util_sec.c"
  _ACEOF
@@ -66691,7 +68025,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/syscall.h>
-@@ -59338,195 +21816,98 @@
+@@ -61359,195 +22951,98 @@
    return 0;
  }
  _ACEOF
@@ -66917,7 +68251,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -59550,66 +21931,33 @@
+@@ -61571,67 +23066,34 @@
  #endif
  }
  _ACEOF
@@ -66976,6 +68310,71 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    fi
  fi
  
+ # glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
+-{ $as_echo "$as_me:$LINENO: checking for broken posix_fallocate" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
+ $as_echo_n "checking for broken posix_fallocate... " >&6; }
+-if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then
++if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+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 _XOPEN_SOURCE 600
+@@ -61649,56 +23111,29 @@
+   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
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
++  samba_cv_HAVE_BROKEN_POSIX_FALLOCATE=yes
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&5
+ $as_echo "$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" >&6; }
+ if test x"$samba_cv_HAVE_BROKEN_POSIX_FALLOCATE" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_BROKEN_POSIX_FALLOCATE /**/
+-_ACEOF
++$as_echo "#define HAVE_BROKEN_POSIX_FALLOCATE /**/" >>confdefs.h
+ 
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
  $as_echo_n "checking for st_blocks in struct stat... " >&6; }
@@ -66993,7 +68392,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -59622,55 +21970,28 @@
+@@ -61711,141 +23146,24 @@
    return 0;
  }
  _ACEOF
@@ -67035,10 +68434,224 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STAT_ST_BLOCKS 1
 -_ACEOF
+-
+-fi
+-
+-{ $as_echo "$as_me:$LINENO: checking for blksize_t" >&5
+-$as_echo_n "checking for blksize_t... " >&6; }
+-if test "${ac_cv_type_blksize_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_blksize_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (blksize_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof ((blksize_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_blksize_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 +$as_echo "#define HAVE_STAT_ST_BLOCKS 1" >>confdefs.h
  
  fi
  
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blksize_t" >&5
+-$as_echo "$ac_cv_type_blksize_t" >&6; }
+-if test "x$ac_cv_type_blksize_t" = x""yes; then
++ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blksize_t" = x""yes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BLKSIZE_T 1
+@@ -61853,103 +23171,9 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for blkcnt_t" >&5
+-$as_echo_n "checking for blkcnt_t... " >&6; }
+-if test "${ac_cv_type_blkcnt_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_blkcnt_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (blkcnt_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/stat.h>
+-
+-int
+-main ()
+-{
+-if (sizeof ((blkcnt_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_blkcnt_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_blkcnt_t" >&5
+-$as_echo "$ac_cv_type_blkcnt_t" >&6; }
+-if test "x$ac_cv_type_blkcnt_t" = x""yes; then
++ac_fn_c_check_type "$LINENO" "blkcnt_t" "ac_cv_type_blkcnt_t" "#include <sys/stat.h>
++"
++if test "x$ac_cv_type_blkcnt_t" = x""yes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_BLKCNT_T 1
+@@ -61959,17 +23183,13 @@
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for st_blksize in struct stat" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blksize in struct stat" >&5
  $as_echo_n "checking for st_blksize in struct stat... " >&6; }
@@ -67056,7 +68669,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -59683,55 +22004,28 @@
+@@ -61982,55 +23202,28 @@
    return 0;
  }
  _ACEOF
@@ -67119,7 +68732,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -59744,57 +22038,30 @@
+@@ -62043,57 +23236,30 @@
    return 0;
  }
  _ACEOF
@@ -67184,7 +68797,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -59810,58 +22077,31 @@
+@@ -62109,58 +23275,31 @@
    return 0;
  }
  _ACEOF
@@ -67251,7 +68864,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <stdio.h>
-@@ -59880,74 +22120,45 @@
+@@ -62179,74 +23318,45 @@
  }
  
  _ACEOF
@@ -67337,7 +68950,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -59956,24 +22167,24 @@
+@@ -62255,24 +23365,24 @@
  ####################################################
  # check for Linux-specific AFS fake-kaserver support
  samba_cv_WITH_FAKE_KASERVER=no
@@ -67367,7 +68980,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -59985,18 +22196,14 @@
+@@ -62284,18 +23394,14 @@
     test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
  
      # see if this box has the OpenSSL DES libraries
@@ -67389,7 +69002,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -60014,208 +22221,43 @@
+@@ -62313,208 +23419,43 @@
    return 0;
  }
  _ACEOF
@@ -67614,7 +69227,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -60227,12 +22269,10 @@
+@@ -62526,12 +23467,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
@@ -67629,7 +69242,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	fi
      else
      	have_afs_headers=yes
-@@ -60242,9 +22282,7 @@
+@@ -62541,9 +23480,7 @@
  FAKE_KASERVER_OBJ=""
  if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
@@ -67640,7 +69253,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
      FAKE_KASERVER_OBJ="utils/net_afs.o"
  fi
-@@ -60253,24 +22291,24 @@
+@@ -62552,24 +23489,24 @@
  #################################################
  # check whether to compile AFS/NT ACL mapping module
  samba_cv_WITH_VFS_AFSACL=no
@@ -67670,80 +69283,78 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -60280,220 +22318,78 @@
-    default_shared_modules="$default_shared_modules vfs_afsacl"
- fi
+@@ -62581,36 +23518,32 @@
+ 
+ if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
  
--if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
--
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_AFS 1
 -_ACEOF
--
--fi
--
--#################################################
--# check for the DFS clear-text auth system
++$as_echo "#define WITH_AFS 1" >>confdefs.h
+ 
+ fi
+ 
+ #################################################
+ # check for the DFS clear-text auth system
 -{ $as_echo "$as_me:$LINENO: checking whether to use DFS clear-text auth" >&5
--$as_echo_n "checking whether to use DFS clear-text auth... " >&6; }
--
--# Check whether --with-dfs was given.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DFS clear-text auth" >&5
+ $as_echo_n "checking whether to use DFS clear-text auth... " >&6; }
+ 
+ # Check whether --with-dfs was given.
 -if test "${with_dfs+set}" = set; then
--  withval=$with_dfs;  case "$withval" in
--  yes)
++if test "${with_dfs+set}" = set; then :
+   withval=$with_dfs;  case "$withval" in
+   yes)
 -    { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define WITH_DFS 1
 -_ACEOF
--
--    ;;
--  *)
++$as_echo "#define WITH_DFS 1" >>confdefs.h
+ 
+     ;;
+   *)
 -    { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--    ;;
--  esac
--else
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+     ;;
+   esac
+ else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--
--fi
--
--
--########################################################
--# Compile with LDAP support?
--
--with_ldap_support=auto
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ fi
+@@ -62620,12 +23553,12 @@
+ # Compile with LDAP support?
+ 
+ with_ldap_support=auto
 -{ $as_echo "$as_me:$LINENO: checking for LDAP support" >&5
--$as_echo_n "checking for LDAP support... " >&6; }
--
--
--# Check whether --with-ldap was given.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
+ $as_echo_n "checking for LDAP support... " >&6; }
+ 
+ 
+ # Check whether --with-ldap was given.
 -if test "${with_ldap+set}" = set; then
--  withval=$with_ldap;  case "$withval" in
--    yes|no)
--	with_ldap_support=$withval
--	;;
--  esac
--fi
--
--
++if test "${with_ldap+set}" = set; then :
+   withval=$with_ldap;  case "$withval" in
+     yes|no)
+ 	with_ldap_support=$withval
+@@ -62634,7 +23567,7 @@
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: result: $with_ldap_support" >&5
--$as_echo "$with_ldap_support" >&6; }
--
--SMBLDAP=""
--
--SMBLDAPUTIL=""
--
--LDBLDAP=""
--
--
--if test x"$with_ldap_support" != x"no"; then
--
--  ##################################################################
--  # first test for ldap.h and lber.h
--  # (ldap.h is required for this test)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ldap_support" >&5
+ $as_echo "$with_ldap_support" >&6; }
+ 
+ SMBLDAP=""
+@@ -62649,150 +23582,12 @@
+   ##################################################################
+   # first test for ldap.h and lber.h
+   # (ldap.h is required for this test)
 -
 -
 -for ac_header in ldap.h lber.h
@@ -67836,29 +69447,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
-+if test x"$samba_cv_WITH_AFS" != x"no" && test x"$have_afs_headers" = x"yes"; then
-+
-+$as_echo "#define WITH_AFS 1" >>confdefs.h
-+
- fi
- 
+-fi
+-
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
-+#################################################
-+# check for the DFS clear-text auth system
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DFS clear-text auth" >&5
-+$as_echo_n "checking whether to use DFS clear-text auth... " >&6; }
-+
-+# Check whether --with-dfs was given.
-+if test "${with_dfs+set}" = set; then :
-+  withval=$with_dfs;  case "$withval" in
-+  yes)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+$as_echo "#define WITH_DFS 1" >>confdefs.h
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -67867,7 +69461,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -    { $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;}
@@ -67887,64 +69481,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -## ---------------------------------------- ##
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
+-    ;;
 -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
-+  esac
- else
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
- fi
+-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; }
- 
-+
-+########################################################
-+# Compile with LDAP support?
-+
-+with_ldap_support=auto
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
-+$as_echo_n "checking for LDAP support... " >&6; }
-+
-+
-+# Check whether --with-ldap was given.
-+if test "${with_ldap+set}" = set; then :
-+  withval=$with_ldap;  case "$withval" in
-+    yes|no)
-+	with_ldap_support=$withval
-+	;;
-+  esac
- fi
+-
+-fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ldap_support" >&5
-+$as_echo "$with_ldap_support" >&6; }
-+
-+SMBLDAP=""
-+
-+SMBLDAPUTIL=""
-+
-+LDBLDAP=""
-+
-+
-+if test x"$with_ldap_support" != x"no"; then
-+
-+  ##################################################################
-+  # first test for ldap.h and lber.h
-+  # (ldap.h is required for this test)
 +  for ac_header in ldap.h lber.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -67954,7 +69508,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -60505,11 +22401,9 @@
+@@ -62804,11 +23599,9 @@
  
    if test x"$ac_cv_header_ldap_h" != x"yes"; then
  	if test x"$with_ldap_support" = x"yes"; then
@@ -67968,7 +69522,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
  	fi
  
-@@ -60521,117 +22415,24 @@
+@@ -62820,117 +23613,24 @@
    # unsigned int in include/includes.h
    case $host_os in
  	*hpux*)
@@ -68093,7 +69647,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
  		fi
  		with_ldap_support=no
-@@ -60648,23 +22449,17 @@
+@@ -62947,23 +23647,17 @@
    # this test must be before the libldap test
  
  
@@ -68120,7 +69674,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -60682,54 +22477,28 @@
+@@ -62981,54 +23675,28 @@
    return 0;
  }
  _ACEOF
@@ -68182,7 +69736,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLBER 1
  _ACEOF
-@@ -60745,25 +22514,19 @@
+@@ -63044,25 +23712,19 @@
  
  fi
  
@@ -68211,7 +69765,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ber_sockbuf_add_io to an innocuous variant, in case <limits.h> declares ber_sockbuf_add_io.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -60804,61 +22567,31 @@
+@@ -63103,61 +23765,31 @@
    return 0;
  }
  _ACEOF
@@ -68282,7 +69836,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <ldap.h>
  int
-@@ -60869,59 +22602,32 @@
+@@ -63168,59 +23800,32 @@
    return 0;
  }
  _ACEOF
@@ -68349,7 +69903,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <lber.h>
  int
-@@ -60932,42 +22638,19 @@
+@@ -63231,42 +23836,19 @@
    return 0;
  }
  _ACEOF
@@ -68396,7 +69950,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  
-@@ -60975,23 +22658,17 @@
+@@ -63274,23 +23856,17 @@
    # now see if we can find the ldap libs in standard paths
  
  
@@ -68423,7 +69977,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -61009,54 +22686,28 @@
+@@ -63308,54 +23884,28 @@
    return 0;
  }
  _ACEOF
@@ -68485,7 +70039,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBLDAP 1
  _ACEOF
-@@ -61072,25 +22723,19 @@
+@@ -63371,25 +23921,19 @@
  
  fi
  
@@ -68514,7 +70068,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ldap_set_rebind_proc to an innocuous variant, in case <limits.h> declares ldap_set_rebind_proc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -61131,62 +22776,32 @@
+@@ -63430,62 +23974,32 @@
    return 0;
  }
  _ACEOF
@@ -68586,7 +70140,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  	#include <lber.h>
-@@ -61199,37 +22814,16 @@
+@@ -63498,37 +24012,16 @@
    return 0;
  }
  _ACEOF
@@ -68627,7 +70181,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
  
  
-@@ -61240,19 +22834,14 @@
+@@ -63539,19 +24032,14 @@
  
  
  
@@ -68650,7 +70204,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -61293,55 +22882,27 @@
+@@ -63592,55 +24080,27 @@
    return 0;
  }
  _ACEOF
@@ -68713,7 +70267,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
      CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
      default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -61349,17 +22910,15 @@
+@@ -63648,17 +24108,15 @@
      SMBLDAP="lib/smbldap.o"
      SMBLDAPUTIL="lib/smbldap_util.o"
      with_ldap_support=yes
@@ -68735,7 +70289,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
      fi
  
-@@ -61374,12 +22933,12 @@
+@@ -63673,12 +24131,12 @@
  # active directory support
  
  with_ads_support=auto
@@ -68750,7 +70304,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_ads;  case "$withval" in
      yes|no)
  	with_ads_support="$withval"
-@@ -61388,7 +22947,7 @@
+@@ -63687,7 +24145,7 @@
  fi
  
  
@@ -68759,7 +70313,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$with_ads_support" >&6; }
  
  FOUND_KRB5=no
-@@ -61397,11 +22956,9 @@
+@@ -63696,11 +24154,9 @@
  if test x"$with_ldap_support" != x"yes"; then
  
      if test x"$with_ads_support" = x"yes"; then
@@ -68773,7 +70327,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
  	with_ads_support=no
      fi
-@@ -61416,19 +22973,14 @@
+@@ -63715,19 +24171,14 @@
  	*hpux*)
  
  
@@ -68796,7 +70350,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ldap_init to an innocuous variant, in case <limits.h> declares ldap_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -61469,57 +23021,29 @@
+@@ -63768,57 +24219,29 @@
    return 0;
  }
  _ACEOF
@@ -68862,7 +70416,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -61528,19 +23052,14 @@
+@@ -63827,19 +24250,14 @@
  	*)
  
  
@@ -68885,7 +70439,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ldap_initialize to an innocuous variant, in case <limits.h> declares ldap_initialize.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -61581,57 +23100,29 @@
+@@ -63880,57 +24298,29 @@
    return 0;
  }
  _ACEOF
@@ -68951,7 +70505,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -61642,19 +23133,14 @@
+@@ -63941,19 +24331,14 @@
  
  
  
@@ -68974,7 +70528,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define ldap_add_result_entry to an innocuous variant, in case <limits.h> declares ldap_add_result_entry.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -61695,57 +23181,29 @@
+@@ -63994,57 +24379,29 @@
    return 0;
  }
  _ACEOF
@@ -69040,7 +70594,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
  	    with_ads_support=no
  	fi
-@@ -61761,23 +23219,23 @@
+@@ -64060,23 +24417,23 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # check for location of Kerberos 5 install
@@ -69069,7 +70623,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$withval" >&6; }
          KRB5_CFLAGS="-I$withval/include"
          KRB5_CPPFLAGS="-I$withval/include"
-@@ -61789,7 +23247,7 @@
+@@ -64088,7 +24445,7 @@
          ;;
        esac
  else
@@ -69078,7 +70632,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no krb5-path given" >&6; }
  
  fi
-@@ -61800,9 +23258,9 @@
+@@ -64099,9 +24456,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
@@ -69090,7 +70644,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $KRB5CONFIG in
-@@ -61815,14 +23273,14 @@
+@@ -64114,14 +24471,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -69108,7 +70662,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -61830,15 +23288,15 @@
+@@ -64129,15 +24486,15 @@
  fi
  KRB5CONFIG=$ac_cv_path_KRB5CONFIG
  if test -n "$KRB5CONFIG"; then
@@ -69127,7 +70681,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -61852,17 +23310,17 @@
+@@ -64151,17 +24508,17 @@
      CFLAGS=$ac_save_CFLAGS;export CFLAGS
      LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
      FOUND_KRB5=yes
@@ -69148,7 +70702,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -61870,17 +23328,17 @@
+@@ -64169,17 +24526,17 @@
            KRB5_CPPFLAGS="-I/usr/include/heimdal"
            KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
  	  FOUND_KRB5=yes
@@ -69169,7 +70723,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
      fi
    fi
-@@ -61888,17 +23346,17 @@
+@@ -64187,17 +24544,17 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the RedHat location for kerberos
@@ -69190,7 +70744,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
      fi
    fi
-@@ -61906,16 +23364,16 @@
+@@ -64205,16 +24562,16 @@
    if test x$FOUND_KRB5 = x"no"; then
      #################################################
      # see if this box has the OpenBSD location for heimdal krb5
@@ -69210,10 +70764,52 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
      fi
    fi
-@@ -62002,151 +23460,12 @@
-   # now check for krb5.h. Some systems have the libraries without the headers!
-   # note that this check is done here to allow for different kerberos
-   # include paths
+@@ -64259,193 +24616,54 @@
+   KRB5_LIBS=$ac_new_flags
+ 
+ 
+-  ac_new_flags=""
+-  l=""
+-  for i in $KRB5_LDFLAGS; do
+-    case $l$i in
+-    -L/usr/lib) ;;
+-    -L/usr/lib/) ;;
+-    -L/usr/lib64) ;;
+-    -L/usr/lib64/) ;;
+-    -Wl,-rpath,/usr/lib) l="";;
+-    -Wl,-rpath,/usr/lib/) l="";;
+-    -Wl,-rpath,/usr/lib64) l="";;
+-    -Wl,-rpath,/usr/lib64/) l="";;
+-    -Wl,-rpath) l=$i;;
+-    -Wl,-rpath-Wl,/usr/lib) l="";;
+-    -Wl,-rpath-Wl,/usr/lib/) l="";;
+-    -Wl,-rpath-Wl,/usr/lib64) l="";;
+-    -Wl,-rpath-Wl,/usr/lib64/) l="";;
+-    *)
+-    	s=" "
+-        if test x"$ac_new_flags" = x""; then
+-            s="";
+-	fi
+-        if test x"$l" = x""; then
+-            ac_new_flags="$ac_new_flags$s$i";
+-        else
+-            ac_new_flags="$ac_new_flags$s$l $i";
+-        fi
+-        l=""
+-        ;;
+-    esac
+-  done
+-  KRB5_LDFLAGS=$ac_new_flags
+-
+-  CFLAGS="$KRB5_CFLAGS $CFLAGS"
+-  CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
+-  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
+-
+-  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
+-
+-  # now check for krb5.h. Some systems have the libraries without the headers!
+-  # note that this check is done here to allow for different kerberos
+-  # include paths
 -
 -for ac_header in krb5.h
 -do
@@ -69310,7 +70906,39 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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; }
--
++  ac_new_flags=""
++  l=""
++  for i in $KRB5_LDFLAGS; do
++    case $l$i in
++    -L/usr/lib) ;;
++    -L/usr/lib/) ;;
++    -L/usr/lib64) ;;
++    -L/usr/lib64/) ;;
++    -Wl,-rpath,/usr/lib) l="";;
++    -Wl,-rpath,/usr/lib/) l="";;
++    -Wl,-rpath,/usr/lib64) l="";;
++    -Wl,-rpath,/usr/lib64/) l="";;
++    -Wl,-rpath) l=$i;;
++    -Wl,-rpath-Wl,/usr/lib) l="";;
++    -Wl,-rpath-Wl,/usr/lib/) l="";;
++    -Wl,-rpath-Wl,/usr/lib64) l="";;
++    -Wl,-rpath-Wl,/usr/lib64/) l="";;
++    *)
++    	s=" "
++        if test x"$ac_new_flags" = x""; then
++            s="";
++	fi
++        if test x"$l" = x""; then
++            ac_new_flags="$ac_new_flags$s$i";
++        else
++            ac_new_flags="$ac_new_flags$s$l $i";
++        fi
++        l=""
++        ;;
++    esac
++  done
++  KRB5_LDFLAGS=$ac_new_flags
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -69352,11 +70980,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
++  CFLAGS="$KRB5_CFLAGS $CFLAGS"
++  CPPFLAGS="$KRB5_CPPFLAGS $CPPFLAGS"
++  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
+ 
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
++
++  # now check for krb5.h. Some systems have the libraries without the headers!
++  # note that this check is done here to allow for different kerberos
++  # include paths
 +  for ac_header in krb5.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
@@ -69367,7 +71003,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -62160,11 +23479,9 @@
+@@ -64459,11 +24677,9 @@
      # i.e with_ads_support = auto, otherwise die with an error.
  
      if test x"$with_ads_support" = x"yes"; then
@@ -69381,7 +71017,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
      fi
  
-@@ -62176,65 +23493,16 @@
+@@ -64475,65 +24691,16 @@
      CPPFLAGS=$ac_save_CPPFLAGS
      LDFLAGS=$ac_save_LDFLAGS
    fi
@@ -69453,7 +71089,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -62249,17 +23517,13 @@
+@@ -64550,17 +24717,13 @@
  
    # check for new heimdal KRB5_DEPRECATED handling
  
@@ -69474,7 +71110,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #define KRB5_DEPRECATED 1
        #include <krb5.h>
-@@ -62271,42 +23535,19 @@
+@@ -64572,42 +24735,19 @@
    return 0;
  }
  _ACEOF
@@ -69521,7 +71157,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  fi
-@@ -62320,152 +23561,12 @@
+@@ -64621,152 +24761,12 @@
  
    # now check for gssapi headers.  This is also done here to allow for
    # different kerberos include paths
@@ -69680,7 +71316,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -62479,23 +23580,17 @@
+@@ -64780,23 +24780,17 @@
    # we might need the k5crypto and com_err libraries on some systems
  
  
@@ -69707,7 +71343,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62513,54 +23608,28 @@
+@@ -64814,54 +24808,28 @@
    return 0;
  }
  _ACEOF
@@ -69769,7 +71405,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCOM_ERR 1
  _ACEOF
-@@ -62577,24 +23646,17 @@
+@@ -64878,24 +24846,17 @@
  fi
  
  
@@ -69797,7 +71433,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62612,54 +23674,28 @@
+@@ -64913,54 +24874,28 @@
    return 0;
  }
  _ACEOF
@@ -69859,7 +71495,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBK5CRYPTO 1
  _ACEOF
-@@ -62675,27 +23711,20 @@
+@@ -64976,27 +24911,20 @@
  
  fi
  
@@ -69890,7 +71526,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62713,54 +23742,28 @@
+@@ -65014,54 +24942,28 @@
    return 0;
  }
  _ACEOF
@@ -69952,7 +71588,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPTO 1
  _ACEOF
-@@ -62777,24 +23780,17 @@
+@@ -65078,24 +24980,17 @@
  fi
  
  
@@ -69980,7 +71616,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62812,54 +23808,28 @@
+@@ -65113,54 +25008,28 @@
    return 0;
  }
  _ACEOF
@@ -70042,7 +71678,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBASN1 1
  _ACEOF
-@@ -62876,24 +23846,17 @@
+@@ -65177,24 +25046,17 @@
  fi
  
  
@@ -70070,7 +71706,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -62911,54 +23874,28 @@
+@@ -65212,54 +25074,28 @@
    return 0;
  }
  _ACEOF
@@ -70132,7 +71768,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBROKEN 1
  _ACEOF
-@@ -62974,27 +23911,20 @@
+@@ -65275,27 +25111,20 @@
  
  fi
  
@@ -70163,7 +71799,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63012,54 +23942,28 @@
+@@ -65313,54 +25142,28 @@
    return 0;
  }
  _ACEOF
@@ -70225,7 +71861,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI 1
  _ACEOF
-@@ -63075,29 +23979,22 @@
+@@ -65376,29 +25179,22 @@
  
  fi
  
@@ -70258,7 +71894,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63115,54 +24012,28 @@
+@@ -65416,54 +25212,28 @@
    return 0;
  }
  _ACEOF
@@ -70320,7 +71956,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -63179,24 +24050,17 @@
+@@ -65480,24 +25250,17 @@
  fi
  
  
@@ -70348,7 +71984,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63214,54 +24078,28 @@
+@@ -65515,54 +25278,28 @@
    return 0;
  }
  _ACEOF
@@ -70410,7 +72046,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB5 1
  _ACEOF
-@@ -63277,29 +24115,22 @@
+@@ -65578,29 +25315,22 @@
  
  fi
  
@@ -70443,7 +72079,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -63317,54 +24148,28 @@
+@@ -65618,54 +25348,28 @@
    return 0;
  }
  _ACEOF
@@ -70505,7 +72141,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGSSAPI_KRB5 1
  _ACEOF
-@@ -63379,24 +24184,18 @@
+@@ -65680,24 +25384,18 @@
  		have_gssapi=yes
  
  fi
@@ -70533,7 +72169,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_set_real_time to an innocuous variant, in case <limits.h> declares krb5_set_real_time.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63437,43 +24236,18 @@
+@@ -65738,43 +25436,18 @@
    return 0;
  }
  _ACEOF
@@ -70583,7 +72219,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_REAL_TIME 1
  _ACEOF
-@@ -63481,20 +24255,14 @@
+@@ -65782,20 +25455,14 @@
  fi
  
  
@@ -70607,7 +72243,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_set_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_set_default_in_tkt_etypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63535,43 +24303,18 @@
+@@ -65836,43 +25503,18 @@
    return 0;
  }
  _ACEOF
@@ -70657,7 +72293,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -63579,20 +24322,14 @@
+@@ -65880,20 +25522,14 @@
  fi
  
  
@@ -70681,7 +72317,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_set_default_tgs_enctypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_enctypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63633,43 +24370,18 @@
+@@ -65934,43 +25570,18 @@
    return 0;
  }
  _ACEOF
@@ -70731,7 +72367,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
  _ACEOF
-@@ -63677,20 +24389,14 @@
+@@ -65978,20 +25589,14 @@
  fi
  
  
@@ -70755,7 +72391,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_set_default_tgs_ktypes to an innocuous variant, in case <limits.h> declares krb5_set_default_tgs_ktypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63731,43 +24437,18 @@
+@@ -66032,43 +25637,18 @@
    return 0;
  }
  _ACEOF
@@ -70805,7 +72441,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
  _ACEOF
-@@ -63775,20 +24456,14 @@
+@@ -66076,20 +25656,14 @@
  fi
  
  
@@ -70829,7 +72465,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_principal2salt to an innocuous variant, in case <limits.h> declares krb5_principal2salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63829,43 +24504,18 @@
+@@ -66130,43 +25704,18 @@
    return 0;
  }
  _ACEOF
@@ -70879,7 +72515,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL2SALT 1
  _ACEOF
-@@ -63873,20 +24523,14 @@
+@@ -66174,20 +25723,14 @@
  fi
  
  
@@ -70903,7 +72539,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_use_enctype to an innocuous variant, in case <limits.h> declares krb5_use_enctype.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -63927,43 +24571,18 @@
+@@ -66228,43 +25771,18 @@
    return 0;
  }
  _ACEOF
@@ -70953,7 +72589,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_USE_ENCTYPE 1
  _ACEOF
-@@ -63971,20 +24590,14 @@
+@@ -66272,20 +25790,14 @@
  fi
  
  
@@ -70977,7 +72613,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_string_to_key to an innocuous variant, in case <limits.h> declares krb5_string_to_key.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64025,43 +24638,18 @@
+@@ -66326,43 +25838,18 @@
    return 0;
  }
  _ACEOF
@@ -71027,7 +72663,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY 1
  _ACEOF
-@@ -64069,20 +24657,14 @@
+@@ -66370,20 +25857,14 @@
  fi
  
  
@@ -71051,7 +72687,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_pw_salt to an innocuous variant, in case <limits.h> declares krb5_get_pw_salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64123,43 +24705,18 @@
+@@ -66424,43 +25905,18 @@
    return 0;
  }
  _ACEOF
@@ -71101,7 +72737,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PW_SALT 1
  _ACEOF
-@@ -64167,20 +24724,14 @@
+@@ -66468,20 +25924,14 @@
  fi
  
  
@@ -71125,7 +72761,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_string_to_key_salt to an innocuous variant, in case <limits.h> declares krb5_string_to_key_salt.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64221,43 +24772,18 @@
+@@ -66522,43 +25972,18 @@
    return 0;
  }
  _ACEOF
@@ -71175,7 +72811,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_STRING_TO_KEY_SALT 1
  _ACEOF
-@@ -64265,20 +24791,14 @@
+@@ -66566,20 +25991,14 @@
  fi
  
  
@@ -71199,7 +72835,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_auth_con_setkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setkey.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64319,43 +24839,18 @@
+@@ -66620,43 +26039,18 @@
    return 0;
  }
  _ACEOF
@@ -71249,7 +72885,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETKEY 1
  _ACEOF
-@@ -64363,20 +24858,14 @@
+@@ -66664,20 +26058,14 @@
  fi
  
  
@@ -71273,7 +72909,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_auth_con_setuseruserkey to an innocuous variant, in case <limits.h> declares krb5_auth_con_setuseruserkey.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64417,43 +24906,18 @@
+@@ -66718,43 +26106,18 @@
    return 0;
  }
  _ACEOF
@@ -71323,7 +72959,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
  _ACEOF
-@@ -64461,20 +24925,14 @@
+@@ -66762,20 +26125,14 @@
  fi
  
  
@@ -71347,7 +72983,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_locate_kdc to an innocuous variant, in case <limits.h> declares krb5_locate_kdc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64515,43 +24973,18 @@
+@@ -66816,43 +26173,18 @@
    return 0;
  }
  _ACEOF
@@ -71397,7 +73033,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_LOCATE_KDC 1
  _ACEOF
-@@ -64559,20 +24992,14 @@
+@@ -66860,20 +26192,14 @@
  fi
  
  
@@ -71421,7 +73057,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_permitted_enctypes to an innocuous variant, in case <limits.h> declares krb5_get_permitted_enctypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64613,43 +25040,18 @@
+@@ -66914,43 +26240,18 @@
    return 0;
  }
  _ACEOF
@@ -71471,7 +73107,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
  _ACEOF
-@@ -64657,20 +25059,14 @@
+@@ -66958,20 +26259,14 @@
  fi
  
  
@@ -71495,7 +73131,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_default_in_tkt_etypes to an innocuous variant, in case <limits.h> declares krb5_get_default_in_tkt_etypes.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64711,43 +25107,18 @@
+@@ -67012,43 +26307,18 @@
    return 0;
  }
  _ACEOF
@@ -71545,7 +73181,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
  _ACEOF
-@@ -64755,20 +25126,14 @@
+@@ -67056,20 +26326,14 @@
  fi
  
  
@@ -71569,7 +73205,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_free_data_contents to an innocuous variant, in case <limits.h> declares krb5_free_data_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64809,43 +25174,18 @@
+@@ -67110,43 +26374,18 @@
    return 0;
  }
  _ACEOF
@@ -71619,7 +73255,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_DATA_CONTENTS 1
  _ACEOF
-@@ -64853,20 +25193,14 @@
+@@ -67154,20 +26393,14 @@
  fi
  
  
@@ -71643,7 +73279,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_principal_get_comp_string to an innocuous variant, in case <limits.h> declares krb5_principal_get_comp_string.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -64907,43 +25241,18 @@
+@@ -67208,43 +26441,18 @@
    return 0;
  }
  _ACEOF
@@ -71693,7 +73329,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
  _ACEOF
-@@ -64951,20 +25260,14 @@
+@@ -67252,20 +26460,14 @@
  fi
  
  
@@ -71717,7 +73353,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_free_unparsed_name to an innocuous variant, in case <limits.h> declares krb5_free_unparsed_name.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65005,43 +25308,18 @@
+@@ -67306,43 +26508,18 @@
    return 0;
  }
  _ACEOF
@@ -71767,7 +73403,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_UNPARSED_NAME 1
  _ACEOF
-@@ -65049,20 +25327,14 @@
+@@ -67350,20 +26527,14 @@
  fi
  
  
@@ -71791,7 +73427,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_free_keytab_entry_contents to an innocuous variant, in case <limits.h> declares krb5_free_keytab_entry_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65103,43 +25375,18 @@
+@@ -67404,43 +26575,18 @@
    return 0;
  }
  _ACEOF
@@ -71841,7 +73477,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
  _ACEOF
-@@ -65147,20 +25394,14 @@
+@@ -67448,20 +26594,14 @@
  fi
  
  
@@ -71865,7 +73501,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_kt_free_entry to an innocuous variant, in case <limits.h> declares krb5_kt_free_entry.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65201,43 +25442,18 @@
+@@ -67502,43 +26642,18 @@
    return 0;
  }
  _ACEOF
@@ -71915,7 +73551,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KT_FREE_ENTRY 1
  _ACEOF
-@@ -65245,20 +25461,14 @@
+@@ -67546,20 +26661,14 @@
  fi
  
  
@@ -71939,7 +73575,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_krbhst_init to an innocuous variant, in case <limits.h> declares krb5_krbhst_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65299,43 +25509,18 @@
+@@ -67600,43 +26709,18 @@
    return 0;
  }
  _ACEOF
@@ -71989,7 +73625,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_INIT 1
  _ACEOF
-@@ -65343,20 +25528,14 @@
+@@ -67644,20 +26728,14 @@
  fi
  
  
@@ -72013,7 +73649,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_krbhst_get_addrinfo to an innocuous variant, in case <limits.h> declares krb5_krbhst_get_addrinfo.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65397,43 +25576,18 @@
+@@ -67698,43 +26776,18 @@
    return 0;
  }
  _ACEOF
@@ -72063,7 +73699,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
  _ACEOF
-@@ -65441,20 +25595,14 @@
+@@ -67742,20 +26795,14 @@
  fi
  
  
@@ -72087,19 +73723,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_c_enctype_compare to an innocuous variant, in case <limits.h> declares krb5_c_enctype_compare.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65486,52 +25634,27 @@
- #if defined __stub_krb5_c_enctype_compare || defined __stub___krb5_c_enctype_compare
- choke me
- #endif
--
--int
--main ()
--{
--return krb5_c_enctype_compare ();
--  ;
--  return 0;
--}
--_ACEOF
+@@ -67796,43 +26843,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -72121,15 +73748,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+
-+int
-+main ()
-+{
-+return krb5_c_enctype_compare ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_c_enctype_compare=yes
  else
@@ -72155,7 +73773,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_ENCTYPE_COMPARE 1
  _ACEOF
-@@ -65539,20 +25662,14 @@
+@@ -67840,20 +26862,14 @@
  fi
  
  
@@ -72179,7 +73797,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_enctypes_compatible_keys to an innocuous variant, in case <limits.h> declares krb5_enctypes_compatible_keys.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65593,43 +25710,18 @@
+@@ -67894,43 +26910,18 @@
    return 0;
  }
  _ACEOF
@@ -72229,7 +73847,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
  _ACEOF
-@@ -65637,20 +25729,14 @@
+@@ -67938,20 +26929,14 @@
  fi
  
  
@@ -72253,7 +73871,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_crypto_init to an innocuous variant, in case <limits.h> declares krb5_crypto_init.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65691,43 +25777,18 @@
+@@ -67992,43 +26977,18 @@
    return 0;
  }
  _ACEOF
@@ -72303,7 +73921,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_INIT 1
  _ACEOF
-@@ -65735,20 +25796,14 @@
+@@ -68036,20 +26996,14 @@
  fi
  
  
@@ -72327,7 +73945,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_crypto_destroy to an innocuous variant, in case <limits.h> declares krb5_crypto_destroy.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65789,43 +25844,18 @@
+@@ -68090,43 +27044,18 @@
    return 0;
  }
  _ACEOF
@@ -72377,7 +73995,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_CRYPTO_DESTROY 1
  _ACEOF
-@@ -65833,20 +25863,14 @@
+@@ -68134,20 +27063,14 @@
  fi
  
  
@@ -72401,7 +74019,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_decode_ap_req to an innocuous variant, in case <limits.h> declares krb5_decode_ap_req.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65887,43 +25911,18 @@
+@@ -68188,43 +27111,18 @@
    return 0;
  }
  _ACEOF
@@ -72451,7 +74069,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_DECODE_AP_REQ 1
  _ACEOF
-@@ -65931,20 +25930,14 @@
+@@ -68232,20 +27130,14 @@
  fi
  
  
@@ -72475,7 +74093,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define free_AP_REQ to an innocuous variant, in case <limits.h> declares free_AP_REQ.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -65985,43 +25978,18 @@
+@@ -68286,43 +27178,18 @@
    return 0;
  }
  _ACEOF
@@ -72525,7 +74143,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_FREE_AP_REQ 1
  _ACEOF
-@@ -66029,20 +25997,14 @@
+@@ -68330,20 +27197,14 @@
  fi
  
  
@@ -72549,7 +74167,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_verify_checksum.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66083,43 +26045,18 @@
+@@ -68384,43 +27245,18 @@
    return 0;
  }
  _ACEOF
@@ -72599,7 +74217,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -66127,20 +26064,14 @@
+@@ -68428,20 +27264,14 @@
  fi
  
  
@@ -72623,7 +74241,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_c_verify_checksum to an innocuous variant, in case <limits.h> declares krb5_c_verify_checksum.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66181,43 +26112,18 @@
+@@ -68482,43 +27312,18 @@
    return 0;
  }
  _ACEOF
@@ -72673,7 +74291,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_C_VERIFY_CHECKSUM 1
  _ACEOF
-@@ -66225,20 +26131,14 @@
+@@ -68526,20 +27331,14 @@
  fi
  
  
@@ -72697,7 +74315,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_principal_compare_any_realm to an innocuous variant, in case <limits.h> declares krb5_principal_compare_any_realm.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66279,43 +26179,18 @@
+@@ -68580,43 +27379,18 @@
    return 0;
  }
  _ACEOF
@@ -72747,7 +74365,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
  _ACEOF
-@@ -66323,20 +26198,14 @@
+@@ -68624,20 +27398,14 @@
  fi
  
  
@@ -72771,7 +74389,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_parse_name_norealm to an innocuous variant, in case <limits.h> declares krb5_parse_name_norealm.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66377,43 +26246,18 @@
+@@ -68678,43 +27446,18 @@
    return 0;
  }
  _ACEOF
@@ -72821,7 +74439,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PARSE_NAME_NOREALM 1
  _ACEOF
-@@ -66421,20 +26265,14 @@
+@@ -68722,20 +27465,14 @@
  fi
  
  
@@ -72845,7 +74463,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_princ_size to an innocuous variant, in case <limits.h> declares krb5_princ_size.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66475,43 +26313,18 @@
+@@ -68776,43 +27513,18 @@
    return 0;
  }
  _ACEOF
@@ -72895,7 +74513,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_PRINC_SIZE 1
  _ACEOF
-@@ -66519,20 +26332,14 @@
+@@ -68820,20 +27532,14 @@
  fi
  
  
@@ -72919,7 +74537,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_set_pac_request to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_set_pac_request.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66573,43 +26380,18 @@
+@@ -68874,43 +27580,18 @@
    return 0;
  }
  _ACEOF
@@ -72969,7 +74587,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
  _ACEOF
-@@ -66617,20 +26399,14 @@
+@@ -68918,20 +27599,14 @@
  fi
  
  
@@ -72993,7 +74611,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_renewed_creds to an innocuous variant, in case <limits.h> declares krb5_get_renewed_creds.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66671,43 +26447,18 @@
+@@ -68972,43 +27647,18 @@
    return 0;
  }
  _ACEOF
@@ -73043,7 +74661,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_RENEWED_CREDS 1
  _ACEOF
-@@ -66715,20 +26466,14 @@
+@@ -69016,20 +27666,14 @@
  fi
  
  
@@ -73067,7 +74685,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_kdc_cred to an innocuous variant, in case <limits.h> declares krb5_get_kdc_cred.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66769,43 +26514,18 @@
+@@ -69070,43 +27714,18 @@
    return 0;
  }
  _ACEOF
@@ -73117,7 +74735,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_KDC_CRED 1
  _ACEOF
-@@ -66813,20 +26533,14 @@
+@@ -69114,20 +27733,14 @@
  fi
  
  
@@ -73141,7 +74759,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_free_error_contents to an innocuous variant, in case <limits.h> declares krb5_free_error_contents.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66867,43 +26581,18 @@
+@@ -69168,43 +27781,18 @@
    return 0;
  }
  _ACEOF
@@ -73191,7 +74809,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FREE_ERROR_CONTENTS 1
  _ACEOF
-@@ -66911,20 +26600,14 @@
+@@ -69212,20 +27800,14 @@
  fi
  
  
@@ -73215,7 +74833,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define initialize_krb5_error_table to an innocuous variant, in case <limits.h> declares initialize_krb5_error_table.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -66965,43 +26648,18 @@
+@@ -69266,43 +27848,18 @@
    return 0;
  }
  _ACEOF
@@ -73265,7 +74883,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
  _ACEOF
-@@ -67009,20 +26667,14 @@
+@@ -69310,20 +27867,14 @@
  fi
  
  
@@ -73289,7 +74907,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_alloc.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67063,43 +26715,18 @@
+@@ -69364,43 +27915,18 @@
    return 0;
  }
  _ACEOF
@@ -73339,7 +74957,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
  _ACEOF
-@@ -67107,20 +26734,14 @@
+@@ -69408,20 +27934,14 @@
  fi
  
  
@@ -73363,7 +74981,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_free to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_free.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67161,43 +26782,18 @@
+@@ -69462,43 +27982,18 @@
    return 0;
  }
  _ACEOF
@@ -73413,7 +75031,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
  _ACEOF
-@@ -67205,20 +26801,14 @@
+@@ -69506,20 +28001,14 @@
  fi
  
  
@@ -73437,10 +75055,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_get_init_creds_opt_get_error to an innocuous variant, in case <limits.h> declares krb5_get_init_creds_opt_get_error.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67259,43 +26849,18 @@
-   return 0;
- }
- _ACEOF
+@@ -69551,52 +28040,27 @@
+ #if defined __stub_krb5_get_init_creds_opt_get_error || defined __stub___krb5_get_init_creds_opt_get_error
+ choke me
+ #endif
+-
+-int
+-main ()
+-{
+-return krb5_get_init_creds_opt_get_error ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -73462,6 +75089,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++
++int
++main ()
++{
++return krb5_get_init_creds_opt_get_error ();
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_func_ext_krb5_get_init_creds_opt_get_error=yes
  else
@@ -73487,7 +75123,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
  _ACEOF
-@@ -67303,20 +26868,14 @@
+@@ -69604,20 +28068,14 @@
  fi
  
  
@@ -73511,7 +75147,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_enctype_to_string to an innocuous variant, in case <limits.h> declares krb5_enctype_to_string.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67357,43 +26916,18 @@
+@@ -69658,43 +28116,18 @@
    return 0;
  }
  _ACEOF
@@ -73561,7 +75197,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_ENCTYPE_TO_STRING 1
  _ACEOF
-@@ -67401,20 +26935,14 @@
+@@ -69702,20 +28135,14 @@
  fi
  
  
@@ -73585,7 +75221,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_fwd_tgt_creds to an innocuous variant, in case <limits.h> declares krb5_fwd_tgt_creds.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67455,43 +26983,18 @@
+@@ -69756,43 +28183,18 @@
    return 0;
  }
  _ACEOF
@@ -73635,7 +75271,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_FWD_TGT_CREDS 1
  _ACEOF
-@@ -67499,20 +27002,14 @@
+@@ -69800,20 +28202,14 @@
  fi
  
  
@@ -73659,7 +75295,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define krb5_auth_con_set_req_cksumtype to an innocuous variant, in case <limits.h> declares krb5_auth_con_set_req_cksumtype.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -67553,136 +27050,48 @@
+@@ -69854,43 +28250,18 @@
    return 0;
  }
  _ACEOF
@@ -73709,9 +75345,531 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
  _ACEOF
+@@ -69898,20 +28269,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_creds_opt_alloc" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_alloc" >&5
+ $as_echo_n "checking for krb5_get_creds_opt_alloc... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds_opt_alloc+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds_opt_alloc+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 krb5_get_creds_opt_alloc to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_alloc.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -69952,43 +28317,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_creds_opt_alloc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_creds_opt_alloc=no
++  ac_cv_func_ext_krb5_get_creds_opt_alloc=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds_opt_alloc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds_opt_alloc" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds_opt_alloc" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_creds_opt_alloc = yes; then
++    if test $ac_cv_func_ext_krb5_get_creds_opt_alloc = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS_OPT_ALLOC 1
+ _ACEOF
+@@ -69996,20 +28336,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_creds_opt_set_impersonate" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_set_impersonate" >&5
+ $as_echo_n "checking for krb5_get_creds_opt_set_impersonate... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+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 krb5_get_creds_opt_set_impersonate to an innocuous variant, in case <limits.h> declares krb5_get_creds_opt_set_impersonate.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70050,43 +28384,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=no
++  ac_cv_func_ext_krb5_get_creds_opt_set_impersonate=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds_opt_set_impersonate" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate = yes; then
++    if test $ac_cv_func_ext_krb5_get_creds_opt_set_impersonate = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS_OPT_SET_IMPERSONATE 1
+ _ACEOF
+@@ -70094,20 +28403,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_creds" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds" >&5
+ $as_echo_n "checking for krb5_get_creds... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_creds+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_creds+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 krb5_get_creds to an innocuous variant, in case <limits.h> declares krb5_get_creds.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70148,43 +28451,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_creds=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_creds=no
++  ac_cv_func_ext_krb5_get_creds=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_creds" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_creds" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_creds" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_creds = yes; then
++    if test $ac_cv_func_ext_krb5_get_creds = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDS 1
+ _ACEOF
+@@ -70192,20 +28470,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_credentials_for_user" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_credentials_for_user" >&5
+ $as_echo_n "checking for krb5_get_credentials_for_user... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_credentials_for_user+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_credentials_for_user+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 krb5_get_credentials_for_user to an innocuous variant, in case <limits.h> declares krb5_get_credentials_for_user.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70246,43 +28518,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_credentials_for_user=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_credentials_for_user=no
++  ac_cv_func_ext_krb5_get_credentials_for_user=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_credentials_for_user" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_credentials_for_user" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_credentials_for_user" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_credentials_for_user = yes; then
++    if test $ac_cv_func_ext_krb5_get_credentials_for_user = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_CREDENTIALS_FOR_USER 1
+ _ACEOF
+@@ -70290,20 +28537,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_get_host_realm" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_host_realm" >&5
+ $as_echo_n "checking for krb5_get_host_realm... " >&6; }
+-if test "${ac_cv_func_ext_krb5_get_host_realm+set}" = set; then
++if test "${ac_cv_func_ext_krb5_get_host_realm+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 krb5_get_host_realm to an innocuous variant, in case <limits.h> declares krb5_get_host_realm.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70344,43 +28585,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_get_host_realm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_get_host_realm=no
++  ac_cv_func_ext_krb5_get_host_realm=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_get_host_realm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_get_host_realm" >&5
+ $as_echo "$ac_cv_func_ext_krb5_get_host_realm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_get_host_realm = yes; then
++    if test $ac_cv_func_ext_krb5_get_host_realm = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_GET_HOST_REALM 1
+ _ACEOF
+@@ -70388,20 +28604,14 @@
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$KRB5_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for krb5_free_host_realm" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_host_realm" >&5
+ $as_echo_n "checking for krb5_free_host_realm... " >&6; }
+-if test "${ac_cv_func_ext_krb5_free_host_realm+set}" = set; then
++if test "${ac_cv_func_ext_krb5_free_host_realm+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 krb5_free_host_realm to an innocuous variant, in case <limits.h> declares krb5_free_host_realm.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -70442,208 +28652,62 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_krb5_free_host_realm=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_krb5_free_host_realm=no
++  ac_cv_func_ext_krb5_free_host_realm=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_krb5_free_host_realm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_free_host_realm" >&5
+ $as_echo "$ac_cv_func_ext_krb5_free_host_realm" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_krb5_free_host_realm = yes; then
++    if test $ac_cv_func_ext_krb5_free_host_realm = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_KRB5_FREE_HOST_REALM 1
+ _ACEOF
  
  fi
  
+-
+   # MIT krb5 1.8 does not expose this call (yet)
+-  { $as_echo "$as_me:$LINENO: checking whether krb5_get_credentials_for_user is declared" >&5
+-$as_echo_n "checking whether krb5_get_credentials_for_user is declared... " >&6; }
+-if test "${ac_cv_have_decl_krb5_get_credentials_for_user+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 <krb5.h>
+-
+-int
+-main ()
+-{
+-#ifndef krb5_get_credentials_for_user
+-  (void) krb5_get_credentials_for_user;
+-#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
+-  ac_cv_have_decl_krb5_get_credentials_for_user=yes
++  ac_fn_c_check_decl "$LINENO" "krb5_get_credentials_for_user" "ac_cv_have_decl_krb5_get_credentials_for_user" "#include <krb5.h>
++"
++if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = x""yes; then :
++  ac_have_decl=1
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl_krb5_get_credentials_for_user=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_have_decl=0
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_krb5_get_credentials_for_user" >&5
+-$as_echo "$ac_cv_have_decl_krb5_get_credentials_for_user" >&6; }
+-if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = x""yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 1
+-_ACEOF
+-
+-
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER 0
++#define HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER $ac_have_decl
+ _ACEOF
+ 
+ 
+-fi
+-
+-
 -
    # MIT krb5 1.7beta3 (in Ubuntu Karmic) does not have this declaration
    # but does have the symbol
@@ -73778,16 +75936,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 1
+-_ACEOF
+-
+-
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
 +#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE $ac_have_decl
  _ACEOF
  
  
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE 0
--_ACEOF
--
--
 -fi
 -
 -
@@ -73811,7 +75969,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -67702,57 +27111,30 @@
+@@ -70663,57 +28727,30 @@
    return 0;
  }
  _ACEOF
@@ -73876,7 +76034,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		    #include <krb5.h>
-@@ -67768,58 +27150,31 @@
+@@ -70729,58 +28766,31 @@
    return 0;
  }
  _ACEOF
@@ -73942,7 +76100,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  	#include <krb5.h>
-@@ -67831,36 +27186,15 @@
+@@ -70792,36 +28802,15 @@
    return 0;
  }
  _ACEOF
@@ -73982,7 +76140,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$smb_krb5_cv_verify_checksum" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -67868,17 +27202,13 @@
+@@ -70829,17 +28818,13 @@
  _ACEOF
  
  
@@ -74003,7 +76161,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -67889,56 +27219,29 @@
+@@ -70850,56 +28835,29 @@
    return 0;
  }
  _ACEOF
@@ -74067,7 +76225,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -67949,56 +27252,29 @@
+@@ -70910,56 +28868,29 @@
    return 0;
  }
  _ACEOF
@@ -74131,7 +76289,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68009,56 +27285,29 @@
+@@ -70970,56 +28901,29 @@
    return 0;
  }
  _ACEOF
@@ -74195,7 +76353,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68069,56 +27318,29 @@
+@@ -71030,56 +28934,29 @@
    return 0;
  }
  _ACEOF
@@ -74259,7 +76417,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68129,56 +27351,29 @@
+@@ -71090,56 +28967,29 @@
    return 0;
  }
  _ACEOF
@@ -74323,7 +76481,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68189,56 +27384,29 @@
+@@ -71150,56 +29000,29 @@
    return 0;
  }
  _ACEOF
@@ -74387,7 +76545,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68249,56 +27417,29 @@
+@@ -71210,56 +29033,29 @@
    return 0;
  }
  _ACEOF
@@ -74451,7 +76609,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68309,55 +27450,28 @@
+@@ -71270,55 +29066,28 @@
    return 0;
  }
  _ACEOF
@@ -74514,7 +76672,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68368,56 +27482,29 @@
+@@ -71329,56 +29098,29 @@
    return 0;
  }
  _ACEOF
@@ -74578,7 +76736,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68428,56 +27515,29 @@
+@@ -71389,56 +29131,29 @@
    return 0;
  }
  _ACEOF
@@ -74642,7 +76800,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68488,56 +27548,29 @@
+@@ -71449,56 +29164,29 @@
    return 0;
  }
  _ACEOF
@@ -74706,7 +76864,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68548,56 +27581,29 @@
+@@ -71509,56 +29197,29 @@
    return 0;
  }
  _ACEOF
@@ -74770,7 +76928,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68608,47 +27614,22 @@
+@@ -71569,47 +29230,22 @@
    return 0;
  }
  _ACEOF
@@ -74824,7 +76982,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68659,58 +27640,31 @@
+@@ -71620,58 +29256,31 @@
    return 0;
  }
  _ACEOF
@@ -74890,7 +77048,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68721,56 +27675,29 @@
+@@ -71682,56 +29291,29 @@
    return 0;
  }
  _ACEOF
@@ -74954,7 +77112,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68781,56 +27708,29 @@
+@@ -71742,56 +29324,29 @@
    return 0;
  }
  _ACEOF
@@ -75018,7 +77176,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68841,56 +27741,29 @@
+@@ -71802,56 +29357,29 @@
    return 0;
  }
  _ACEOF
@@ -75082,7 +77240,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68901,56 +27774,29 @@
+@@ -71862,56 +29390,29 @@
    return 0;
  }
  _ACEOF
@@ -75146,7 +77304,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -68961,61 +27807,30 @@
+@@ -71922,61 +29423,30 @@
    return 0;
  }
  _ACEOF
@@ -75217,7 +77375,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69026,56 +27841,29 @@
+@@ -71987,56 +29457,29 @@
    return 0;
  }
  _ACEOF
@@ -75281,7 +77439,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69086,56 +27874,29 @@
+@@ -72047,56 +29490,29 @@
    return 0;
  }
  _ACEOF
@@ -75345,7 +77503,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69146,65 +27907,35 @@
+@@ -72107,65 +29523,35 @@
    return 0;
  }
  _ACEOF
@@ -75422,7 +77580,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include<krb5.h>
-@@ -69217,65 +27948,32 @@
+@@ -72178,65 +29564,32 @@
      return krb5_kt_resolve(context, "WRFILE:api", &keytab);
    }
  _ACEOF
@@ -75480,6 +77638,70 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  
+-  { $as_echo "$as_me:$LINENO: checking for krb5_realm type" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_realm type" >&5
+ $as_echo_n "checking for krb5_realm type... " >&6; }
+-if test "${samba_cv_HAVE_KRB5_REALM_TYPE+set}" = set; then
++if test "${samba_cv_HAVE_KRB5_REALM_TYPE+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.  */
+ #include <krb5.h>
+ int
+@@ -72247,56 +29600,29 @@
+   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
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_HAVE_KRB5_REALM_TYPE=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	samba_cv_HAVE_KRB5_REALM_TYPE=no
++  samba_cv_HAVE_KRB5_REALM_TYPE=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_HAVE_KRB5_REALM_TYPE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_KRB5_REALM_TYPE" >&5
+ $as_echo "$samba_cv_HAVE_KRB5_REALM_TYPE" >&6; }
+ 
+   if test x"$samba_cv_HAVE_KRB5_REALM_TYPE" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB5_REALM_TYPE 1
+-_ACEOF
++$as_echo "#define HAVE_KRB5_REALM_TYPE 1" >>confdefs.h
+ 
+   fi
+ 
 -  { $as_echo "$as_me:$LINENO: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
  $as_echo_n "checking for krb5_princ_realm returns krb5_realm or krb5_data... " >&6; }
@@ -75497,7 +77719,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69289,56 +27987,29 @@
+@@ -72310,56 +29636,29 @@
    return 0;
  }
  _ACEOF
@@ -75561,7 +77783,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69349,56 +28020,29 @@
+@@ -72370,56 +29669,29 @@
    return 0;
  }
  _ACEOF
@@ -75625,7 +77847,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69410,49 +28054,26 @@
+@@ -72431,49 +29703,26 @@
    return 0;
  }
  _ACEOF
@@ -75681,7 +77903,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -69466,20 +28087,13 @@
+@@ -72487,20 +29736,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -75707,7 +77929,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <stdlib.h>
-@@ -69493,42 +28107,15 @@
+@@ -72514,42 +29756,15 @@
  		}
  
  _ACEOF
@@ -75754,7 +77976,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -69540,20 +28127,18 @@
+@@ -72561,20 +29776,18 @@
  	export LDFLAGS;
  
  fi
@@ -75779,7 +78001,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -69567,20 +28152,13 @@
+@@ -72588,20 +29801,13 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -75805,7 +78027,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <krb5.h>
-@@ -69591,42 +28169,15 @@
+@@ -72612,42 +29818,15 @@
  		}
  
  _ACEOF
@@ -75852,7 +78074,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -69638,29 +28189,23 @@
+@@ -72659,29 +29838,23 @@
  	export LDFLAGS;
  
  fi
@@ -75887,7 +78109,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69671,61 +28216,30 @@
+@@ -72692,61 +29865,30 @@
    return 0;
  }
  _ACEOF
@@ -75958,7 +78180,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <krb5.h>
  int
-@@ -69736,47 +28250,20 @@
+@@ -72757,47 +29899,20 @@
    return 0;
  }
  _ACEOF
@@ -76012,7 +78234,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  
-@@ -69788,7 +28275,7 @@
+@@ -72809,7 +29924,7 @@
    #
    #
    if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -76021,7 +78243,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
      use_ads=no
    fi
-@@ -69796,7 +28283,7 @@
+@@ -72817,7 +29932,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
@@ -76030,7 +78252,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -69804,7 +28291,7 @@
+@@ -72825,7 +29940,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
@@ -76039,7 +78261,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
      use_ads=no
    fi
-@@ -69812,7 +28299,7 @@
+@@ -72833,7 +29948,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
@@ -76048,7 +78270,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -69820,7 +28307,7 @@
+@@ -72841,7 +29956,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
@@ -76057,7 +78279,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
      use_ads=no
    fi
-@@ -69832,14 +28319,14 @@
+@@ -72853,14 +29968,14 @@
  
        if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
        then
@@ -76074,7 +78296,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
  	use_ads=no
        fi
-@@ -69848,29 +28335,21 @@
+@@ -72869,29 +29984,21 @@
  
    if test x"$use_ads" = x"yes"; then
  
@@ -76109,7 +78331,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
      fi
  
-@@ -69896,9 +28375,9 @@
+@@ -72917,9 +30024,9 @@
      KRB5_LIBS=""
      with_ads_support=no
    fi
@@ -76121,7 +78343,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$use_ads" >&6; }
  
  LIBS="$ac_save_LIBS"
-@@ -69910,23 +28389,17 @@
+@@ -72931,23 +30038,17 @@
  
  
  
@@ -76148,7 +78370,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -69944,54 +28417,28 @@
+@@ -72965,54 +30066,28 @@
    return 0;
  }
  _ACEOF
@@ -76210,7 +78432,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSCD 1
  _ACEOF
-@@ -70006,7 +28453,6 @@
+@@ -73027,7 +30102,6 @@
  
  
  fi
@@ -76218,7 +78440,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
  
  
-@@ -70014,12 +28460,12 @@
+@@ -73035,12 +30109,12 @@
  # Compile with DNS Updates support?
  
  with_dnsupdate_support=no
@@ -76233,7 +78455,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_dnsupdate;  case "$withval" in
      yes|no)
  	with_dnsupdate_support=$withval
-@@ -70028,7 +28474,7 @@
+@@ -73049,7 +30123,7 @@
  fi
  
  
@@ -76242,7 +78464,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$with_dnsupdate_support" >&6; }
  
  if test x"$with_dnsupdate_support" != x"no"; then
-@@ -70042,151 +28488,12 @@
+@@ -73063,151 +30137,12 @@
    ##################################################################
    # then test for uuid.h (necessary to generate unique DNS keynames
    # (uuid.h is required for this test)
@@ -76399,7 +78621,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -70196,11 +28503,9 @@
+@@ -73217,11 +30152,9 @@
  
    if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
  	if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76413,7 +78635,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
  	fi
  	with_dnsupdate_support=no
-@@ -70216,102 +28521,12 @@
+@@ -73237,102 +30170,12 @@
  
    UUID_LIBS=""
  
@@ -76521,7 +78743,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
          # uuid_generate was found in libc or existing $LIBS
-@@ -70328,9 +28543,7 @@
+@@ -73349,9 +30192,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -76532,7 +78754,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -70343,11 +28556,9 @@
+@@ -73364,11 +30205,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76546,7 +78768,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -70356,18 +28567,14 @@
+@@ -73377,18 +30216,14 @@
  	    ;;
            *)
  	    # uuid_generate was not found, try adding libuuid
@@ -76568,7 +78790,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -70385,43 +28592,18 @@
+@@ -73406,43 +30241,18 @@
    return 0;
  }
  _ACEOF
@@ -76618,7 +78840,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		LIBS="-luuid $LIBS"
  
-@@ -70437,9 +28619,7 @@
+@@ -73458,9 +30268,7 @@
  
  	    with_dnsupdate_support=yes
  
@@ -76629,7 +78851,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  
-@@ -70449,11 +28629,9 @@
+@@ -73470,11 +30278,9 @@
  
  
  	    if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76643,7 +78865,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
  	    fi
  	    with_dnsupdate_support=no
-@@ -70473,28 +28651,26 @@
+@@ -73494,28 +30300,26 @@
  
  #################################################
  # check for automount support
@@ -76678,13 +78900,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -70505,34 +28681,30 @@
+@@ -73526,34 +30330,30 @@
  CIFSMOUNT_PROGS=""
  INSTALL_CIFSMOUNT=""
  UNINSTALL_CIFSMOUNT=""
--{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs and umount.cifs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build mount.cifs and umount.cifs" >&5
- $as_echo_n "checking whether to build mount.cifs and umount.cifs... " >&6; }
+-{ $as_echo "$as_me:$LINENO: checking whether to build mount.cifs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build mount.cifs" >&5
+ $as_echo_n "checking whether to build mount.cifs... " >&6; }
  
  # Check whether --with-cifsmount was given.
 -if test "${with_cifsmount+set}" = set; then
@@ -76707,7 +78929,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 +$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
  
- 		CIFSMOUNT_PROGS="bin/mount.cifs bin/umount.cifs"
+ 		CIFSMOUNT_PROGS="bin/mount.cifs"
  		INSTALL_CIFSMOUNT="installcifsmount"
  		UNINSTALL_CIFSMOUNT="uninstallcifsmount"
  		;;
@@ -76719,7 +78941,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		;;
  	esac
      ;;
-@@ -70540,19 +28712,17 @@
+@@ -73561,19 +30361,17 @@
  else
     case "$host_os" in
    *linux*)
@@ -76732,7 +78954,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ACEOF
 +$as_echo "#define WITH_CIFSMOUNT 1" >>confdefs.h
  
- 	CIFSMOUNT_PROGS="bin/mount.cifs bin/umount.cifs"
+ 	CIFSMOUNT_PROGS="bin/mount.cifs"
  	INSTALL_CIFSMOUNT="installcifsmount"
  	UNINSTALL_CIFSMOUNT="uninstallcifsmount"
  	;;
@@ -76742,7 +78964,55 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  	;;
    esac
-@@ -70562,151 +28732,12 @@
+@@ -73584,40 +30382,36 @@
+ CIFSUMOUNT_PROGS=""
+ INSTALL_CIFSUMOUNT=""
+ UNINSTALL_CIFSUMOUNT=""
+-{ $as_echo "$as_me:$LINENO: checking whether to build umount.cifs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build umount.cifs" >&5
+ $as_echo_n "checking whether to build umount.cifs... " >&6; }
+ 
+ # Check whether --with-cifsumount was given.
+-if test "${with_cifsumount+set}" = set; then
++if test "${with_cifsumount+set}" = set; then :
+   withval=$with_cifsumount;  case "$withval" in
+   yes)
+ 	case "$host_os" in
+ 	*linux*)
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_CIFSUMOUNT 1
+-_ACEOF
++$as_echo "#define WITH_CIFSUMOUNT 1" >>confdefs.h
+ 
+ 		CIFSUMOUNT_PROGS="bin/umount.cifs"
+ 		INSTALL_CIFSUMOUNT="installcifsumount"
+ 		UNINSTALL_CIFSUMOUNT="uninstallcifsumount"
+ 		;;
+ 	*)
+-		{ { $as_echo "$as_me:$LINENO: error: not on a linux system!" >&5
+-$as_echo "$as_me: error: not on a linux system!" >&2;}
+-   { (exit 1); exit 1; }; }
++		as_fn_error "not on a linux system!" "$LINENO" 5
+ 		;;
+ 	esac
+ 	;;
+   *)
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+   esac
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ fi
+@@ -73625,151 +30419,12 @@
  
  #################################################
  # check for cifs.upcall support
@@ -76898,7 +79168,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
   HAVE_KEYUTILS_H=1
  else
-@@ -70718,34 +28749,28 @@
+@@ -73781,34 +30436,28 @@
  CIFSUPCALL_PROGS=""
  INSTALL_CIFSUPCALL=""
  UNINSTALL_CIFSUPCALL=""
@@ -76940,7 +79210,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  			CIFSUPCALL_PROGS="bin/cifs.upcall"
  			INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70753,9 +28778,7 @@
+@@ -73816,9 +30465,7 @@
  		fi
  		;;
  	*)
@@ -76951,7 +79221,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		;;
  	esac
      ;;
-@@ -70764,18 +28787,16 @@
+@@ -73827,18 +30474,16 @@
     case "$host_os" in
    *linux*)
  	if test x"$use_ads" != x"yes"; then
@@ -76974,7 +79244,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		CIFSUPCALL_PROGS="bin/cifs.upcall"
  		INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70783,7 +28804,7 @@
+@@ -73846,191 +30491,53 @@
  	fi
  	;;
    *)
@@ -76982,34 +79252,44 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  	;;
-   esac
-@@ -70800,11 +28821,11 @@
- 
- with_pam_for_crypt=no
- try_pam=no
+-  esac
+-
+-fi
+-
+-
+-
+-#################################################
+-# Check for a PAM clear-text auth, accounts, password
+-# and session support. Most PAM implementations keep their
+-# headers in /usr/include/security. Darwin keeps its in
+-# /usr/include/pam.
+-
+-with_pam_for_crypt=no
+-try_pam=auto
 -{ $as_echo "$as_me:$LINENO: checking whether to try PAM support" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
- $as_echo_n "checking whether to try PAM support... " >&6; }
- 
- # Check whether --with-pam was given.
+-$as_echo_n "checking whether to try PAM support... " >&6; }
+-
+-# Check whether --with-pam was given.
 -if test "${with_pam+set}" = set; then
-+if test "${with_pam+set}" = set; then :
-   withval=$with_pam;  case "$withval" in
-   yes|no)
-     try_pam=$withval
-@@ -70813,7 +28834,7 @@
- 
- fi
- 
+-  withval=$with_pam;  case "$withval" in
+-  yes|no|auto)
+-    try_pam=$withval
+-    ;;
+-  esac
+-
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: result: $try_pam" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_pam" >&5
- $as_echo "$try_pam" >&6; }
- 
- use_pam=no
-@@ -70824,150 +28845,12 @@
- 
- 	# Most systems have PAM headers in /usr/include/security, but Darwin
- 	# has them in /usr/include/pam.
+-$as_echo "$try_pam" >&6; }
+-
+-use_pam=no
+-create_pam_modules=no
+-if test x"${try_pam}" != x"no";then
+-	use_pam=yes
+-	create_pam_modules=yes
+-
+-	# Most systems have PAM headers in /usr/include/security, but Darwin
+-	# has them in /usr/include/pam.
 -
 -
 -for ac_header in security/pam_appl.h pam/pam_appl.h
@@ -77100,14 +79380,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  esac
+ 
 -  ac_header_preproc=no
--fi
--
+ 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: )
@@ -77136,7 +79417,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -## ---------------------------------------- ##
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
++
++#################################################
++# Check for a PAM clear-text auth, accounts, password
++# and session support. Most PAM implementations keep their
++# headers in /usr/include/security. Darwin keeps its in
++# /usr/include/pam.
++
++with_pam_for_crypt=no
++try_pam=auto
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try PAM support" >&5
++$as_echo_n "checking whether to try PAM support... " >&6; }
++
++# Check whether --with-pam was given.
++if test "${with_pam+set}" = set; then :
++  withval=$with_pam;  case "$withval" in
++  yes|no|auto)
++    try_pam=$withval
+     ;;
 -esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
@@ -77149,11 +79447,24 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
--fi
++  esac
+ 
+ fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try_pam" >&5
++$as_echo "$try_pam" >&6; }
++
++use_pam=no
++create_pam_modules=no
++if test x"${try_pam}" != x"no";then
++	use_pam=yes
++	create_pam_modules=yes
++
++	# Most systems have PAM headers in /usr/include/security, but Darwin
++	# has them in /usr/include/pam.
 +	for ac_header in security/pam_appl.h pam/pam_appl.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -77163,7 +79474,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -70979,9 +28862,7 @@
+@@ -74042,9 +30549,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
@@ -77174,7 +79485,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		fi
  		use_pam=no
  		create_pam_modules=no
-@@ -70989,23 +28870,17 @@
+@@ -74052,23 +30557,17 @@
  
  
  
@@ -77201,7 +79512,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -71023,54 +28898,28 @@
+@@ -74086,54 +30585,28 @@
    return 0;
  }
  _ACEOF
@@ -77263,7 +79574,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -71085,34 +28934,18 @@
+@@ -74148,34 +30621,18 @@
  
  
  fi
@@ -77303,7 +79614,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		#if HAVE_SECURITY_PAM_APPL_H
  		#include <security/pam_appl.h>
  		#endif
-@@ -71120,44 +28953,9 @@
+@@ -74183,44 +30640,9 @@
  		#include <pam/pam_appl.h>
  		#endif
  
@@ -77351,7 +79662,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -71169,179 +28967,33 @@
+@@ -74232,179 +30654,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
@@ -77541,7 +79852,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -71350,150 +29002,12 @@
+@@ -74413,150 +30689,12 @@
  
  done
  
@@ -77698,7 +80009,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -71504,19 +29018,14 @@
+@@ -74567,19 +30705,14 @@
  
  
  
@@ -77721,7 +80032,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define pam_vsyslog to an innocuous variant, in case <limits.h> declares pam_vsyslog.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -71557,62 +29066,36 @@
+@@ -74620,72 +30753,42 @@
    return 0;
  }
  _ACEOF
@@ -77795,10 +80106,60 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$create_pam_modules" >&6; }
  fi # try_pam != no
  
-@@ -71621,26 +29104,22 @@
- PAM_MODULES=""
- INSTALL_PAM_MODULES=""
+ #################################################
+ # check for PAM_RADIO_TYPE
+-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.  */
+ 
+ #if (!defined(LINUX))
+@@ -74723,36 +30826,11 @@
+   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
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PAM_RADIO_TYPE 1
+-_ACEOF
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
++$as_echo "#define HAVE_PAM_RADIO_TYPE 1" >>confdefs.h
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ #################################################
+@@ -74762,19 +30840,17 @@
  UNINSTALL_PAM_MODULES=""
+ 
+ try_pam_smbpass=auto
 -{ $as_echo "$as_me:$LINENO: checking whether to use pam_smbpass" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use pam_smbpass" >&5
  $as_echo_n "checking whether to use pam_smbpass... " >&6; }
@@ -77807,42 +80168,46 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -if test "${with_pam_smbpass+set}" = set; then
 +if test "${with_pam_smbpass+set}" = set; then :
    withval=$with_pam_smbpass;  case "$withval" in
-   yes)
--    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
+   yes|no|auto)
+     try_pam_smbpass=$withval
+   ;;
+   *)
+-    { { $as_echo "$as_me:$LINENO: error: valid options are yes,no,auto" >&5
+-$as_echo "$as_me: error: valid options are yes,no,auto" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "valid options are yes,no,auto" "$LINENO" 5
+   ;;
+   esac
  
-        # Conditions under which pam_smbpass should not be built.
- 
-        if test x"$BLDSHARED" != x"true"; then
--          { { $as_echo "$as_me:$LINENO: error: No support for shared modules" >&5
+@@ -74788,16 +30864,12 @@
+ 	# Conditions under which pam_smbpass can't be built.
+ 	if test x"$BLDSHARED" != xtrue ; then
+ 		if test x"${try_pam_smbpass}" = xyes ; then
+-			{ { $as_echo "$as_me:$LINENO: error: No support for shared modules" >&5
 -$as_echo "$as_me: error: No support for shared modules" >&2;}
 -   { (exit 1); exit 1; }; }
-+          as_fn_error "No support for shared modules" "$LINENO" 5
-        elif test x"$create_pam_modules" != x"yes"; then
--	  { { $as_echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
++			as_fn_error "No support for shared modules" "$LINENO" 5
+ 		fi
+ 		use_pam_smbpass=no
+ 	elif test x"$create_pam_modules" != xyes ; then
+ 		if test x"${try_pam_smbpass}" = xyes ; then
+-			{ { $as_echo "$as_me:$LINENO: error: No support for PAM MODULES" >&5
 -$as_echo "$as_me: error: No support for PAM MODULES" >&2;}
 -   { (exit 1); exit 1; }; }
-+	  as_fn_error "No support for PAM MODULES" "$LINENO" 5
-        else
-           PAM_MODULES="pam_smbpass"
-           INSTALL_PAM_MODULES="installpammodules"
-@@ -71648,12 +29127,12 @@
-        fi
-     ;;
-   *)
--    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     ;;
-   esac
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 
++			as_fn_error "No support for PAM MODULES" "$LINENO" 5
+ 		fi
+ 		use_pam_smbpass=no
+ 	fi
+@@ -74808,7 +30880,7 @@
+ 		UNINSTALL_PAM_MODULES="uninstallpammodules"
+ 	fi
  fi
-@@ -71667,98 +29146,63 @@
+-{ $as_echo "$as_me:$LINENO: result: $use_pam_smbpass" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_pam_smbpass" >&5
+ $as_echo "$use_pam_smbpass" >&6; }
+ 
+ 
+@@ -74819,98 +30891,63 @@
  ## $with_pam_for_crypt variable as above   --jerry
  ##
  if test $with_pam_for_crypt = no; then
@@ -77957,7 +80322,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -71766,28 +29210,26 @@
+@@ -74918,28 +30955,26 @@
  
  #################################################
  # check for syslog logging
@@ -77992,7 +80357,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -71795,16 +29237,14 @@
+@@ -74947,16 +30982,14 @@
  
  #################################################
  # check for custom syslog facility
@@ -78012,7 +80377,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    else
       if test "$withval" != "yes" ; then
          syslog_facility="$withval"
-@@ -71829,14 +29269,14 @@
+@@ -74981,14 +31014,14 @@
  samba_cv_TRY_SYS_QUOTAS=auto
  samba_cv_SYSQUOTA_FOUND=no
  
@@ -78030,7 +80395,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
      samba_cv_WITH_QUOTAS=yes
      samba_cv_TRY_QUOTAS=yes
-@@ -71845,7 +29285,7 @@
+@@ -74997,7 +31030,7 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    auto)
@@ -78039,7 +80404,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "auto" >&6; }
      samba_cv_WITH_QUOTAS=auto
      samba_cv_TRY_QUOTAS=auto
-@@ -71854,74 +29294,74 @@
+@@ -75006,74 +31039,74 @@
      samba_cv_TRY_SYS_QUOTAS=auto
      ;;
    no)
@@ -78127,41 +80492,40 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
              samba_cv_TRY_SYS_QUOTAS=no
  	    ;;
-@@ -71937,483 +29377,68 @@
- 	*linux*)
- 	    samba_cv_SYSQUOTA_FOUND=yes
+@@ -75084,641 +31117,87 @@
+ # only check for quota stuff if --with-quotas
+ if test x"$samba_cv_RUN_QUOTA_TESTS" != x"no"; then
  
+-case "$host_os" in
+-	# on linux we didn't need to test we have builtin support
+-	*linux*)
+-	    samba_cv_SYSQUOTA_FOUND=yes
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_QUOTACTL_LINUX 1
 -_ACEOF
-+$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
- 
- 	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
+-
+-	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
 -	    { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
- $as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
+-$as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
 -	    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
- 
+-$as_echo "yes" >&6; }
+-
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LINUX_XFS_QUOTAS 1
 -_ACEOF
-+$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
- 
- 	    samba_cv_found_xfs_header=yes
+-
+-	    samba_cv_found_xfs_header=yes
 -	    { $as_echo "$as_me:$LINENO: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
- $as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
+-$as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
 -	    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	    ;;
- 	*solaris*)
- 	    # need to set this define when using static linking (BUG 1473)
- 	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
- 	    ;;
+-$as_echo "yes" >&6; }
+-	    ;;
+-	*solaris*)
+-	    # need to set this define when using static linking (BUG 1473)
+-	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
+-	    ;;
 -	*)
 -	    ;;
 -esac
@@ -78442,9 +80806,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
-+	*)
-+	    ;;
- esac
+-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
@@ -78456,7 +80818,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $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"'`
@@ -78464,21 +80826,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
-+# some broken header files need this
-+ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
-+if test "x$ac_cv_header_asm_types_h" = x""yes; then :
- 
+-
 -fi
- 
+-
 -done
-+$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
- 
-+	    cat >> confdefs.h <<\EOF
-+#include <asm/types.h>
-+EOF
- 
+-
+-
 -# For quotas on Linux XFS filesystems
- 
+-
 -for ac_header in linux/dqblk_xfs.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -78487,7 +80842,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
@@ -78527,13 +80882,209 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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
++case "$host_os" in
++	# on linux we didn't need to test we have builtin support
++	*linux*)
++	    samba_cv_SYSQUOTA_FOUND=yes
+ 
+-  ac_header_preproc=no
+-fi
++$as_echo "#define HAVE_QUOTACTL_LINUX 1" >>confdefs.h
+ 
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
++	    samba_cv_sysquotas_file="lib/sysquotas_linux.c"
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_linux.c builtin support" >&5
++$as_echo_n "checking whether to use the lib/sysquotas_linux.c builtin support... " >&6; }
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&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
+-    ;;
++
++$as_echo "#define HAVE_LINUX_XFS_QUOTAS 1" >>confdefs.h
++
++	    samba_cv_found_xfs_header=yes
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the lib/sysquotas_xfs.c builtin support" >&5
++$as_echo_n "checking whether to use the lib/sysquotas_xfs.c builtin support... " >&6; }
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++	    ;;
++	*solaris*)
++	    # need to set this define when using static linking (BUG 1473)
++	    CPPFLAGS="$CPPFLAGS -DSUNOS5"
++	    ;;
++	*)
++	    ;;
+ 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
++# some broken header files need this
++ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
++if test "x$ac_cv_header_asm_types_h" = x""yes; then :
+ 
+-fi
+ 
+-done
++$as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
+ 
++	    cat >> confdefs.h <<\EOF
++#include <asm/types.h>
++EOF
+ 
+-# For sys/quota.h and linux/quota.h
+ 
+-for ac_header in sys/quota.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 quotas on Veritas VxFS filesystems
++for ac_header in sys/fs/vx_quota.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/fs/vx_quota.h" "ac_cv_header_sys_fs_vx_quota_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_fs_vx_quota_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_FS_VX_QUOTA_H 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
@@ -78545,13 +81096,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+# For quotas on Veritas VxFS filesystems
-+for ac_header in sys/fs/vx_quota.h
++
++# For quotas on Linux XFS filesystems
++for ac_header in linux/dqblk_xfs.h
 +do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/fs/vx_quota.h" "ac_cv_header_sys_fs_vx_quota_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_fs_vx_quota_h" = x""yes; then :
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/dqblk_xfs.h" "ac_cv_header_linux_dqblk_xfs_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_dqblk_xfs_h" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_FS_VX_QUOTA_H 1
++#define HAVE_LINUX_DQBLK_XFS_H 1
  _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
@@ -78629,164 +81181,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+# For quotas on Linux XFS filesystems
-+for ac_header in linux/dqblk_xfs.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/dqblk_xfs.h" "ac_cv_header_linux_dqblk_xfs_h" "$ac_includes_default"
-+if test "x$ac_cv_header_linux_dqblk_xfs_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LINUX_DQBLK_XFS_H 1
- _ACEOF
- 
- fi
-@@ -72422,151 +29447,12 @@
- 
- 
- # For sys/quota.h and linux/quota.h
--
- for ac_header in sys/quota.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 sys/quota.h and linux/quota.h
++for ac_header in sys/quota.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "sys/quota.h" "ac_cv_header_sys_quota_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_quota_h" = x""yes; then :
@@ -78796,7 +81192,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -72576,17 +29462,13 @@
+@@ -75728,17 +31207,13 @@
  
  if test x"$samba_cv_found_xfs_header" != x"yes"; then
  # if we have xfs quota support <sys/quota.h> (IRIX) we should use it
@@ -78817,7 +81213,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -72606,35 +29488,14 @@
+@@ -75758,35 +31233,14 @@
    return 0;
  }
  _ACEOF
@@ -78856,7 +81252,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -72642,17 +29503,13 @@
+@@ -75794,17 +31248,13 @@
  fi
  
  # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -78877,7 +81273,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -72670,41 +29527,18 @@
+@@ -75822,41 +31272,18 @@
    return 0;
  }
  _ACEOF
@@ -78923,7 +81319,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -72712,9 +29546,9 @@
+@@ -75864,9 +31291,9 @@
  # look for a working quota system
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -78935,7 +81331,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72728,14 +29562,10 @@
+@@ -75880,14 +31307,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -78952,7 +81348,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4A 1
-@@ -72743,42 +29573,15 @@
+@@ -75895,42 +31318,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -78999,7 +81395,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72790,23 +29593,21 @@
+@@ -75942,23 +31338,21 @@
  	export LDFLAGS;
  
  fi
@@ -79027,7 +81423,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72820,14 +29621,10 @@
+@@ -75972,14 +31366,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -79044,7 +81440,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_4B 1
-@@ -72835,42 +29632,15 @@
+@@ -75987,42 +31377,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -79091,7 +81487,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72882,24 +29652,22 @@
+@@ -76034,24 +31397,22 @@
  	export LDFLAGS;
  
  fi
@@ -79120,7 +81516,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
  
-@@ -72913,14 +29681,10 @@
+@@ -76065,14 +31426,10 @@
  	old_LDFLAGS="$LDFLAGS";
  	LDFLAGS="$LDFLAGS";
  	export LDFLAGS;
@@ -79137,7 +81533,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #define HAVE_QUOTACTL_3 1
-@@ -72928,42 +29692,15 @@
+@@ -76080,42 +31437,15 @@
  #include "confdefs.h"
  #include "${srcdir-.}/../tests/sysquotas.c"
  _ACEOF
@@ -79184,7 +81580,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CFLAGS="$old_CFLAGS";
  	old_CFLAGS="";
  	export CFLAGS;
-@@ -72975,15 +29712,13 @@
+@@ -76127,15 +31457,13 @@
  	export LDFLAGS;
  
  fi
@@ -79202,7 +81598,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
      samba_cv_sysquotas_file="lib/sysquotas_3.c"
  fi
-@@ -72991,151 +29726,12 @@
+@@ -76143,151 +31471,12 @@
  
  #################################################
  # check for mntent.h and struct mntent
@@ -79358,7 +81754,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -73144,102 +29740,12 @@
+@@ -76296,102 +31485,12 @@
  
  #################################################
  # check for setmntent,getmntent,endmntent
@@ -79466,7 +81862,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -73250,151 +29756,12 @@
+@@ -76402,151 +31501,12 @@
  
  #################################################
  # check for devnm.h and struct mntent
@@ -79622,7 +82018,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -73403,102 +29770,12 @@
+@@ -76555,102 +31515,12 @@
  
  #################################################
  # check for devnm
@@ -79729,7 +82125,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -73521,19 +29798,15 @@
+@@ -76673,19 +31543,15 @@
  fi
  
  if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -79752,7 +82148,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -73551,76 +29824,47 @@
+@@ -76703,76 +31569,47 @@
    return 0;
  }
  _ACEOF
@@ -79840,7 +82236,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -73638,62 +29882,35 @@
+@@ -76790,62 +31627,35 @@
    return 0;
  }
  _ACEOF
@@ -79885,9 +82281,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_XFS_QUOTAS 1
 -_ACEOF
--
 +$as_echo "#define HAVE_XFS_QUOTAS 1" >>confdefs.h
-+
+ 
      fi
  fi
  fi
@@ -79911,7 +82306,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include "confdefs.h"
-@@ -73709,56 +29926,33 @@
+@@ -76861,56 +31671,33 @@
    return 0;
  }
  _ACEOF
@@ -79976,7 +82371,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
      fi
  fi
-@@ -73770,12 +29964,12 @@
+@@ -76922,12 +31709,12 @@
  #################################################
  # check for experimental utmp accounting
  
@@ -79991,7 +82386,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_utmp;  case "$withval" in
    no)
  		WITH_UTMP=no
-@@ -73798,15 +29992,13 @@
+@@ -76950,41 +31737,35 @@
  # Display test results
  
  if test x"$WITH_UTMP" = x"yes"; then
@@ -80010,327 +82405,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no$utmp_no_reason" >&6; }
  fi
  
-@@ -73832,10 +30024,10 @@
- USESHARED=false
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to use shared libraries internally" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use shared libraries internally" >&5
- $as_echo_n "checking whether to use shared libraries internally... " >&6; }
- # Check whether --enable-shared-libs was given.
--if test "${enable_shared_libs+set}" = set; then
-+if test "${enable_shared_libs+set}" = set; then :
-   enableval=$enable_shared_libs; enable_shared_libs=$enableval
- else
-   enable_shared_libs=yes
-@@ -73846,11 +30038,11 @@
- 	USESHARED=$BLDSHARED
- fi
- 
--{ $as_echo "$as_me:$LINENO: result: $USESHARED" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USESHARED" >&5
- $as_echo "$USESHARED" >&6; }
- 
- if test x"$enable_shared_libs" = x"yes" -a x"$BLDSHARED" != x"true" ; then
--	{ $as_echo "$as_me:$LINENO: WARNING: --enable-shared-libs: no support for shared libraries" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --enable-shared-libs: no support for shared libraries" >&5
- $as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
- fi
- 
-@@ -73878,14 +30070,13 @@
- 
- 
- # Check whether --with-static-libs was given.
--if test "${with_static_libs+set}" = set; then
--  withval=$with_static_libs; if test $withval; then
-+if test "${with_static_libs+set}" = set; then :
-+  withval=$with_static_libs; if test $withval; then :
-   for lib in `echo $withval | sed -e 's/,/ /g'` ; do
- 			lib=`echo $lib | tr '[a-z]' '[A-Z]'`
- 			eval LINK_$lib=STATIC
- 		done
- fi
--
- fi
- 
- 
-@@ -73934,16 +30125,16 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtalloc shared library" >&5
- $as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
- 
- 
- # Check whether --with-libtalloc was given.
--if test "${with_libtalloc+set}" = set; then
-+if test "${with_libtalloc+set}" = set; then :
-   withval=$with_libtalloc;
- case "$withval" in
- 	no)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		build_lib=no
- 		;;
-@@ -73969,7 +30160,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
- 		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -73982,12 +30173,12 @@
- 		enable_static=yes
- 		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
- 		LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74038,16 +30229,16 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libtdb shared library" >&5
- $as_echo_n "checking whether to build the libtdb shared library... " >&6; }
- 
- 
- # Check whether --with-libtdb was given.
--if test "${with_libtdb+set}" = set; then
-+if test "${with_libtdb+set}" = set; then :
-   withval=$with_libtdb;
- case "$withval" in
- 	no)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		build_lib=no
- 		;;
-@@ -74073,7 +30264,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
- 		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -74086,12 +30277,12 @@
- 		enable_static=yes
- 		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
- 		LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74129,16 +30320,16 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libnetapi shared library" >&5
- $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
- 
- 
- # Check whether --with-libnetapi was given.
--if test "${with_libnetapi+set}" = set; then
-+if test "${with_libnetapi+set}" = set; then :
-   withval=$with_libnetapi;
- case "$withval" in
- 	no)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		build_lib=no
- 		;;
-@@ -74164,7 +30355,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
- 		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -74177,12 +30368,12 @@
- 		enable_static=yes
- 		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
- 		LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74220,16 +30411,16 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbclient shared library" >&5
- $as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
- 
- 
- # Check whether --with-libsmbclient was given.
--if test "${with_libsmbclient+set}" = set; then
-+if test "${with_libsmbclient+set}" = set; then :
-   withval=$with_libsmbclient;
- case "$withval" in
- 	no)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		build_lib=no
- 		;;
-@@ -74255,7 +30446,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
- 		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -74268,12 +30459,12 @@
- 		enable_static=yes
- 		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
- 		LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74311,16 +30502,16 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libsmbsharemodes shared library" >&5
- $as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
- 
- 
- # Check whether --with-libsmbsharemodes was given.
--if test "${with_libsmbsharemodes+set}" = set; then
-+if test "${with_libsmbsharemodes+set}" = set; then :
-   withval=$with_libsmbsharemodes;
- case "$withval" in
- 	no)
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		build_lib=no
- 		;;
-@@ -74346,7 +30537,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
- 		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -74359,12 +30550,12 @@
- 		enable_static=yes
- 		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
- 		LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74402,19 +30593,19 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libaddns shared library" >&5
- $as_echo_n "checking whether to build the libaddns shared library... " >&6; }
- 
- 
- # Check whether --with-libaddns was given.
--if test "${with_libaddns+set}" = set; then
-+if test "${with_libaddns+set}" = set; then :
-   withval=$with_libaddns;
- case "$withval" in
- 	yes)
- 		build_lib=yes
- 		;;
- 	*)
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		build_lib=no
- 		;;
-@@ -74423,7 +30614,7 @@
- else
- 
- # if unspecified, default is not to build
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- build_lib=no
- 
-@@ -74439,7 +30630,7 @@
- 	if eval $BLDSHARED = true; then
- 		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
- 		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
- 			enable_static=yes
-@@ -74452,12 +30643,12 @@
- 		enable_static=yes
- 		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
- 		LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
--		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
- else
- 	enable_static=yes
--	{ $as_echo "$as_me:$LINENO: result: shared library not selected" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library not selected" >&5
- $as_echo "shared library not selected" >&6; }
- fi
- if test $enable_static = yes; then
-@@ -74473,26 +30664,22 @@
  
  #################################################
  # these tests are taken from the GNU fileutils package
@@ -80362,7 +82436,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -74506,51 +30693,22 @@
+@@ -76998,51 +31779,22 @@
      exit (statvfs64 (".", &fsd));
    }
  _ACEOF
@@ -80390,13 +82464,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  (exit $ac_status); }; }; then
 +if ac_fn_c_try_run "$LINENO"; then :
    fu_cv_sys_stat_statvfs64=yes
- else
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -fu_cv_sys_stat_statvfs64=no
++else
 +  fu_cv_sys_stat_statvfs64=no
  fi
 -rm -rf conftest.dSYM
@@ -80420,7 +82495,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  fi
-@@ -74563,16 +30721,12 @@
+@@ -77055,16 +31807,12 @@
  # is what it gets when this test fails.
  if test $space = no; then
    # SVR4
@@ -80440,7 +82515,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -74584,47 +30738,20 @@
+@@ -77076,47 +31824,20 @@
    return 0;
  }
  _ACEOF
@@ -80494,7 +82569,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  fi
-@@ -74632,17 +30759,13 @@
+@@ -77124,17 +31845,13 @@
  # smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
  # This is not the case on ancient Linux systems.
  
@@ -80515,7 +82590,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -74654,57 +30777,30 @@
+@@ -77146,57 +31863,30 @@
    return 0;
  }
  _ACEOF
@@ -80580,7 +82655,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -74716,56 +30812,29 @@
+@@ -77208,56 +31898,29 @@
    return 0;
  }
  _ACEOF
@@ -80644,7 +82719,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -74777,55 +30846,28 @@
+@@ -77269,55 +31932,28 @@
    return 0;
  }
  _ACEOF
@@ -80707,7 +82782,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statvfs.h>
-@@ -74837,59 +30879,32 @@
+@@ -77329,59 +31965,32 @@
    return 0;
  }
  _ACEOF
@@ -80775,7 +82850,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/param.h>
-@@ -74902,71 +30917,38 @@
+@@ -77394,71 +32003,38 @@
      exit (statfs (".", &fsd, sizeof (struct statfs)));
    }
  _ACEOF
@@ -80857,7 +82932,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #ifdef HAVE_SYS_PARAM_H
-@@ -74985,71 +30967,38 @@
+@@ -77477,71 +32053,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -80939,7 +83014,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/statfs.h>
-@@ -75059,71 +31008,38 @@
+@@ -77551,71 +32094,38 @@
    exit (statfs (".", &fsd, sizeof fsd, 0));
    }
  _ACEOF
@@ -81021,7 +83096,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -75139,71 +31055,38 @@
+@@ -77631,71 +32141,38 @@
    exit (statfs (".", &fsd));
    }
  _ACEOF
@@ -81103,7 +83178,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #ifdef HAVE_SYS_PARAM_H
-@@ -75223,52 +31106,23 @@
+@@ -77715,52 +32192,23 @@
    exit (statfs (".", &fsd) != 1);
    }
  _ACEOF
@@ -81162,7 +83237,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    fi
  fi
-@@ -75281,13 +31135,9 @@
+@@ -77773,13 +32221,9 @@
  # If we don't have all of these then disable large
  # file support.
  #
@@ -81178,7 +83253,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -75304,41 +31154,18 @@
+@@ -77796,41 +32240,18 @@
    return 0;
  }
  _ACEOF
@@ -81224,7 +83299,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
  
  #################################################
-@@ -75348,10 +31175,10 @@
+@@ -77840,10 +32261,10 @@
  
  
  # Check whether --with-ctdb was given.
@@ -81237,8 +83312,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
      ;;
    *)
-@@ -75365,471 +31192,40 @@
- CPPFLAGS="$CPPFLAGS $CTDB_CPPFLAGS"
+@@ -77857,71 +32278,23 @@
+ CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS} $CTDB_CPPFLAGS"
  ctdb_broken="missing or broken headers"
  
 -
@@ -81317,46 +83392,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +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
--
--
--
-- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
--$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
--if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -77932,17 +32305,13 @@
+ 
+ 
+ 
+- { $as_echo "$as_me:$LINENO: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
+ $as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
+-if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then
++if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_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.  */
--
--#include "confdefs.h"
--#define NO_CONFIG_H
--#include "replace.h"
--#include "system/wait.h"
--#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
--
--int
--main ()
--{
--int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
--  ;
--  return 0;
--}
--_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include "confdefs.h"
+@@ -77963,41 +32332,18 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -81375,33 +83437,34 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
--$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&6; }
-- if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
+-	ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=no
++  ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl=no
+ fi
 -
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&5
+ $as_echo "$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" >&6; }
+  if test x"$ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl" = x"yes"; then
+ 
 -cat >>confdefs.h <<\_ACEOF
--#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1
+-#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1
 -_ACEOF
--
-- fi
--
--if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
--	ctdb_broken=no
--else
--	ctdb_broken="missing transaction support"
--fi
--
--# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
++$as_echo "#define HAVE_CTDB_CONTROL_TRANS3_COMMIT_DECL 1" >>confdefs.h
+ 
+  fi
+ 
+@@ -78008,255 +32354,43 @@
+ fi
+ 
+ # in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_tcp_client" >&5
 -$as_echo_n "checking for struct ctdb_tcp_client... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_tcp_client+set}" = set; then
@@ -81461,15 +83524,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -
 -#include "confdefs.h"
--#define NO_CONFIG_H
++ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
++#include \"confdefs.h\"
+ #define NO_CONFIG_H
 -#include "replace.h"
 -#include "system/wait.h"
 -#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
--
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
+ #include <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+ 
 -
 -int
 -main ()
@@ -81519,16 +83587,19 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_tcp_client" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_tcp_client" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then
--
--
++"
++if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define ctdb_control_tcp ctdb_tcp_client
 -_ACEOF
--
--
--fi
--
--
++$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
+ 
+ 
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp" >&5
 -$as_echo_n "checking for struct ctdb_control_tcp... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_control_tcp+set}" = set; then
@@ -81588,15 +83659,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -
 -#include "confdefs.h"
--#define NO_CONFIG_H
++ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
++#include \"confdefs.h\"
+ #define NO_CONFIG_H
 -#include "replace.h"
 -#include "system/wait.h"
 -#include "system/network.h"
--#include <talloc.h>
--#include <tdb.h>
--#include <ctdb.h>
--#include <ctdb_private.h>
--
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
+ #include <talloc.h>
+ #include <tdb.h>
+ #include <ctdb.h>
+ #include <ctdb_private.h>
+ 
 -
 -int
 -main ()
@@ -81646,20 +83722,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_control_tcp" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then
--
--
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
+ 
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_CTDB_CONTROL_TCP 1
 -_ACEOF
--
--
--else
--
--	ctdb_broken="missing struct ctdb_control_tcp"
--
--fi
--
--
++$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
+ 
+ 
+ else
+@@ -78266,139 +32400,33 @@
+ fi
+ 
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct ctdb_control_tcp_addr" >&5
 -$as_echo_n "checking for struct ctdb_control_tcp_addr... " >&6; }
 -if test "${ac_cv_type_struct_ctdb_control_tcp_addr+set}" = set; then
@@ -81713,42 +83790,36 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       } && test -s conftest.$ac_objext; then
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration" >&5
-+$as_echo_n "checking for CTDB_CONTROL_TRANS2_COMMIT_RETRY declaration... " >&6; }
-+if test "${ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include "confdefs.h"
-@@ -75842,71 +31238,109 @@
+-/* end confdefs.h.  */
+-
+-#include "confdefs.h"
++ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
++#include \"confdefs.h\"
+ #define NO_CONFIG_H
+-#include "replace.h"
+-#include "system/wait.h"
+-#include "system/network.h"
++#include \"replace.h\"
++#include \"system/wait.h\"
++#include \"system/network.h\"
+ #include <talloc.h>
+ #include <tdb.h>
  #include <ctdb.h>
  #include <ctdb_private.h>
  
 -
- int
- main ()
- {
+-int
+-main ()
+-{
 -if (sizeof ((struct ctdb_control_tcp_addr)))
 -	  return 0;
-+int i = (int)CTDB_CONTROL_TRANS2_COMMIT_RETRY
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -81768,103 +83839,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_struct_ctdb_control_tcp_addr=yes
-+  ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl=no
- fi
+-fi
 -
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&5
-+$as_echo "$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" >&6; }
-+ if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
-+
-+$as_echo "#define HAVE_CTDB_CONTROL_TRANS2_COMMIT_RETRY_DECL 1" >>confdefs.h
-+
-+ fi
-+
-+if test x"$ac_cv_have_CTDB_CONTROL_TRANS2_COMMIT_RETRY_decl" = x"yes"; then
-+	ctdb_broken=no
- else
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+	ctdb_broken="missing transaction support"
-+fi
-+
-+# in ctdb 1.0.57 ctdb_control_tcp was temparary renamed to ctdb_tcp_client
-+ac_fn_c_check_type "$LINENO" "struct ctdb_tcp_client" "ac_cv_type_struct_ctdb_tcp_client" "
-+#include \"confdefs.h\"
-+#define NO_CONFIG_H
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+#include <ctdb_private.h>
-+
-+"
-+if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
-+
-+
-+$as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
- 
- 
- fi
- 
+-
+-
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp" "ac_cv_type_struct_ctdb_control_tcp" "
-+#include \"confdefs.h\"
-+#define NO_CONFIG_H
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+#include <ctdb_private.h>
-+
-+"
-+if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
-+
-+
-+$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
-+
-+
-+else
-+
-+	ctdb_broken="missing struct ctdb_control_tcp"
-+
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_ctdb_control_tcp_addr" >&5
 -$as_echo "$ac_cv_type_struct_ctdb_control_tcp_addr" >&6; }
 -if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then
++"
++if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
  
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1
 -_ACEOF
-+ac_fn_c_check_type "$LINENO" "struct ctdb_control_tcp_addr" "ac_cv_type_struct_ctdb_control_tcp_addr" "
-+#include \"confdefs.h\"
-+#define NO_CONFIG_H
-+#include \"replace.h\"
-+#include \"system/wait.h\"
-+#include \"system/network.h\"
-+#include <talloc.h>
-+#include <tdb.h>
-+#include <ctdb.h>
-+#include <ctdb_private.h>
-+
-+"
-+if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
-+
-+
 +$as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1" >>confdefs.h
  
  
@@ -81882,7 +83883,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_cluster_support;
  fi
  
-@@ -75917,44 +31351,38 @@
+@@ -78409,44 +32437,38 @@
  
  if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
  	if test "x$with_cluster_support" = "xyes"; then
@@ -81934,7 +83935,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_acl_support;  case "$withval" in
  	yes|no)
  		with_acl_support="$withval"
-@@ -75967,105 +31395,85 @@
+@@ -78459,105 +32481,85 @@
  	with_acl_support="auto"
  fi
  
@@ -82061,7 +84062,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -76083,60 +31491,31 @@
+@@ -78575,60 +32577,31 @@
    return 0;
  }
  _ACEOF
@@ -82131,7 +84132,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -76154,61 +31533,32 @@
+@@ -78646,61 +32619,32 @@
    return 0;
  }
  _ACEOF
@@ -82202,7 +84203,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  				#include <sys/types.h>
-@@ -76227,64 +31577,33 @@
+@@ -78719,64 +32663,33 @@
    return 0;
  }
  _ACEOF
@@ -82277,7 +84278,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  					#include <sys/types.h>
-@@ -76302,58 +31621,29 @@
+@@ -78794,58 +32707,29 @@
    return 0;
  }
  _ACEOF
@@ -82344,7 +84345,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		fi
  		;;
-@@ -76365,31 +31655,27 @@
+@@ -78857,31 +32741,27 @@
  #################################################
  # check for AIO support
  
@@ -82382,7 +84383,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -76407,58 +31693,29 @@
+@@ -78899,58 +32779,29 @@
    return 0;
  }
  _ACEOF
@@ -82450,7 +84451,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -76476,59 +31733,30 @@
+@@ -78968,59 +32819,30 @@
    return 0;
  }
  _ACEOF
@@ -82519,7 +84520,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -76540,55 +31768,26 @@
+@@ -79032,55 +32854,26 @@
    return 0;
  }
  _ACEOF
@@ -82583,7 +84584,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <aio.h>
-@@ -76600,716 +31799,317 @@
+@@ -79092,716 +32885,317 @@
    return 0;
  }
  _ACEOF
@@ -83438,7 +85439,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -77326,30 +32126,26 @@
+@@ -79818,30 +33212,26 @@
  # check for sendfile support
  
  with_sendfile_support=yes
@@ -83475,7 +85476,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -77365,53 +32161,24 @@
+@@ -79857,53 +33247,24 @@
    return 0;
  }
  _ACEOF
@@ -83537,7 +85538,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/sendfile.h>
  int
-@@ -77427,54 +32194,25 @@
+@@ -79919,54 +33280,25 @@
    return 0;
  }
  _ACEOF
@@ -83600,7 +85601,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -77494,103 +32232,58 @@
+@@ -79986,103 +33318,58 @@
    return 0;
  }
  _ACEOF
@@ -83721,19 +85722,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/types.h>
-@@ -77608,85 +32301,50 @@
- 	hdr.headers = &hdtrl;
- 	hdr.hdr_cnt = 1;
- 	hdr.trailers = NULL;
--	hdr.trl_cnt = 0;
--	hdtrl.iov_base = NULL;
--	hdtrl.iov_len = 0;
--	ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
--
--  ;
--  return 0;
--}
--_ACEOF
+@@ -80109,76 +33396,41 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -83755,15 +85747,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+	hdr.trl_cnt = 0;
-+	hdtrl.iov_base = NULL;
-+	hdtrl.iov_len = 0;
-+	ret = sendfile(fromfd, tofd, offset, total, &hdr, &nwritten, 0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    samba_cv_HAVE_SENDFILE=yes
  else
@@ -83828,7 +85811,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -77710,73 +32368,38 @@
+@@ -80202,73 +33454,38 @@
    return 0;
  }
  _ACEOF
@@ -83914,7 +85897,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -77800,77 +32423,41 @@
+@@ -80292,77 +33509,41 @@
    return 0;
  }
  _ACEOF
@@ -84004,7 +85987,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -77888,43 +32475,18 @@
+@@ -80380,43 +33561,18 @@
    return 0;
  }
  _ACEOF
@@ -84054,7 +86037,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSENDFILE 1
  _ACEOF
-@@ -77933,17 +32495,13 @@
+@@ -80425,17 +33581,13 @@
  
  fi
  
@@ -84075,7 +86058,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -77974,74 +32532,39 @@
+@@ -80466,74 +33618,39 @@
    return 0;
  }
  _ACEOF
@@ -84162,7 +86145,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/sendfile.h>
-@@ -78072,75 +32595,40 @@
+@@ -80564,75 +33681,40 @@
    return 0;
  }
  _ACEOF
@@ -84250,7 +86233,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  \
  #include <sys/socket.h>
-@@ -78168,59 +32656,28 @@
+@@ -80660,59 +33742,28 @@
    return 0;
  }
  _ACEOF
@@ -84319,7 +86302,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; };
  	fi
  	;;
-@@ -78229,12 +32686,12 @@
+@@ -80721,12 +33772,12 @@
          esac
          ;;
    *)
@@ -84334,7 +86317,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
  
  fi
-@@ -78243,17 +32700,13 @@
+@@ -80735,17 +33786,13 @@
  ############################################
  # See if we have the Linux readahead syscall.
  
@@ -84355,7 +86338,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -78268,62 +32721,31 @@
+@@ -80760,62 +33807,31 @@
    return 0;
  }
  _ACEOF
@@ -84427,7 +86410,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -78334,41 +32756,18 @@
+@@ -80826,41 +33842,18 @@
    return 0;
  }
  _ACEOF
@@ -84473,7 +86456,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
   fi
  
-@@ -78376,17 +32775,13 @@
+@@ -80868,17 +33861,13 @@
  ############################################
  # See if we have the posix_fadvise syscall.
  
@@ -84494,7 +86477,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -78401,47 +32796,20 @@
+@@ -80893,47 +33882,20 @@
    return 0;
  }
  _ACEOF
@@ -84521,11 +86504,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
    samba_cv_HAVE_POSIX_FADVISE=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	samba_cv_HAVE_POSIX_FADVISE=no
++else
 +  samba_cv_HAVE_POSIX_FADVISE=no
  fi
 -
@@ -84548,7 +86532,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -78450,17 +32818,13 @@
+@@ -80942,17 +33904,13 @@
  
  case "$host_os" in
  *linux*)
@@ -84569,7 +86553,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #if defined(HAVE_UNISTD_H)
-@@ -78475,40 +32839,15 @@
+@@ -80967,40 +33925,15 @@
    return 0;
  }
  _ACEOF
@@ -84615,7 +86599,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
  ;;
  *)
-@@ -78518,24 +32857,18 @@
+@@ -81010,24 +33943,18 @@
  
  if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
  
@@ -84644,7 +86628,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -78546,41 +32879,18 @@
+@@ -81038,41 +33965,18 @@
    return 0;
  }
  _ACEOF
@@ -84690,7 +86674,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
   fi
  
-@@ -78588,68 +32898,35 @@
+@@ -81080,68 +33984,35 @@
  ############################################
  # See if we have the a broken readlink syscall.
  
@@ -84769,7 +86753,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -78657,7 +32934,7 @@
+@@ -81149,7 +34020,7 @@
  # Check whether winbind is supported on this platform.  If so we need to
  # build and install client programs, sbin programs and shared libraries
  
@@ -84778,7 +86762,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking whether to build winbind... " >&6; }
  
  # Initially, the value of $host_os decides whether winbind is supported
-@@ -78669,7 +32946,7 @@
+@@ -81161,7 +34032,7 @@
  # We define this here so --with-winbind can override it.
  
  # Check whether --with-wbclient was given.
@@ -84787,7 +86771,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_wbclient;
    case "$withval" in
          no)
-@@ -78770,7 +33047,7 @@
+@@ -81259,7 +34130,7 @@
  
  
  # Check whether --with-winbind was given.
@@ -84796,7 +86780,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_winbind;
    case "$withval" in
  	yes)
-@@ -78801,18 +33078,14 @@
+@@ -81290,18 +34161,14 @@
  	WINBIND_WINS_NSS=""
  fi
  if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -84818,7 +86802,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -78830,57 +33103,28 @@
+@@ -81319,57 +34186,28 @@
    return 0;
  }
  _ACEOF
@@ -84885,7 +86869,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
  else
-@@ -78911,12 +33155,10 @@
+@@ -81398,12 +34236,10 @@
  fi
  
  if test x"$HAVE_WINBIND" = x"yes"; then
@@ -84900,7 +86884,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  	EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -78927,22 +33169,18 @@
+@@ -81414,7 +34250,7 @@
  		UNINSTALL_PAM_MODULES="uninstallpammodules"
  	fi
  else
@@ -84909,81 +86893,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no$winbind_no_reason" >&6; }
  fi
  
--{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
- $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
--if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
-+if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $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.
-@@ -78960,48 +33198,21 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_pthread_pthread_mutex_lock=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_pthread_pthread_mutex_lock=no
-+  ac_cv_lib_pthread_pthread_mutex_lock=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_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
--if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
-+if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
-   WINBIND_NSS_PTHREAD="-lpthread"
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_PTHREAD 1
--_ACEOF
-+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
- 
- fi
- 
-@@ -79018,533 +33229,52 @@
+@@ -81427,108 +34263,11 @@
  
  
  # Solaris 10 does have new member in nss_XbyY_key
@@ -85085,17 +86995,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&5
 -$as_echo "$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" >&6; }
 -if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then
--
++ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
++"
++if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NSS_XBYY_KEY_IPNODE 1
 -_ACEOF
--
--fi
--
--
--# Solaris has some extra fields in struct passwd that need to be
--# initialised otherwise nscd crashes.
--
++$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -81536,318 +34275,29 @@
+ # Solaris has some extra fields in struct passwd that need to be
+ # initialised otherwise nscd crashes.
+ 
 -{ $as_echo "$as_me:$LINENO: checking for struct passwd.pw_comment" >&5
 -$as_echo_n "checking for struct passwd.pw_comment... " >&6; }
 -if test "${ac_cv_member_struct_passwd_pw_comment+set}" = set; then
@@ -85255,7 +87169,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <pwd.h>
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
+ 
 -int
 -main ()
 -{
@@ -85288,28 +87205,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
+ 
 -	ac_cv_member_struct_passwd_pw_age=no
--fi
--
+ 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
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_age" >&5
 -$as_echo "$ac_cv_member_struct_passwd_pw_age" >&6; }
 -if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then
--
++ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
++"
++if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_PASSWD_PW_AGE 1
 -_ACEOF
--
--fi
--
--
--# AIX 4.3.x and 5.1 do not have as many members in
--# struct secmethod_table as AIX 5.2
++$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+ # AIX 4.3.x and 5.1 do not have as many members in
+ # struct secmethod_table as AIX 5.2
 -{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_attrlist" >&5
 -$as_echo_n "checking for struct secmethod_table.method_attrlist... " >&6; }
 -if test "${ac_cv_member_struct_secmethod_table_method_attrlist+set}" = set; then
@@ -85408,16 +87330,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_attrlist" >&5
 -$as_echo "$ac_cv_member_struct_secmethod_table_method_attrlist" >&6; }
 -if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
--_ACEOF
--
--
--fi
-+ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
++ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
 +"
-+if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
++if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
+@@ -81856,104 +34306,9 @@
+ 
+ fi
  
 -{ $as_echo "$as_me:$LINENO: checking for struct secmethod_table.method_version" >&5
 -$as_echo_n "checking for struct secmethod_table.method_version... " >&6; }
@@ -85431,8 +87352,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
-+$as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
- 
+-
 -int
 -main ()
 -{
@@ -85465,8 +87385,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+fi
- 
+-
 -	cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -85474,7 +87393,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <usersec.h>
- 
+-
 -int
 -main ()
 -{
@@ -85507,53 +87426,25 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Solaris has some extra fields in struct passwd that need to be
-+# initialised otherwise nscd crashes.
-+
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
-+
-+$as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
- 
+-
 -	ac_cv_member_struct_secmethod_table_method_version=no
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
-+"
-+if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
-+
-+$as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
-+
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# AIX 4.3.x and 5.1 do not have as many members in
-+# struct secmethod_table as AIX 5.2
-+ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
-+"
-+if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
-+_ACEOF
-+
-+
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_secmethod_table_method_version" >&5
 -$as_echo "$ac_cv_member_struct_secmethod_table_method_version" >&6; }
 -if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then
-+
 +ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_version" "ac_cv_member_struct_secmethod_table_method_version" "#include <usersec.h>
 +"
 +if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then :
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -79554,17 +33284,13 @@
+@@ -81963,17 +34318,13 @@
  fi
  
  
@@ -85574,7 +87465,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -79579,41 +33305,18 @@
+@@ -81988,41 +34339,18 @@
    return 0;
  }
  _ACEOF
@@ -85620,7 +87511,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -79623,7 +33326,7 @@
+@@ -82032,7 +34360,7 @@
  
  
  # Check whether --with-included-popt was given.
@@ -85629,7 +87520,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_included_popt;
    case "$withval" in
  	yes)
-@@ -79636,18 +33339,14 @@
+@@ -82045,18 +34373,14 @@
  fi
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -85651,7 +87542,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -79665,43 +33364,18 @@
+@@ -82074,43 +34398,18 @@
    return 0;
  }
  _ACEOF
@@ -85701,7 +87592,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    INCLUDED_POPT=no
  else
    INCLUDED_POPT=yes
-@@ -79709,16 +33383,16 @@
+@@ -82118,16 +34417,16 @@
  
  fi
  
@@ -85721,7 +87612,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  	BUILD_POPT=""
      POPTLIBS="-lpopt"
-@@ -79731,7 +33405,7 @@
+@@ -82140,7 +34439,7 @@
  # Check if user wants DNS service discovery support
  
  # Check whether --enable-dnssd was given.
@@ -85730,7 +87621,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_dnssd;
  fi
  
-@@ -79740,151 +33414,12 @@
+@@ -82149,151 +34448,12 @@
  if test x"$enable_dnssd" = x"yes"; then
      have_dnssd_support=yes
  
@@ -85887,7 +87778,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -79897,102 +33432,12 @@
+@@ -82306,102 +34466,12 @@
  
      # On Darwin the DNSSD API is in libc, but on other platforms it's
      # probably in -ldns_sd
@@ -85995,7 +87886,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -80000,23 +33445,17 @@
+@@ -82409,23 +34479,17 @@
  
  
  
@@ -86022,10 +87913,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80034,54 +33473,28 @@
-   return 0;
- }
- _ACEOF
+@@ -82438,59 +34502,33 @@
+ int
+ main ()
+ {
+-return DNSServiceRegister ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -86047,6 +87943,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
++return DNSServiceRegister ();
++  ;
++  return 0;
++}
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_ext_dns_sd_DNSServiceRegister=yes;
  		  ac_cv_lib_ext_dns_sd=yes
@@ -86084,7 +87985,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDNS_SD 1
  _ACEOF
-@@ -80096,7 +33509,6 @@
+@@ -82505,7 +34543,6 @@
  
  
  fi
@@ -86092,7 +87993,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -80104,15 +33516,11 @@
+@@ -82513,15 +34550,11 @@
  
      if test x"$have_dnssd_support" = x"yes"; then
  
@@ -86110,7 +88011,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	fi
      fi
  
-@@ -80122,7 +33530,7 @@
+@@ -82531,7 +34564,7 @@
  # Check if user wants avahi support
  
  # Check whether --enable-avahi was given.
@@ -86119,7 +88020,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_avahi;
  fi
  
-@@ -80130,151 +33538,12 @@
+@@ -82539,151 +34572,12 @@
  if test x"$enable_avahi" != x"no"; then
      have_avahi_support=yes
  
@@ -86276,7 +88177,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -80285,151 +33554,12 @@
+@@ -82694,151 +34588,12 @@
  	have_avahi_support=no
      fi
  
@@ -86433,7 +88334,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -80441,18 +33571,14 @@
+@@ -82850,18 +34605,14 @@
      fi
  
      save_LIBS="$LIBS"
@@ -86455,7 +88356,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80470,58 +33596,29 @@
+@@ -82879,58 +34630,29 @@
    return 0;
  }
  _ACEOF
@@ -86523,7 +88424,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80539,43 +33636,18 @@
+@@ -82948,43 +34670,18 @@
    return 0;
  }
  _ACEOF
@@ -86573,7 +88474,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    have_avahi_strerror=yes
  fi
  
-@@ -80590,17 +33662,13 @@
+@@ -82999,17 +34696,13 @@
          AVAHI_LIBS="-lavahi-client -lavahi-common"
  
  
@@ -86593,7 +88494,586 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	fi
      fi
  fi
-@@ -80610,7 +33678,7 @@
+@@ -83024,18 +34717,14 @@
+ # If it's error, then the user didn't
+ # define it.
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-  { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthread" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5
+ $as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $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.
+@@ -83053,43 +34742,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread_pthread_attr_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_attr_init=no
++  ac_cv_lib_pthread_pthread_attr_init=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then :
+ 
+ 	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+ 	     PTHREAD_LDFLAGS="-lpthread"
+@@ -83098,18 +34762,14 @@
+ fi
+ 
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-  { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lpthreads" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthreads" >&5
+ $as_echo_n "checking for pthread_attr_init in -lpthreads... " >&6; }
+-if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthreads  $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.
+@@ -83127,43 +34787,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthreads_pthread_attr_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthreads_pthread_attr_init=no
++  ac_cv_lib_pthreads_pthread_attr_init=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then :
+ 
+ 	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
+ 	     PTHREAD_LDFLAGS="-lpthreads"
+@@ -83172,18 +34807,14 @@
+ fi
+ 
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-   { $as_echo "$as_me:$LINENO: checking for pthread_attr_init in -lc_r" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lc_r" >&5
+ $as_echo_n "checking for pthread_attr_init in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then
++if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lc_r  $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.
+@@ -83201,43 +34832,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_c_r_pthread_attr_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_c_r_pthread_attr_init=no
++  ac_cv_lib_c_r_pthread_attr_init=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_attr_init" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then
++if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then :
+ 
+ 		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+ 		PTHREAD_LDFLAGS="-pthread"
+@@ -83246,92 +34852,8 @@
+ fi
+ 
+ if test "x$PTHREAD_LDFLAGS" = xerror; then
+-   { $as_echo "$as_me:$LINENO: checking for pthread_attr_init" >&5
+-$as_echo_n "checking for pthread_attr_init... " >&6; }
+-if test "${ac_cv_func_pthread_attr_init+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 pthread_attr_init to an innocuous variant, in case <limits.h> declares pthread_attr_init.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define pthread_attr_init innocuous_pthread_attr_init
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pthread_attr_init (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef pthread_attr_init
+-
+-/* 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 pthread_attr_init ();
+-/* 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_pthread_attr_init || defined __stub___pthread_attr_init
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return pthread_attr_init ();
+-  ;
+-  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_func_pthread_attr_init=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_pthread_attr_init=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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pthread_attr_init" >&5
+-$as_echo "$ac_cv_func_pthread_attr_init" >&6; }
+-if test "x$ac_cv_func_pthread_attr_init" = x""yes; then
++   ac_fn_c_check_func "$LINENO" "pthread_attr_init" "ac_cv_func_pthread_attr_init"
++if test "x$ac_cv_func_pthread_attr_init" = x""yes; then :
+ 
+ 		 PTHREAD_CFLAGS="-D_REENTRANT"
+ 		 PTHREAD_LDFLAGS="-lpthread"
+@@ -83342,18 +34864,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
+-   { $as_echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
+ $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then
++if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $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.
+@@ -83371,43 +34889,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread_pthread_mutex_lock=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_mutex_lock=no
++  ac_cv_lib_pthread_pthread_mutex_lock=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_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then
++if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
+ 
+ 		PTHREAD_CFLAGS="-D_REENTRANT"
+ 		PTHREAD_LDFLAGS="-lpthread"
+@@ -83426,151 +34919,12 @@
+ 	CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 	ac_save_LDFLAGS=$LDFLAGS
+ 	LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
+-
+-for ac_header in pthread.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 pthread.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
++if test "x$ac_cv_header_pthread_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_PTHREAD_H 1
+ _ACEOF
+ 
+ fi
+@@ -83580,9 +34934,7 @@
+ 	CFLAGS=$ac_save_CFLAGS
+ 	LDFLAGS=$ac_save_LDFLAGS
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PTHREAD 1
+-_ACEOF
++$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -83590,24 +34942,20 @@
+ # Check if user wants pthreadpool support
+ 
+ # Check whether --enable-pthreadpool was given.
+-if test "${enable_pthreadpool+set}" = set; then
++if test "${enable_pthreadpool+set}" = set; then :
+   enableval=$enable_pthreadpool;
+ fi
+ 
+ 
+ if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: pthreadpool support cannot be enabled when pthread support was found" >&5
+-$as_echo "$as_me: error: pthreadpool support cannot be enabled when pthread support was found" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "pthreadpool support cannot be enabled when pthread support was found" "$LINENO" 5
+ fi
+ 
+ if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
+     LIBS="$LIBS $PTHREAD_LDFLAGS"
+     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_PTHREADPOOL 1
+-_ACEOF
++$as_echo "#define WITH_PTHREADPOOL 1" >>confdefs.h
+ 
+     PTHREADPOOL_OBJ="lib/pthreadpool.o"
+ 
+@@ -83618,7 +34966,7 @@
  
  
  # Check whether --with-included-iniparser was given.
@@ -86602,7 +89082,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_included_iniparser;
    case "$withval" in
  	yes)
-@@ -80623,18 +33691,14 @@
+@@ -83631,18 +34979,14 @@
  fi
  
  if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -86624,7 +89104,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -80652,43 +33716,18 @@
+@@ -83660,43 +35004,18 @@
    return 0;
  }
  _ACEOF
@@ -86674,7 +89154,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    INCLUDED_INIPARSER=no
  else
    INCLUDED_INIPARSER=yes
-@@ -80696,260 +33735,40 @@
+@@ -83704,260 +35023,40 @@
  
  fi
  
@@ -86686,12 +89166,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      BUILD_INIPARSER='$(INIPARSER_OBJ)'
- 	INIPARSERLIBS=""
-     FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
- else
+-	INIPARSERLIBS=""
+-    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
+-else
 -    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
+-$as_echo "no" >&6; }
 -	BUILD_INIPARSER=""
 -    INIPARSERLIBS="-liniparser"
 -fi
@@ -86881,14 +89360,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
-+	BUILD_INIPARSER=""
-+    INIPARSERLIBS="-liniparser"
- fi
- 
+-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: )
@@ -86923,9 +89400,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
++	INIPARSERLIBS=""
++    FLAGS1="$FLAGS1 -I\$(srcdir)/iniparser/src"
+ else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	BUILD_INIPARSER=""
++    INIPARSERLIBS="-liniparser"
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -86934,6 +89417,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +
 +
 +
++
++
 +# Checks for the vfs_fileid module
 +# Start
 +ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent"
@@ -86955,7 +89440,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -80957,20 +33776,16 @@
+@@ -83965,20 +35064,16 @@
  done
  
  
@@ -86980,7 +89465,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <sys/types.h>
-@@ -80982,46 +33797,19 @@
+@@ -83990,46 +35085,19 @@
  			return statfs (".", &fsd);
  		}
  _ACEOF
@@ -87032,7 +89517,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$vfsfileid_cv_statfs" >&6; }
  
  if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -81056,7 +33844,7 @@
+@@ -84064,7 +35132,7 @@
  
  
  # Check whether --with-static-modules was given.
@@ -87041,7 +89526,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_static_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -81068,7 +33856,7 @@
+@@ -84076,7 +35144,7 @@
  
  
  # Check whether --with-shared-modules was given.
@@ -87050,8 +89535,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_shared_modules;  if test $withval; then
  	for i in `echo $withval | sed -e 's/,/ /g'`
  	do
-@@ -81079,7 +33867,7 @@
- 
+@@ -84093,7 +35161,7 @@
+ fi
  
  
 -	{ $as_echo "$as_me:$LINENO: checking how to build pdb_ldap" >&5
@@ -87059,7 +89544,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build pdb_ldap... " >&6; }
  	if test "$MODULE_pdb_ldap"; then
  		DEST=$MODULE_pdb_ldap
-@@ -81091,12 +33879,10 @@
+@@ -84105,12 +35173,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87074,7 +89559,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -81107,16 +33893,16 @@
+@@ -84121,16 +35187,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
  
  		 PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -87089,12 +89574,47 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	fi
  
  
+-	{ $as_echo "$as_me:$LINENO: checking how to build pdb_ads" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build pdb_ads" >&5
+ $as_echo_n "checking how to build pdb_ads... " >&6; }
+ 	if test "$MODULE_pdb_ads"; then
+ 		DEST=$MODULE_pdb_ads
+@@ -84142,12 +35208,10 @@
+ 
+ 	if test x"$DEST" = xSHARED; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define pdb_ads_init init_samba_module
+-_ACEOF
++$as_echo "#define pdb_ads_init init_samba_module" >>confdefs.h
+ 
+ 		PDB_MODULES="$PDB_MODULES "bin/ads.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+ $as_echo "shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules pdb_ads"
+@@ -84158,16 +35222,16 @@
+ 		PDB_STATIC="$PDB_STATIC passdb/pdb_ads.o \$(TLDAP_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules pdb_ads"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not" >&5
+ $as_echo "not" >&6; }
+ 	fi
+ 
+ 
 -	{ $as_echo "$as_me:$LINENO: checking how to build pdb_smbpasswd" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build pdb_smbpasswd" >&5
  $as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
  	if test "$MODULE_pdb_smbpasswd"; then
  		DEST=$MODULE_pdb_smbpasswd
-@@ -81128,12 +33914,10 @@
+@@ -84179,12 +35243,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87109,7 +89629,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -81144,16 +33928,16 @@
+@@ -84195,16 +35257,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
  
  
@@ -87129,7 +89649,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build pdb_tdbsam... " >&6; }
  	if test "$MODULE_pdb_tdbsam"; then
  		DEST=$MODULE_pdb_tdbsam
-@@ -81165,12 +33949,10 @@
+@@ -84216,12 +35278,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87144,7 +89664,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -81181,16 +33963,16 @@
+@@ -84232,16 +35292,16 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
  
  
@@ -87164,7 +89684,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -81202,12 +33984,10 @@
+@@ -84253,12 +35313,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87179,7 +89699,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -81218,11 +33998,11 @@
+@@ -84269,11 +35327,11 @@
  		PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
  
  
@@ -87193,7 +89713,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -81244,7 +34024,7 @@
+@@ -84295,7 +35353,7 @@
  
  
  
@@ -87202,7 +89722,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_lsarpc... " >&6; }
  	if test "$MODULE_rpc_lsarpc"; then
  		DEST=$MODULE_rpc_lsarpc
-@@ -81256,12 +34036,10 @@
+@@ -84307,12 +35365,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87217,7 +89737,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -81272,16 +34050,16 @@
+@@ -84323,16 +35379,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
  
  
@@ -87237,7 +89757,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_winreg... " >&6; }
  	if test "$MODULE_rpc_winreg"; then
  		DEST=$MODULE_rpc_winreg
-@@ -81293,12 +34071,10 @@
+@@ -84344,12 +35400,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87252,7 +89772,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -81309,16 +34085,16 @@
+@@ -84360,16 +35414,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
  
  
@@ -87272,7 +89792,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_initshutdown... " >&6; }
  	if test "$MODULE_rpc_initshutdown"; then
  		DEST=$MODULE_rpc_initshutdown
-@@ -81330,12 +34106,10 @@
+@@ -84381,12 +35435,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87287,7 +89807,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -81346,16 +34120,16 @@
+@@ -84397,16 +35449,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
  
  
@@ -87307,7 +89827,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_dssetup... " >&6; }
  	if test "$MODULE_rpc_dssetup"; then
  		DEST=$MODULE_rpc_dssetup
-@@ -81367,12 +34141,10 @@
+@@ -84418,12 +35470,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87322,7 +89842,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -81383,16 +34155,16 @@
+@@ -84434,16 +35484,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
  
  
@@ -87342,7 +89862,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_wkssvc... " >&6; }
  	if test "$MODULE_rpc_wkssvc"; then
  		DEST=$MODULE_rpc_wkssvc
-@@ -81404,12 +34176,10 @@
+@@ -84455,12 +35505,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87357,7 +89877,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -81420,16 +34190,16 @@
+@@ -84471,16 +35519,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
  
  
@@ -87377,7 +89897,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_svcctl... " >&6; }
  	if test "$MODULE_rpc_svcctl"; then
  		DEST=$MODULE_rpc_svcctl
-@@ -81441,12 +34211,10 @@
+@@ -84492,12 +35540,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87392,7 +89912,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -81457,16 +34225,16 @@
+@@ -84508,16 +35554,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
  
  
@@ -87412,7 +89932,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
  	if test "$MODULE_rpc_ntsvcs"; then
  		DEST=$MODULE_rpc_ntsvcs
-@@ -81478,12 +34246,10 @@
+@@ -84529,12 +35575,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87427,7 +89947,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -81494,16 +34260,16 @@
+@@ -84545,16 +35589,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
  
  
@@ -87447,7 +89967,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_netlogon... " >&6; }
  	if test "$MODULE_rpc_netlogon"; then
  		DEST=$MODULE_rpc_netlogon
-@@ -81515,12 +34281,10 @@
+@@ -84566,12 +35610,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87462,7 +89982,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -81531,16 +34295,16 @@
+@@ -84582,16 +35624,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
  
  
@@ -87482,7 +90002,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_netdfs... " >&6; }
  	if test "$MODULE_rpc_netdfs"; then
  		DEST=$MODULE_rpc_netdfs
-@@ -81552,12 +34316,10 @@
+@@ -84603,12 +35645,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87497,7 +90017,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -81568,16 +34330,16 @@
+@@ -84619,16 +35659,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
  
  
@@ -87517,7 +90037,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_srvsvc... " >&6; }
  	if test "$MODULE_rpc_srvsvc"; then
  		DEST=$MODULE_rpc_srvsvc
-@@ -81589,12 +34351,10 @@
+@@ -84640,12 +35680,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87532,7 +90052,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -81605,16 +34365,16 @@
+@@ -84656,16 +35694,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
  
  
@@ -87552,7 +90072,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_spoolss... " >&6; }
  	if test "$MODULE_rpc_spoolss"; then
  		DEST=$MODULE_rpc_spoolss
-@@ -81626,12 +34386,10 @@
+@@ -84677,12 +35715,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87567,7 +90087,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -81642,16 +34400,16 @@
+@@ -84693,16 +35729,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
  
  
@@ -87587,7 +90107,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_eventlog... " >&6; }
  	if test "$MODULE_rpc_eventlog"; then
  		DEST=$MODULE_rpc_eventlog
-@@ -81663,12 +34421,10 @@
+@@ -84714,12 +35750,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87602,7 +90122,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -81679,16 +34435,16 @@
+@@ -84730,16 +35764,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
  
  
@@ -87622,7 +90142,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_samr... " >&6; }
  	if test "$MODULE_rpc_samr"; then
  		DEST=$MODULE_rpc_samr
-@@ -81700,12 +34456,10 @@
+@@ -84751,12 +35785,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87637,7 +90157,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_samr"
-@@ -81716,16 +34470,16 @@
+@@ -84767,16 +35799,16 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
  
  
@@ -87657,7 +90177,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build rpc_rpcecho... " >&6; }
  	if test "$MODULE_rpc_rpcecho"; then
  		DEST=$MODULE_rpc_rpcecho
-@@ -81737,12 +34491,10 @@
+@@ -84788,12 +35820,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87672,7 +90192,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -81753,11 +34505,11 @@
+@@ -84804,11 +35834,11 @@
  		RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
  
  
@@ -87686,7 +90206,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -81778,7 +34530,7 @@
+@@ -84829,7 +35859,7 @@
  
  
  
@@ -87695,7 +90215,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_ldap... " >&6; }
  	if test "$MODULE_idmap_ldap"; then
  		DEST=$MODULE_idmap_ldap
-@@ -81790,12 +34542,10 @@
+@@ -84841,12 +35871,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87710,7 +90230,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -81806,16 +34556,16 @@
+@@ -84857,16 +35885,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
  
  
@@ -87730,7 +90250,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_tdb... " >&6; }
  	if test "$MODULE_idmap_tdb"; then
  		DEST=$MODULE_idmap_tdb
-@@ -81827,12 +34577,10 @@
+@@ -84878,12 +35906,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87745,7 +90265,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -81843,16 +34591,16 @@
+@@ -84894,16 +35920,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
  
  
@@ -87765,7 +90285,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_tdb2... " >&6; }
  	if test "$MODULE_idmap_tdb2"; then
  		DEST=$MODULE_idmap_tdb2
-@@ -81864,12 +34612,10 @@
+@@ -84915,12 +35941,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87780,7 +90300,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -81880,16 +34626,16 @@
+@@ -84931,16 +35955,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
  
  
@@ -87800,7 +90320,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_passdb... " >&6; }
  	if test "$MODULE_idmap_passdb"; then
  		DEST=$MODULE_idmap_passdb
-@@ -81901,12 +34647,10 @@
+@@ -84952,12 +35976,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87815,7 +90335,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -81917,16 +34661,16 @@
+@@ -84968,16 +35990,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
  
  
@@ -87835,7 +90355,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_nss... " >&6; }
  	if test "$MODULE_idmap_nss"; then
  		DEST=$MODULE_idmap_nss
-@@ -81938,12 +34682,10 @@
+@@ -84989,12 +36011,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87850,7 +90370,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_nss"
-@@ -81954,16 +34696,16 @@
+@@ -85005,16 +36025,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
  
  
@@ -87870,7 +90390,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_rid... " >&6; }
  	if test "$MODULE_idmap_rid"; then
  		DEST=$MODULE_idmap_rid
-@@ -81975,12 +34717,10 @@
+@@ -85026,12 +36046,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87885,7 +90405,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_rid"
-@@ -81991,16 +34731,16 @@
+@@ -85042,16 +36060,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
  
  
@@ -87905,7 +90425,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_ad... " >&6; }
  	if test "$MODULE_idmap_ad"; then
  		DEST=$MODULE_idmap_ad
-@@ -82012,12 +34752,10 @@
+@@ -85063,12 +36081,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87920,7 +90440,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_ad"
-@@ -82028,16 +34766,16 @@
+@@ -85079,16 +36095,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
  
  
@@ -87940,7 +90460,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_hash... " >&6; }
  	if test "$MODULE_idmap_hash"; then
  		DEST=$MODULE_idmap_hash
-@@ -82049,12 +34787,10 @@
+@@ -85100,12 +36116,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87955,7 +90475,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_hash"
-@@ -82065,16 +34801,16 @@
+@@ -85116,16 +36130,16 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
  
  
@@ -87975,7 +90495,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build idmap_adex... " >&6; }
  	if test "$MODULE_idmap_adex"; then
  		DEST=$MODULE_idmap_adex
-@@ -82086,12 +34822,10 @@
+@@ -85137,12 +36151,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -87990,7 +90510,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules idmap_adex"
-@@ -82102,11 +34836,11 @@
+@@ -85153,11 +36165,11 @@
  		IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
  
  
@@ -88004,7 +90524,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -82127,7 +34861,7 @@
+@@ -85178,7 +36190,7 @@
  
  
  
@@ -88013,7 +90533,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -82139,12 +34873,10 @@
+@@ -85190,12 +36202,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88028,7 +90548,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules nss_info_template"
-@@ -82155,11 +34887,11 @@
+@@ -85206,11 +36216,11 @@
  		NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
  
  
@@ -88042,7 +90562,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -82180,7 +34912,7 @@
+@@ -85231,7 +36241,7 @@
  
  
  
@@ -88051,7 +90571,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build charset_weird... " >&6; }
  	if test "$MODULE_charset_weird"; then
  		DEST=$MODULE_charset_weird
-@@ -82192,12 +34924,10 @@
+@@ -85243,12 +36253,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88066,7 +90586,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_weird"
-@@ -82208,16 +34938,16 @@
+@@ -85259,16 +36267,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
  
  
@@ -88086,7 +90606,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build charset_CP850... " >&6; }
  	if test "$MODULE_charset_CP850"; then
  		DEST=$MODULE_charset_CP850
-@@ -82229,12 +34959,10 @@
+@@ -85280,12 +36288,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88101,7 +90621,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP850"
-@@ -82245,16 +34973,16 @@
+@@ -85296,16 +36302,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
  
  
@@ -88121,7 +90641,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build charset_CP437... " >&6; }
  	if test "$MODULE_charset_CP437"; then
  		DEST=$MODULE_charset_CP437
-@@ -82266,12 +34994,10 @@
+@@ -85317,12 +36323,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88136,7 +90656,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_CP437"
-@@ -82282,16 +35008,16 @@
+@@ -85333,16 +36337,16 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
  
  
@@ -88156,7 +90676,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build charset_macosxfs... " >&6; }
  	if test "$MODULE_charset_macosxfs"; then
  		DEST=$MODULE_charset_macosxfs
-@@ -82303,12 +35029,10 @@
+@@ -85354,12 +36358,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88171,7 +90691,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -82319,11 +35043,11 @@
+@@ -85370,11 +36372,11 @@
  		CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
  
  
@@ -88185,7 +90705,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -82344,7 +35068,7 @@
+@@ -85395,7 +36397,7 @@
  
  
  
@@ -88194,7 +90714,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_sam... " >&6; }
  	if test "$MODULE_auth_sam"; then
  		DEST=$MODULE_auth_sam
-@@ -82356,12 +35080,10 @@
+@@ -85407,12 +36409,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88209,7 +90729,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_sam"
-@@ -82372,16 +35094,16 @@
+@@ -85423,16 +36423,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
  
  
@@ -88229,7 +90749,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_unix... " >&6; }
  	if test "$MODULE_auth_unix"; then
  		DEST=$MODULE_auth_unix
-@@ -82393,12 +35115,10 @@
+@@ -85444,12 +36444,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88244,7 +90764,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_unix"
-@@ -82409,16 +35129,16 @@
+@@ -85460,16 +36458,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
  
  
@@ -88264,7 +90784,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_winbind... " >&6; }
  	if test "$MODULE_auth_winbind"; then
  		DEST=$MODULE_auth_winbind
-@@ -82430,12 +35150,10 @@
+@@ -85481,12 +36479,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88279,7 +90799,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_winbind"
-@@ -82446,16 +35164,16 @@
+@@ -85497,16 +36493,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
  
  
@@ -88299,7 +90819,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_wbc... " >&6; }
  	if test "$MODULE_auth_wbc"; then
  		DEST=$MODULE_auth_wbc
-@@ -82467,12 +35185,10 @@
+@@ -85518,12 +36514,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88314,7 +90834,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_wbc"
-@@ -82483,16 +35199,16 @@
+@@ -85534,16 +36528,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
  
  
@@ -88334,7 +90854,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_server... " >&6; }
  	if test "$MODULE_auth_server"; then
  		DEST=$MODULE_auth_server
-@@ -82504,12 +35220,10 @@
+@@ -85555,12 +36549,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88349,7 +90869,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_server"
-@@ -82520,16 +35234,16 @@
+@@ -85571,16 +36563,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
  
  
@@ -88369,7 +90889,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_domain... " >&6; }
  	if test "$MODULE_auth_domain"; then
  		DEST=$MODULE_auth_domain
-@@ -82541,12 +35255,10 @@
+@@ -85592,12 +36584,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88384,7 +90904,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_domain"
-@@ -82557,16 +35269,16 @@
+@@ -85608,16 +36598,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
  
  
@@ -88404,7 +90924,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_builtin... " >&6; }
  	if test "$MODULE_auth_builtin"; then
  		DEST=$MODULE_auth_builtin
-@@ -82578,12 +35290,10 @@
+@@ -85629,12 +36619,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88419,7 +90939,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_builtin"
-@@ -82594,16 +35304,16 @@
+@@ -85645,16 +36633,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
  
  
@@ -88439,7 +90959,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_script... " >&6; }
  	if test "$MODULE_auth_script"; then
  		DEST=$MODULE_auth_script
-@@ -82615,12 +35325,10 @@
+@@ -85666,12 +36654,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88454,7 +90974,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_script"
-@@ -82631,16 +35339,16 @@
+@@ -85682,16 +36668,16 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
  
  
@@ -88474,7 +90994,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build auth_netlogond... " >&6; }
  	if test "$MODULE_auth_netlogond"; then
  		DEST=$MODULE_auth_netlogond
-@@ -82652,12 +35360,10 @@
+@@ -85703,12 +36689,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88489,7 +91009,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -82668,11 +35374,11 @@
+@@ -85719,11 +36703,11 @@
  		AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
  
  
@@ -88503,7 +91023,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -82693,7 +35399,7 @@
+@@ -85744,7 +36728,7 @@
  
  
  
@@ -88512,7 +91032,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_default... " >&6; }
  	if test "$MODULE_vfs_default"; then
  		DEST=$MODULE_vfs_default
-@@ -82705,12 +35411,10 @@
+@@ -85756,12 +36740,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88527,7 +91047,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default"
-@@ -82721,16 +35425,16 @@
+@@ -85772,16 +36754,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
  
  
@@ -88547,7 +91067,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_recycle... " >&6; }
  	if test "$MODULE_vfs_recycle"; then
  		DEST=$MODULE_vfs_recycle
-@@ -82742,12 +35446,10 @@
+@@ -85793,12 +36775,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88562,7 +91082,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -82758,16 +35460,16 @@
+@@ -85809,16 +36789,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
  
  
@@ -88582,7 +91102,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_audit... " >&6; }
  	if test "$MODULE_vfs_audit"; then
  		DEST=$MODULE_vfs_audit
-@@ -82779,12 +35481,10 @@
+@@ -85830,12 +36810,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88597,7 +91117,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_audit"
-@@ -82795,16 +35495,16 @@
+@@ -85846,16 +36824,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
  
  
@@ -88617,7 +91137,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -82816,12 +35516,10 @@
+@@ -85867,12 +36845,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88632,7 +91152,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -82832,16 +35530,16 @@
+@@ -85883,16 +36859,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
  
  
@@ -88652,7 +91172,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -82853,12 +35551,10 @@
+@@ -85904,12 +36880,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88667,7 +91187,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -82869,16 +35565,16 @@
+@@ -85920,16 +36894,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
  
  
@@ -88687,7 +91207,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_netatalk... " >&6; }
  	if test "$MODULE_vfs_netatalk"; then
  		DEST=$MODULE_vfs_netatalk
-@@ -82890,12 +35586,10 @@
+@@ -85941,12 +36915,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88702,7 +91222,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -82906,16 +35600,16 @@
+@@ -85957,16 +36929,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
  
  
@@ -88722,7 +91242,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -82927,12 +35621,10 @@
+@@ -85978,12 +36950,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88737,7 +91257,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -82943,16 +35635,16 @@
+@@ -85994,16 +36964,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
  
  
@@ -88757,7 +91277,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -82964,12 +35656,10 @@
+@@ -86015,12 +36985,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88772,7 +91292,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -82980,16 +35670,16 @@
+@@ -86031,16 +36999,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
  
  
@@ -88792,7 +91312,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_readonly... " >&6; }
  	if test "$MODULE_vfs_readonly"; then
  		DEST=$MODULE_vfs_readonly
-@@ -83001,12 +35691,10 @@
+@@ -86052,12 +37020,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88807,7 +91327,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -83017,16 +35705,16 @@
+@@ -86068,16 +37034,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
  
  
@@ -88827,7 +91347,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_cap... " >&6; }
  	if test "$MODULE_vfs_cap"; then
  		DEST=$MODULE_vfs_cap
-@@ -83038,12 +35726,10 @@
+@@ -86089,12 +37055,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88842,7 +91362,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cap"
-@@ -83054,16 +35740,16 @@
+@@ -86105,16 +37069,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
  
  
@@ -88862,7 +91382,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83075,12 +35761,10 @@
+@@ -86126,12 +37090,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88877,7 +91397,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -83091,16 +35775,16 @@
+@@ -86142,16 +37104,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
  
  
@@ -88897,7 +91417,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83112,12 +35796,10 @@
+@@ -86163,12 +37125,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88912,7 +91432,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -83128,16 +35810,16 @@
+@@ -86179,16 +37139,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
  
  
@@ -88932,7 +91452,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83149,12 +35831,10 @@
+@@ -86200,12 +37160,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88947,7 +91467,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -83165,16 +35845,16 @@
+@@ -86216,16 +37174,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
  
  
@@ -88967,7 +91487,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_afsacl... " >&6; }
  	if test "$MODULE_vfs_afsacl"; then
  		DEST=$MODULE_vfs_afsacl
-@@ -83186,12 +35866,10 @@
+@@ -86237,12 +37195,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -88982,7 +91502,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -83202,16 +35880,16 @@
+@@ -86253,16 +37209,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
  
  
@@ -89002,7 +91522,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83223,12 +35901,10 @@
+@@ -86274,12 +37230,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89017,7 +91537,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -83239,16 +35915,16 @@
+@@ -86290,16 +37244,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
  
  
@@ -89037,7 +91557,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_posixacl... " >&6; }
  	if test "$MODULE_vfs_posixacl"; then
  		DEST=$MODULE_vfs_posixacl
-@@ -83260,12 +35936,10 @@
+@@ -86311,12 +37265,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89052,7 +91572,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -83276,16 +35950,16 @@
+@@ -86327,16 +37279,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
  
  
@@ -89072,7 +91592,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_aixacl... " >&6; }
  	if test "$MODULE_vfs_aixacl"; then
  		DEST=$MODULE_vfs_aixacl
-@@ -83297,12 +35971,10 @@
+@@ -86348,12 +37300,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89087,7 +91607,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -83313,16 +35985,16 @@
+@@ -86364,16 +37314,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
  
  
@@ -89107,7 +91627,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_aixacl2... " >&6; }
  	if test "$MODULE_vfs_aixacl2"; then
  		DEST=$MODULE_vfs_aixacl2
-@@ -83334,12 +36006,10 @@
+@@ -86385,12 +37335,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89122,7 +91642,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -83350,16 +36020,16 @@
+@@ -86401,16 +37349,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
  
  
@@ -89142,7 +91662,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_solarisacl... " >&6; }
  	if test "$MODULE_vfs_solarisacl"; then
  		DEST=$MODULE_vfs_solarisacl
-@@ -83371,12 +36041,10 @@
+@@ -86422,12 +37370,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89157,7 +91677,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -83387,16 +36055,16 @@
+@@ -86438,16 +37384,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
  
  
@@ -89177,7 +91697,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_irixacl... " >&6; }
  	if test "$MODULE_vfs_irixacl"; then
  		DEST=$MODULE_vfs_irixacl
-@@ -83408,12 +36076,10 @@
+@@ -86459,12 +37405,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89192,7 +91712,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -83424,16 +36090,16 @@
+@@ -86475,16 +37419,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
  
  
@@ -89212,7 +91732,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
  	if test "$MODULE_vfs_hpuxacl"; then
  		DEST=$MODULE_vfs_hpuxacl
-@@ -83445,12 +36111,10 @@
+@@ -86496,12 +37440,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89227,7 +91747,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -83461,16 +36125,16 @@
+@@ -86512,16 +37454,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
  
  
@@ -89247,7 +91767,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_tru64acl... " >&6; }
  	if test "$MODULE_vfs_tru64acl"; then
  		DEST=$MODULE_vfs_tru64acl
-@@ -83482,12 +36146,10 @@
+@@ -86533,12 +37475,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89262,7 +91782,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -83498,16 +36160,16 @@
+@@ -86549,16 +37489,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
  
  
@@ -89282,7 +91802,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_catia... " >&6; }
  	if test "$MODULE_vfs_catia"; then
  		DEST=$MODULE_vfs_catia
-@@ -83519,12 +36181,10 @@
+@@ -86570,12 +37510,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89297,7 +91817,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_catia"
-@@ -83535,16 +36195,16 @@
+@@ -86586,16 +37524,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
  
  
@@ -89317,7 +91837,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83556,12 +36216,10 @@
+@@ -86607,12 +37545,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89332,7 +91852,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -83572,16 +36230,16 @@
+@@ -86623,16 +37559,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
  
  
@@ -89352,7 +91872,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83593,12 +36251,10 @@
+@@ -86644,12 +37580,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89367,7 +91887,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -83609,16 +36265,16 @@
+@@ -86660,16 +37594,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
  
  
@@ -89387,7 +91907,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_cacheprime... " >&6; }
  	if test "$MODULE_vfs_cacheprime"; then
  		DEST=$MODULE_vfs_cacheprime
-@@ -83630,12 +36286,10 @@
+@@ -86681,12 +37615,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89402,7 +91922,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -83646,16 +36300,16 @@
+@@ -86697,16 +37629,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
  
  
@@ -89422,7 +91942,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_prealloc... " >&6; }
  	if test "$MODULE_vfs_prealloc"; then
  		DEST=$MODULE_vfs_prealloc
-@@ -83667,12 +36321,10 @@
+@@ -86718,12 +37650,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89437,7 +91957,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -83683,16 +36335,16 @@
+@@ -86734,16 +37664,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
  
  
@@ -89457,7 +91977,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_commit... " >&6; }
  	if test "$MODULE_vfs_commit"; then
  		DEST=$MODULE_vfs_commit
-@@ -83704,12 +36356,10 @@
+@@ -86755,12 +37685,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89472,7 +91992,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_commit"
-@@ -83720,16 +36370,16 @@
+@@ -86771,16 +37699,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
  
  
@@ -89492,7 +92012,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_gpfs... " >&6; }
  	if test "$MODULE_vfs_gpfs"; then
  		DEST=$MODULE_vfs_gpfs
-@@ -83741,12 +36391,10 @@
+@@ -86792,12 +37720,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89507,7 +92027,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -83757,16 +36405,16 @@
+@@ -86808,16 +37734,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
  
  
@@ -89527,7 +92047,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_readahead... " >&6; }
  	if test "$MODULE_vfs_readahead"; then
  		DEST=$MODULE_vfs_readahead
-@@ -83778,12 +36426,10 @@
+@@ -86829,12 +37755,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89542,7 +92062,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -83794,16 +36440,16 @@
+@@ -86845,16 +37769,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
  
  
@@ -89562,7 +92082,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_tsmsm... " >&6; }
  	if test "$MODULE_vfs_tsmsm"; then
  		DEST=$MODULE_vfs_tsmsm
-@@ -83815,12 +36461,10 @@
+@@ -86866,12 +37790,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89577,7 +92097,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -83831,16 +36475,16 @@
+@@ -86882,16 +37804,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
  
  
@@ -89597,7 +92117,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_fileid... " >&6; }
  	if test "$MODULE_vfs_fileid"; then
  		DEST=$MODULE_vfs_fileid
-@@ -83852,12 +36496,10 @@
+@@ -86903,12 +37825,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89612,7 +92132,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -83868,16 +36510,16 @@
+@@ -86919,16 +37839,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
  
  
@@ -89632,7 +92152,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -83889,12 +36531,10 @@
+@@ -86940,12 +37860,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89647,7 +92167,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -83905,16 +36545,16 @@
+@@ -86956,16 +37874,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
  
  
@@ -89667,7 +92187,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_preopen... " >&6; }
  	if test "$MODULE_vfs_preopen"; then
  		DEST=$MODULE_vfs_preopen
-@@ -83926,12 +36566,10 @@
+@@ -86977,12 +37895,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89682,7 +92202,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -83942,16 +36580,16 @@
+@@ -86993,16 +37909,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
  
  
@@ -89702,7 +92222,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_syncops... " >&6; }
  	if test "$MODULE_vfs_syncops"; then
  		DEST=$MODULE_vfs_syncops
-@@ -83963,12 +36601,10 @@
+@@ -87014,12 +37930,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89717,7 +92237,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -83979,16 +36615,16 @@
+@@ -87030,16 +37944,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
  
  
@@ -89737,7 +92257,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_zfsacl... " >&6; }
  	if test "$MODULE_vfs_zfsacl"; then
  		DEST=$MODULE_vfs_zfsacl
-@@ -84000,12 +36636,10 @@
+@@ -87051,12 +37965,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89752,7 +92272,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -84016,16 +36650,16 @@
+@@ -87067,16 +37979,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
  
  
@@ -89772,7 +92292,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -84037,12 +36671,10 @@
+@@ -87088,12 +38000,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89787,7 +92307,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -84053,16 +36685,16 @@
+@@ -87104,16 +38014,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
  
  
@@ -89807,7 +92327,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -84074,12 +36706,10 @@
+@@ -87125,12 +38035,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89822,7 +92342,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -84090,16 +36720,16 @@
+@@ -87141,16 +38049,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
  
  
@@ -89842,7 +92362,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -84111,12 +36741,10 @@
+@@ -87162,12 +38070,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89857,7 +92377,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -84127,16 +36755,16 @@
+@@ -87178,16 +38084,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
  
  
@@ -89877,7 +92397,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -84148,12 +36776,10 @@
+@@ -87199,12 +38105,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89892,7 +92412,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -84164,16 +36790,16 @@
+@@ -87215,16 +38119,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
  
  
@@ -89912,7 +92432,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_onefs... " >&6; }
  	if test "$MODULE_vfs_onefs"; then
  		DEST=$MODULE_vfs_onefs
-@@ -84185,12 +36811,10 @@
+@@ -87236,12 +38140,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89927,7 +92447,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -84201,16 +36825,16 @@
+@@ -87252,16 +38154,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
  
  
@@ -89947,7 +92467,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -84222,12 +36846,10 @@
+@@ -87273,12 +38175,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89962,7 +92482,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -84238,16 +36860,16 @@
+@@ -87289,16 +38189,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
  
  
@@ -89982,7 +92502,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build vfs_dirsort... " >&6; }
  	if test "$MODULE_vfs_dirsort"; then
  		DEST=$MODULE_vfs_dirsort
-@@ -84259,12 +36881,10 @@
+@@ -87310,12 +38210,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -89997,7 +92517,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -84275,11 +36895,11 @@
+@@ -87326,16 +38224,16 @@
  		VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
  
  
@@ -90011,7 +92531,42 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -84301,7 +36921,7 @@
+ 
+-	{ $as_echo "$as_me:$LINENO: checking how to build vfs_scannedonly" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build vfs_scannedonly" >&5
+ $as_echo_n "checking how to build vfs_scannedonly... " >&6; }
+ 	if test "$MODULE_vfs_scannedonly"; then
+ 		DEST=$MODULE_vfs_scannedonly
+@@ -87347,12 +38245,10 @@
+ 
+ 	if test x"$DEST" = xSHARED; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define vfs_scannedonly_init init_samba_module
+-_ACEOF
++$as_echo "#define vfs_scannedonly_init init_samba_module" >>confdefs.h
+ 
+ 		VFS_MODULES="$VFS_MODULES "bin/scannedonly.$SHLIBEXT""
+-		{ $as_echo "$as_me:$LINENO: result: shared" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+ $as_echo "shared" >&6; }
+ 
+ 		string_shared_modules="$string_shared_modules vfs_scannedonly"
+@@ -87363,11 +38259,11 @@
+ 		VFS_STATIC="$VFS_STATIC \$(VFS_SCANNEDONLY_OBJ)"
+ 
+ 
+-		{ $as_echo "$as_me:$LINENO: result: static" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+ $as_echo "static" >&6; }
+ 	else
+ 	    string_ignored_modules="$string_ignored_modules vfs_scannedonly"
+-		{ $as_echo "$as_me:$LINENO: result: not" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not" >&5
+ $as_echo "not" >&6; }
+ 	fi
+ 
+@@ -87389,7 +38285,7 @@
  
  
  
@@ -90020,7 +92575,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build perfcount_onefs... " >&6; }
  	if test "$MODULE_perfcount_onefs"; then
  		DEST=$MODULE_perfcount_onefs
-@@ -84313,12 +36933,10 @@
+@@ -87401,12 +38297,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90035,7 +92590,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -84329,16 +36947,16 @@
+@@ -87417,16 +38311,16 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
  
  
@@ -90055,7 +92610,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build perfcount_test... " >&6; }
  	if test "$MODULE_perfcount_test"; then
  		DEST=$MODULE_perfcount_test
-@@ -84350,12 +36968,10 @@
+@@ -87438,12 +38332,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90070,7 +92625,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules perfcount_test"
-@@ -84366,11 +36982,11 @@
+@@ -87454,11 +38346,11 @@
  		PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
  
  
@@ -90084,7 +92639,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -84391,7 +37007,7 @@
+@@ -87479,7 +38371,7 @@
  
  
  
@@ -90093,7 +92648,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build gpext_registry... " >&6; }
  	if test "$MODULE_gpext_registry"; then
  		DEST=$MODULE_gpext_registry
-@@ -84403,12 +37019,10 @@
+@@ -87491,12 +38383,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90108,7 +92663,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_registry"
-@@ -84419,16 +37033,16 @@
+@@ -87507,16 +38397,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
  
  
@@ -90128,7 +92683,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build gpext_scripts... " >&6; }
  	if test "$MODULE_gpext_scripts"; then
  		DEST=$MODULE_gpext_scripts
-@@ -84440,12 +37054,10 @@
+@@ -87528,12 +38418,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90143,7 +92698,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -84456,16 +37068,16 @@
+@@ -87544,16 +38432,16 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
  
  
@@ -90163,7 +92718,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo_n "checking how to build gpext_security... " >&6; }
  	if test "$MODULE_gpext_security"; then
  		DEST=$MODULE_gpext_security
-@@ -84477,12 +37089,10 @@
+@@ -87565,12 +38453,10 @@
  
  	if test x"$DEST" = xSHARED; then
  
@@ -90178,7 +92733,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "shared" >&6; }
  
  		string_shared_modules="$string_shared_modules gpext_security"
-@@ -84493,11 +37103,11 @@
+@@ -87581,11 +38467,11 @@
  		GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
  
  
@@ -90192,7 +92747,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "not" >&6; }
  	fi
  
-@@ -84533,18 +37143,16 @@
+@@ -87621,18 +38507,16 @@
  #################################################
  # If run from the build farm, enable NASTY hacks
  #################################################
@@ -90215,7 +92770,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -84561,11 +37169,11 @@
+@@ -87649,11 +38533,11 @@
      rt_signal_lease_works=yes
      rt_signal_aio_works=yes
  
@@ -90230,7 +92785,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "cross" >&6; }
  
  	    # cross compiling, I hope you know what you are doing
-@@ -84573,11 +37181,7 @@
+@@ -87661,11 +38545,7 @@
  
  
  else
@@ -90243,7 +92798,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -84633,41 +37237,16 @@
+@@ -87724,41 +38604,16 @@
  }
  
  _ACEOF
@@ -90289,7 +92844,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -84678,61 +37257,31 @@
+@@ -87769,61 +38624,31 @@
    return 0;
  }
  _ACEOF
@@ -90328,8 +92883,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  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 "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -90350,15 +92905,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
 -
+-( exit $ac_status )
+ 
 -	    { $as_echo "$as_me:$LINENO: result: no" >&5
 +	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  	    case "$ac_status" in
  		1|11|101|111)  rt_signal_lease_ok=no ;;
-@@ -84746,13 +37295,9 @@
+@@ -87837,13 +38662,9 @@
  
  	    # no RT_SIGNAL bug, we are golden
  
@@ -90374,7 +92929,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  int
-@@ -84763,65 +37308,39 @@
+@@ -87854,65 +38675,39 @@
    return 0;
  }
  _ACEOF
@@ -90413,8 +92968,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  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 "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -90449,7 +93004,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_merged_build;  enable_merged_build=$enableval
  else
     enable_merged_build=auto
-@@ -84830,9 +37349,7 @@
+@@ -87921,9 +38716,7 @@
  
  if test x"$enable_merged_build" = x"yes" -a \
  	x"$merged_build_possible" = x"no" ; then
@@ -90460,10 +93015,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  
  
-@@ -84852,9 +37369,9 @@
- 
- 	# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
- set dummy python$PYTHON_VERSION; ac_word=$2
+@@ -87946,9 +38739,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
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -90472,7 +93027,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -84867,14 +37384,14 @@
+@@ -87961,14 +38754,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -90490,7 +93045,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -84882,17 +37399,17 @@
+@@ -87976,10 +38769,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -90503,7 +93058,51 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
+@@ -87990,9 +38783,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
++if test "${ac_cv_path_PYTHON+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PYTHON in
+@@ -88005,14 +38798,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
  
+   ;;
+@@ -88020,10 +38813,10 @@
+ fi
+ PYTHON=$ac_cv_path_PYTHON
+ if test -n "$PYTHON"; then
+-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+ $as_echo "$PYTHON" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -88031,7 +38824,7 @@
+ 	fi
  	if test -z "$PYTHON"; then
  		working_python=no
 -		{ $as_echo "$as_me:$LINENO: WARNING: No python found" >&5
@@ -90511,7 +93110,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -84903,9 +37420,9 @@
+@@ -88042,9 +38835,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
@@ -90523,7 +93122,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -84918,14 +37435,14 @@
+@@ -88057,14 +38850,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -90541,7 +93140,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -84933,10 +37450,10 @@
+@@ -88072,10 +38865,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -90554,10 +93153,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -84947,9 +37464,9 @@
+@@ -88086,9 +38879,9 @@
  	else
- 		# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
- set dummy python$PYTHON_VERSION-config; ac_word=$2
+ 		# 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
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -90566,7 +93165,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -84962,14 +37479,14 @@
+@@ -88101,14 +38894,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -90584,7 +93183,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -84977,10 +37494,10 @@
+@@ -88116,10 +38909,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -90597,7 +93196,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -84988,7 +37505,7 @@
+@@ -88127,7 +38920,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -90606,7 +93205,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -84998,11 +37515,7 @@
+@@ -88137,11 +38930,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -90618,8 +93217,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85018,42 +37531,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88158,42 +38947,15 @@
    return 0;
  }
  _ACEOF
@@ -90665,7 +93264,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85065,11 +37551,7 @@
+@@ -88205,11 +38967,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -90677,8 +93276,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85085,42 +37567,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88226,42 +38984,15 @@
    return 0;
  }
  _ACEOF
@@ -90724,7 +93323,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85135,11 +37590,7 @@
+@@ -88276,11 +39007,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -90736,8 +93335,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85155,42 +37606,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88297,42 +39024,15 @@
    return 0;
  }
  _ACEOF
@@ -90783,7 +93382,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85202,11 +37626,7 @@
+@@ -88344,11 +39044,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -90795,8 +93394,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85222,42 +37642,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88365,42 +39061,15 @@
    return 0;
  }
  _ACEOF
@@ -90842,7 +93441,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85287,11 +37680,7 @@
+@@ -88430,11 +39099,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -90854,8 +93453,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85307,64 +37696,37 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88451,64 +39116,37 @@
    return 0;
  }
  _ACEOF
@@ -90928,10 +93527,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$merged_build_possible" >&6; }
  
  	# Enable merged build automatically if possible, when in developer mode
-@@ -85417,9 +37779,9 @@
- 
- 	# Extract the first word of "python[$PYTHON_VERSION]", so it can be a program name with args.
- set dummy python$PYTHON_VERSION; ac_word=$2
+@@ -88564,9 +39202,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
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -90940,7 +93539,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON in
-@@ -85432,14 +37794,14 @@
+@@ -88579,14 +39217,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -90958,7 +93557,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -85447,17 +37809,17 @@
+@@ -88594,10 +39232,10 @@
  fi
  PYTHON=$ac_cv_path_PYTHON
  if test -n "$PYTHON"; then
@@ -90971,7 +93570,51 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
+@@ -88608,9 +39246,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PYTHON+set}" = set; then
++if test "${ac_cv_path_PYTHON+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PYTHON in
+@@ -88623,14 +39261,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
  
+   ;;
+@@ -88638,10 +39276,10 @@
+ fi
+ PYTHON=$ac_cv_path_PYTHON
+ if test -n "$PYTHON"; then
+-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+ $as_echo "$PYTHON" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -88649,7 +39287,7 @@
+ 	fi
  	if test -z "$PYTHON"; then
  		working_python=no
 -		{ $as_echo "$as_me:$LINENO: WARNING: No python found" >&5
@@ -90979,7 +93622,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: No python found" >&2;}
  	fi
  
-@@ -85468,9 +37830,9 @@
+@@ -88660,9 +39298,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
@@ -90991,7 +93634,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -85483,14 +37845,14 @@
+@@ -88675,14 +39313,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -91009,7 +93652,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -85498,10 +37860,10 @@
+@@ -88690,10 +39328,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -91022,10 +93665,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -85512,9 +37874,9 @@
+@@ -88704,9 +39342,9 @@
  	else
- 		# Extract the first word of "python[$PYTHON_VERSION]-config", so it can be a program name with args.
- set dummy python$PYTHON_VERSION-config; ac_word=$2
+ 		# 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
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
@@ -91034,7 +93677,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PYTHON_CONFIG in
-@@ -85527,14 +37889,14 @@
+@@ -88719,14 +39357,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -91052,7 +93695,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    ;;
-@@ -85542,10 +37904,10 @@
+@@ -88734,10 +39372,10 @@
  fi
  PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
  if test -n "$PYTHON_CONFIG"; then
@@ -91065,7 +93708,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -85553,7 +37915,7 @@
+@@ -88745,7 +39383,7 @@
  	fi
  
  	if test -z "$PYTHON_CONFIG"; then
@@ -91074,7 +93717,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: No python-config found" >&2;}
  	else
  
-@@ -85563,11 +37925,7 @@
+@@ -88755,11 +39393,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -91086,8 +93729,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85583,42 +37941,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88776,42 +39410,15 @@
    return 0;
  }
  _ACEOF
@@ -91133,7 +93776,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85630,11 +37961,7 @@
+@@ -88823,11 +39430,7 @@
  		LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -91145,8 +93788,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85650,42 +37977,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88844,42 +39447,15 @@
    return 0;
  }
  _ACEOF
@@ -91192,7 +93835,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85700,11 +38000,7 @@
+@@ -88894,11 +39470,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
  
@@ -91204,8 +93847,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85720,42 +38016,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88915,42 +39487,15 @@
    return 0;
  }
  _ACEOF
@@ -91251,7 +93894,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85767,11 +38036,7 @@
+@@ -88962,11 +39507,7 @@
  		LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
  		CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
  
@@ -91263,8 +93906,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85787,42 +38052,15 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -88983,42 +39524,15 @@
    return 0;
  }
  _ACEOF
@@ -91310,7 +93953,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		LIBS="$ac_save_LIBS"
  		CFLAGS="$ac_save_CFLAGS"
  	fi
-@@ -85852,11 +38090,7 @@
+@@ -89048,11 +39562,7 @@
  		LIBS="$LIBS $DISTUTILS_LDFLAGS"
  		CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
  
@@ -91322,8 +93965,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
- 				/* we have our own configure tests */
-@@ -85872,52 +38106,25 @@
+                                 #undef HAVE_UINTPTR_T
+@@ -89069,52 +39579,25 @@
    return 0;
  }
  _ACEOF
@@ -91381,7 +94024,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
  
  
-@@ -85945,20 +38152,18 @@
+@@ -89142,20 +39625,18 @@
  
  
  	else
@@ -91406,10 +94049,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$pythondir" >&6; }
  
  
-@@ -85981,545 +38186,125 @@
+@@ -89170,553 +39651,133 @@
  
  
  
+-	MAKE_SETTINGS="$MAKE_SETTINGS
+-LIBREPLACE_EXT_ENABLE =
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
+-
+-
+-
 -MAKE_SETTINGS="$MAKE_SETTINGS
 -LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
 -LIBREPLACE_NETWORK_CFLAGS =
@@ -91423,7 +94074,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -LIBREPLACE_NETWORK_ENABLE =
 -"
 -SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{LIBREPLACE_NETWORK} = \"\";"
+-\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
 -
 -
 -
@@ -91622,7 +94273,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
++	MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_EXT_ENABLE =
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"LIBREPLACE_EXT\"} = \"\";"
+ 
 -fi
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
@@ -91630,6 +94286,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
+ 
+-fi
+ 
+-done
 +MAKE_SETTINGS="$MAKE_SETTINGS
 +LIBREPLACE_NETWORK_LIBS = ${LIBREPLACE_NETWORK_LIBS}
 +LIBREPLACE_NETWORK_CFLAGS =
@@ -91637,15 +94297,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +LIBREPLACE_NETWORK_LDFLAGS =
 +"
  
--fi
- 
--done
- 
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_NETWORK_ENABLE =
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{LIBREPLACE_NETWORK} = \"\";"
  
 -for ac_header in readline/history.h
 -do
@@ -91698,15 +94349,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -	ac_header_compiler=no
 -fi
++	MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_NETWORK_ENABLE =
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"LIBREPLACE_NETWORK\"} = \"\";"
  
 -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; }
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+LIBREPLACE_CFLAGS = -I../lib/replace
-+LIBREPLACE_ENABLE = YES
-+LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
-+"
  
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -91740,6 +94391,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  ac_header_preproc=no
+-fi
++MAKE_SETTINGS="$MAKE_SETTINGS
++LIBREPLACE_CFLAGS = -I../lib/replace
++LIBREPLACE_ENABLE = YES
++LIBREPLACE_OBJ_FILES = ${LIBREPLACE_OBJS}
++"
+ 
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
 +SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 +###################################
 +# Start Subsystem LIBREPLACE
@@ -91751,14 +94414,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +###################################
 +"
  
--  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; }
-+LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
- 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -91808,13 +94463,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
++LIBREPLACE_HOSTCC_OBJS=`echo ${LIBREPLACE_OBJS} |sed -e 's/\.o/\.ho/g'`
+ 
+-fi
+ 
+-done
 +MAKE_SETTINGS="$MAKE_SETTINGS
 +LIBREPLACE_HOSTCC_CFLAGS = -I../lib/replace
 +LIBREPLACE_HOSTCC_ENABLE = YES
 +LIBREPLACE_HOSTCC_OBJ_FILES = ${LIBREPLACE_HOSTCC_OBJS}
 +"
  
--fi
 +SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 +###################################
 +# Start Subsystem LIBREPLACE_HOSTCC
@@ -91826,24 +94485,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +###################################
 +"
  
--done
  
 +###############################################
 +# Readline included by default unless explicitly asked not to
 +test "${with_readline+set}" != "set" && with_readline=yes
  
-+EXTERNAL_READLINE=no
-+# test for where we get readline() from
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
-+$as_echo_n "checking whether to use readline... " >&6; }
- 
-+# 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:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
 -for ac_header in readline.h readline/readline.h
 -do
 -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -91869,6 +94515,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
++EXTERNAL_READLINE=no
++# test for where we get readline() from
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use readline" >&5
++$as_echo_n "checking whether to use readline... " >&6; }
++
++# 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:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
 +    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`
@@ -92032,7 +94690,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -86537,63 +38322,32 @@
+@@ -89734,63 +39795,32 @@
    return 0;
  }
  _ACEOF
@@ -92107,7 +94765,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -86611,43 +38365,18 @@
+@@ -89808,43 +39838,18 @@
    return 0;
  }
  _ACEOF
@@ -92157,7 +94815,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    TERMLIBS="-lreadline $TERMLIBS"
         EXTERNAL_READLINE=yes
         break
-@@ -86661,11 +38390,11 @@
+@@ -89858,11 +39863,11 @@
  
      ;;
    no)
@@ -92171,7 +94829,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
  
      # Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -86677,151 +38406,12 @@
+@@ -89874,151 +39879,12 @@
      LDFLAGS="-L$with_readline/lib $LDFLAGS"
      CPPFLAGS="-I$with_readline/include $CPPFLAGS"
  
@@ -92329,7 +94987,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -86830,151 +38420,12 @@
+@@ -90027,151 +39893,12 @@
  
  done
  
@@ -92486,7 +95144,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -86982,168 +38433,26 @@
+@@ -90179,168 +39906,26 @@
  done
  
  
@@ -92664,7 +95322,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -87161,63 +38470,32 @@
+@@ -90358,63 +39943,32 @@
    return 0;
  }
  _ACEOF
@@ -92739,7 +95397,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -87235,43 +38513,18 @@
+@@ -90432,43 +39986,18 @@
    return 0;
  }
  _ACEOF
@@ -92789,7 +95447,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    TERMLDFLAGS="-L$with_readline/lib"
         TERMCPPFLAGS="-I$with_readline/include"
         LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -87291,7 +38544,7 @@
+@@ -90488,7 +40017,7 @@
      ;;
    esac
  else
@@ -92798,7 +95456,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -87300,18 +38553,14 @@
+@@ -90497,18 +40026,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.
@@ -92820,10 +95478,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -87329,134 +38578,45 @@
-   return 0;
- }
- _ACEOF
+@@ -90521,142 +40046,53 @@
+ int
+ main ()
+ {
+-return rl_completion_matches ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -92845,38 +95508,31 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_readline_rl_completion_matches=yes
- else
+-  ac_cv_lib_readline_rl_completion_matches=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_lib_readline_rl_completion_matches=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_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
- $as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+-$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
 -if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then
-+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NEW_LIBREADLINE 1
 -_ACEOF
-+$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
- 
- fi
- 
- 
- # not all readline libs have rl_event_hook or history_list
+-
+-fi
+-
+-
+-# 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
@@ -92888,7 +95544,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--#include <readline/readline.h>
+-
+-    #include <stdio.h>
+-    #include <readline/readline.h>
+-
 -
 -int
 -main ()
@@ -92920,39 +95579,61 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_cv_have_decl_rl_event_hook=yes
-+ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
-+"
-+if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
-+  ac_have_decl=1
++return rl_completion_matches ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_readline_rl_completion_matches=yes
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_decl_rl_event_hook=no
-+  ac_have_decl=0
++  ac_cv_lib_readline_rl_completion_matches=no
  fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
 -{ $as_echo "$as_me:$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
--
- cat >>confdefs.h <<_ACEOF
++{ $as_echo "$as_me:${as_lineno-$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 :
+ 
+-cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_RL_EVENT_HOOK 1
 -_ACEOF
--
--
++$as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
+ 
++fi
+ 
 -else
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_RL_EVENT_HOOK 0
-+#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
- _ACEOF
+-_ACEOF
+ 
++# not all readline libs have rl_event_hook or history_list
++ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "
++    #include <stdio.h>
++    #include <readline/readline.h>
+ 
++"
++if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
++  ac_have_decl=1
++else
++  ac_have_decl=0
+ fi
+ 
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl
++_ACEOF
  
--
--fi
--
--
 -{ $as_echo "$as_me:$LINENO: checking for history_list in -lreadline" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
  $as_echo_n "checking for history_list in -lreadline... " >&6; }
@@ -92971,15 +95652,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -87469,65 +38629,36 @@
- int
- main ()
- {
--return history_list ();
--  ;
--  return 0;
--}
--_ACEOF
+@@ -90674,60 +40110,31 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -93001,11 +95677,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+return history_list ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_lib_readline_history_list=yes
  else
@@ -93052,7 +95723,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -87582,7 +38713,7 @@
+@@ -90782,7 +40189,7 @@
  ###################################
  "
  
@@ -93061,7 +95732,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -87591,102 +38722,9 @@
+@@ -90791,102 +40198,9 @@
  
  
  
@@ -93166,7 +95837,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -87695,102 +38733,9 @@
+@@ -90895,102 +40209,9 @@
  
  fi
  
@@ -93271,7 +95942,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
  
  cat >>confdefs.h <<_ACEOF
-@@ -87800,151 +38745,12 @@
+@@ -91000,151 +40221,12 @@
  fi
  
  
@@ -93427,7 +96098,163 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  else
-@@ -87954,30 +38760,6 @@
+@@ -91154,151 +40236,12 @@
+ done
+ 
+ 
+-
+ for ac_header in ifaddrs.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
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
++if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_IFADDRS_H 1
+ _ACEOF
+ 
+ else
+@@ -91308,29 +40251,6 @@
  done
  
  
@@ -93453,12 +96280,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
 -
 -
--
 -
  for ac_header in 				\
  	crypt.h					\
  	curses.h				\
-@@ -88004,147 +38786,11 @@
+@@ -91356,147 +40276,11 @@
  	netinet6/in6.h				\
  	libintl.h
  
@@ -93611,7 +96437,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -88154,42 +38800,6 @@
+@@ -91506,42 +40290,6 @@
  done
  
  
@@ -93654,10 +96480,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  for ac_func in 				\
  	atexit					\
  	cgetent					\
-@@ -88228,98 +38838,11 @@
- 	freehostent				\
- 	writev
- 
+@@ -91574,271 +40322,65 @@
+ 	warn					\
+ 	errx					\
+ 	warnx					\
+-	flock					\
+-	getipnodebyname				\
+-	getipnodebyaddr				\
+-	freehostent				\
+-	writev
+-
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -93750,36 +96582,150 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+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
-@@ -88330,17 +38853,13 @@
- 
- 
- 
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking for bswap16" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap16" >&5
- $as_echo_n "checking for bswap16... " >&6; }
+-$as_echo_n "checking for bswap16... " >&6; }
 -if test "${ac_cv_love_func_bswap16+set}" = set; then
-+if test "${ac_cv_love_func_bswap16+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.  */
+-#ifdef HAVE_SYS_BSWAP_H
+-#include <sys/bswap.h>
+-#endif
+-int
+-main ()
+-{
+-bswap16(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 "ac_cv_love_func_bswap16=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++	flock					\
++	getipnodebyname				\
++	getipnodebyaddr				\
++	freehostent				\
++	writev
+ 
+-	eval "ac_cv_love_func_bswap16=no"
+-fi
++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 -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
++done
+ 
+ 
+-eval "ac_res=\$ac_cv_love_func_bswap16"
+ 
+-if false; then
+ 
+-for ac_func in bswap16
+-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 bswap16" >&5
++$as_echo_n "checking for bswap16... " >&6; }
++if test "${ac_cv_love_func_bswap16+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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef HAVE_SYS_BSWAP_H
- #include <sys/bswap.h>
-@@ -88353,140 +38872,25 @@
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
+ #endif
+-
+ int
+ main ()
+ {
+-return $ac_func ();
++bswap16(0)
+   ;
    return 0;
  }
  _ACEOF
@@ -93804,13 +96750,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
+-  eval "$as_ac_var=yes"
 +if ac_fn_c_try_link "$LINENO"; then :
-   eval "ac_cv_love_func_bswap16=yes"
++  eval "ac_cv_love_func_bswap16=yes"
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--	eval "ac_cv_love_func_bswap16=no"
+-	eval "$as_ac_var=no"
 +  eval "ac_cv_love_func_bswap16=no"
  fi
 -
@@ -93820,98 +96767,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  fi
- 
- 
- eval "ac_res=\$ac_cv_love_func_bswap16"
- 
- if false; then
--
--for ac_func in bswap16
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
@@ -93919,6 +96774,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++
++
++eval "ac_res=\$ac_cv_love_func_bswap16"
++
++if false; then
 +	for ac_func in bswap16
 +do :
 +  ac_fn_c_check_func "$LINENO" "bswap16" "ac_cv_func_bswap16"
@@ -93929,7 +96789,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -88502,11 +38906,11 @@
+@@ -91854,11 +40396,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -93943,7 +96803,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -88516,17 +38920,13 @@
+@@ -91868,17 +40410,13 @@
  
  
  
@@ -93964,7 +96824,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_BSWAP_H
  #include <sys/bswap.h>
-@@ -88539,140 +38939,25 @@
+@@ -91891,140 +40429,25 @@
    return 0;
  }
  _ACEOF
@@ -93996,17 +96856,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "ac_cv_love_func_bswap32=no"
--fi
++  eval "ac_cv_love_func_bswap32=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
--
--
--eval "ac_res=\$ac_cv_love_func_bswap32"
--
--if false; then
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ 
+ eval "ac_res=\$ac_cv_love_func_bswap32"
+ 
+ if false; then
 -
 -for ac_func in bswap32
 -do
@@ -94088,15 +96951,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	eval "$as_ac_var=no"
-+  eval "ac_cv_love_func_bswap32=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_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
@@ -94104,11 +96964,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+
-+
-+eval "ac_res=\$ac_cv_love_func_bswap32"
-+
-+if false; then
 +	for ac_func in bswap32
 +do :
 +  ac_fn_c_check_func "$LINENO" "bswap32" "ac_cv_func_bswap32"
@@ -94119,7 +96974,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -88688,11 +38973,11 @@
+@@ -92040,11 +40463,11 @@
  #define $ac_tr_func 1
  _ACEOF
  
@@ -94133,7 +96988,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  	;;
  esac
-@@ -88703,25 +38988,21 @@
+@@ -92055,25 +40478,21 @@
  
  
  
@@ -94163,7 +97018,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    ac_cv_struct_winsize=yes; break
  fi
  rm -f conftest*
-@@ -88731,63 +39012,45 @@
+@@ -92083,63 +40502,45 @@
  
  if test "$ac_cv_struct_winsize" = "yes"; then
  
@@ -94238,7 +97093,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
-@@ -88800,35 +39063,14 @@
+@@ -92152,35 +40553,14 @@
    return 0;
  }
  _ACEOF
@@ -94277,7 +97132,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_cv_type_signal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
-@@ -88838,9 +39080,7 @@
+@@ -92190,9 +40570,7 @@
  
  if test "$ac_cv_type_signal" = "void" ; then
  
@@ -94288,7 +97143,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -88871,18 +39111,14 @@
+@@ -92223,18 +40601,14 @@
  
  
  
@@ -94310,7 +97165,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
-@@ -88899,44 +39135,15 @@
+@@ -92251,44 +40625,15 @@
    return 0;
  }
  _ACEOF
@@ -94360,7 +97215,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  extern int h_errno;
  int foo(void) { return h_errno; }
-@@ -88948,44 +39155,19 @@
+@@ -92300,44 +40645,19 @@
    return 0;
  }
  _ACEOF
@@ -94410,7 +97265,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$ac_foo" >&6; }
  if test "$ac_foo" = yes; then
  
-@@ -88993,85 +39175,26 @@
+@@ -92345,81 +40665,23 @@
  #define HAVE_H_ERRNO 1
  _ACEOF
  
@@ -94471,15 +97326,15 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_have_decl_h_errno=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +  ac_have_decl=0
  fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_h_errno" >&5
 -$as_echo "$ac_cv_have_decl_h_errno" >&6; }
 -if test "x$ac_cv_have_decl_h_errno" = x""yes; then
- 
+-
  cat >>confdefs.h <<_ACEOF
 -#define HAVE_DECL_H_ERRNO 1
 -_ACEOF
@@ -94491,1487 +97346,6 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +#define HAVE_DECL_H_ERRNO $ac_have_decl
  _ACEOF
  
--
- fi
- 
- 
--fi
--
--
--
- 
- 
- 
-@@ -89092,17 +39215,12 @@
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
- $as_echo_n "checking for openpty in -lutil... " >&6; }
--if test "${ac_cv_lib_ext_util_openpty+set}" = set; then
-+if test "${ac_cv_lib_ext_util_openpty+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -89120,54 +39238,28 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_ext_util_openpty=yes;
- 		  ac_cv_lib_ext_util=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_util_openpty=no;
-+  ac_cv_lib_ext_util_openpty=no;
- 		  ac_cv_lib_ext_util=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_exeext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_util_openpty" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_util_openpty" >&5
- $as_echo "$ac_cv_lib_ext_util_openpty" >&6; }
--    if test $ac_cv_lib_ext_util_openpty = yes; then
-+    if test $ac_cv_lib_ext_util_openpty = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_OPENPTY 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_util = yes; then
-+if test $ac_cv_lib_ext_util = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBUTIL 1
- _ACEOF
-@@ -89184,7 +39276,6 @@
- fi
- 
- 
--
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- OPENPTY_ENABLE = YES
- "
-@@ -89204,23 +39295,17 @@
- 
- 
- 
--
- ac_check_lib_ext_save_LIBS=$LIBS
- LIBS="-lintl $INTL_LIBS  $LIBS"
- 
- 
- 
--
--        { $as_echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
- $as_echo_n "checking for gettext in -lintl... " >&6; }
--if test "${ac_cv_lib_ext_intl_gettext+set}" = set; then
-+if test "${ac_cv_lib_ext_intl_gettext+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.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -89238,54 +39323,28 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_ext_intl_gettext=yes;
- 		  ac_cv_lib_ext_intl=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_ext_intl_gettext=no;
-+  ac_cv_lib_ext_intl_gettext=no;
- 		  ac_cv_lib_ext_intl=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_exeext conftest.$ac_ext
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_intl_gettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_intl_gettext" >&5
- $as_echo "$ac_cv_lib_ext_intl_gettext" >&6; }
--    if test $ac_cv_lib_ext_intl_gettext = yes; then
-+    if test $ac_cv_lib_ext_intl_gettext = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_GETTEXT 1
- _ACEOF
- 
- fi
--
- LIBS=$ac_check_lib_ext_save_LIBS
- 
--if test $ac_cv_lib_ext_intl = yes; then
-+if test $ac_cv_lib_ext_intl = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBINTL 1
- _ACEOF
-@@ -89302,7 +39361,6 @@
- fi
- 
- 
--
- 	MAKE_SETTINGS="$MAKE_SETTINGS
- INTL_ENABLE = YES
- "
-@@ -89326,151 +39384,12 @@
- 
- 
- 
--
- for ac_header in arpa/nameser.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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "$ac_includes_default"
-+if test "x$ac_cv_header_arpa_nameser_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_ARPA_NAMESER_H 1
- _ACEOF
- 
- fi
-@@ -89478,22 +39397,9 @@
- done
- 
- 
--
- for ac_header in resolv.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $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
--  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
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-@@ -89504,46 +39410,10 @@
- #include <arpa/nameser.h>
- #endif
- 
--
--#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
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--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; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+"
-+if test "x$ac_cv_header_resolv_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_RESOLV_H 1
- _ACEOF
- 
- fi
-@@ -89555,9 +39425,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_search" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search" >&5
- $as_echo_n "checking for res_search... " >&6; }
--if test "${ac_cv_funclib_res_search+set}" = set; then
-+if test "${ac_cv_funclib_res_search+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -89572,11 +39442,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_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.  */
- 
- #include <stdio.h>
-@@ -89601,38 +39467,11 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -89644,102 +39483,12 @@
- eval "ac_res=\$ac_cv_funclib_res_search"
- 
- if false; then
--
--for ac_func in res_search
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
-+	for ac_func in res_search
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-+if test "x$ac_cv_func_res_search" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_SEARCH 1
- _ACEOF
- 
- fi
-@@ -89759,13 +39508,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_search=no"
- 	eval "LIB_res_search="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -89779,7 +39528,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -89794,9 +39543,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_nsearch" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch" >&5
- $as_echo_n "checking for res_nsearch... " >&6; }
--if test "${ac_cv_funclib_res_nsearch+set}" = set; then
-+if test "${ac_cv_funclib_res_nsearch+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -89811,11 +39560,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_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.  */
- 
- #include <stdio.h>
-@@ -89840,38 +39585,11 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_nsearch=$ac_lib; else ac_cv_funclib_res_nsearch=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -89883,102 +39601,12 @@
- eval "ac_res=\$ac_cv_funclib_res_nsearch"
- 
- if false; then
--
--for ac_func in res_nsearch
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
-+	for ac_func in res_nsearch
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
-+if test "x$ac_cv_func_res_nsearch" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_NSEARCH 1
- _ACEOF
- 
- fi
-@@ -89998,13 +39626,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_nsearch=no"
- 	eval "LIB_res_nsearch="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -90018,7 +39646,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -90033,9 +39661,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for res_ndestroy" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5
- $as_echo_n "checking for res_ndestroy... " >&6; }
--if test "${ac_cv_funclib_res_ndestroy+set}" = set; then
-+if test "${ac_cv_funclib_res_ndestroy+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -90050,11 +39678,7 @@
- 		*) ac_lib="-l$ac_lib" ;;
- 		esac
- 		LIBS=" $ac_lib  $ac_save_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.  */
- 
- #include <stdio.h>
-@@ -90079,38 +39703,11 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_ndestroy=$ac_lib; else ac_cv_funclib_res_ndestroy=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
- 	done
- 	eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
- 	LIBS="$ac_save_LIBS"
-@@ -90122,102 +39719,12 @@
- eval "ac_res=\$ac_cv_funclib_res_ndestroy"
- 
- if false; then
--
--for ac_func in res_ndestroy
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
-+	for ac_func in res_ndestroy
-+do :
-+  ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
-+if test "x$ac_cv_func_res_ndestroy" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_RES_NDESTROY 1
- _ACEOF
- 
- fi
-@@ -90237,13 +39744,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_res_ndestroy=no"
- 	eval "LIB_res_ndestroy="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -90257,7 +39764,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -90272,9 +39779,9 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for dn_expand" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand" >&5
- $as_echo_n "checking for dn_expand... " >&6; }
--if test "${ac_cv_funclib_dn_expand+set}" = set; then
-+if test "${ac_cv_funclib_dn_expand+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -90287,176 +39794,55 @@
- 		no) continue ;;
- 		-l*) ;;
- 		*) ac_lib="-l$ac_lib" ;;
--		esac
--		LIBS=" $ac_lib  $ac_save_LIBS"
--		cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--#ifdef HAVE_NETINET_IN_H
--#include <netinet/in.h>
--#endif
--#ifdef HAVE_ARPA_NAMESER_H
--#include <arpa/nameser.h>
--#endif
--#ifdef HAVE_RESOLV_H
--#include <resolv.h>
--#endif
--
--int
--main ()
--{
--dn_expand(0,0,0,0,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 "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--	done
--	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
--	LIBS="$ac_save_LIBS"
--fi
--
--fi
--
--
--eval "ac_res=\$ac_cv_funclib_dn_expand"
--
--if false; then
--
--for ac_func in dn_expand
--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
-+		esac
-+		LIBS=" $ac_lib  $ac_save_LIBS"
-+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
- #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"
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
- #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
-+#ifdef HAVE_ARPA_NAMESER_H
-+#include <arpa/nameser.h>
-+#endif
-+#ifdef HAVE_RESOLV_H
-+#include <resolv.h>
- #endif
- 
- int
- main ()
- {
--return $ac_func ();
-+dn_expand(0,0,0,0,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"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+	done
-+	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
-+	LIBS="$ac_save_LIBS"
- 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
-+
-+
-+eval "ac_res=\$ac_cv_funclib_dn_expand"
-+
-+if false; then
-+	for ac_func in dn_expand
-+do :
-+  ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
-+if test "x$ac_cv_func_dn_expand" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_DN_EXPAND 1
- _ACEOF
- 
- fi
-@@ -90476,13 +39862,13 @@
- #define $ac_tr_func 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	;;
- 	no)
- 	eval "ac_cv_func_dn_expand=no"
- 	eval "LIB_dn_expand="
--	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 	;;
- 	*)
-@@ -90496,7 +39882,7 @@
- #define $ac_tr_lib 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
- $as_echo "yes, in $ac_res" >&6; }
- 	;;
- esac
-@@ -90508,18 +39894,14 @@
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for _res" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _res" >&5
- $as_echo_n "checking for _res... " >&6; }
--if test "${ac_cv_var__res+set}" = set; then
-+if test "${ac_cv_var__res+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.  */
- #include <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
-@@ -90543,44 +39925,15 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_var__res=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var__res=no
-+  ac_cv_var__res=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_exeext conftest.$ac_ext
- if test "$ac_cv_var__res" != yes ; then
--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.  */
- extern int _res;
- int foo(void) { return _res; }
-@@ -90592,44 +39945,19 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_var__res=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_var__res=no
-+  ac_cv_var__res=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_exeext conftest.$ac_ext
- fi
- 
- fi
- 
- ac_foo=`eval echo \\$ac_cv_var__res`
--{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
- $as_echo "$ac_foo" >&6; }
- if test "$ac_foo" = yes; then
- 
-@@ -90637,18 +39965,7 @@
- #define HAVE__RES 1
- _ACEOF
- 
--	{ $as_echo "$as_me:$LINENO: checking whether _res is declared" >&5
--$as_echo_n "checking whether _res is declared... " >&6; }
--if test "${ac_cv_have_decl__res+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 <stdio.h>
-+	ac_fn_c_check_decl "$LINENO" "_res" "ac_cv_have_decl__res" "#include <stdio.h>
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-@@ -90661,64 +39978,17 @@
- #ifdef HAVE_RESOLV_H
- #include <resolv.h>
- #endif
--
--int
--main ()
--{
--#ifndef _res
--  (void) _res;
--#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
--  ac_cv_have_decl__res=yes
-+"
-+if test "x$ac_cv_have_decl__res" = x""yes; then :
-+  ac_have_decl=1
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_have_decl__res=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_have_decl=0
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__res" >&5
--$as_echo "$ac_cv_have_decl__res" >&6; }
--if test "x$ac_cv_have_decl__res" = x""yes; then
- 
- cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL__RES 1
--_ACEOF
--
--
--else
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DECL__RES 0
-+#define HAVE_DECL__RES $ac_have_decl
- _ACEOF
- 
 -
 -fi
 -
@@ -95979,1801 +97353,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  
  
-@@ -90784,9 +40054,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_LEX+set}" = set; then
-+if test "${ac_cv_prog_LEX+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$LEX"; then
-@@ -90797,24 +40067,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_LEX="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
+@@ -92435,151 +40697,12 @@
  
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; then
--  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
- $as_echo "$LEX" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
  
-@@ -90843,20 +40113,20 @@
-   return ! yylex () + ! yywrap ();
- }
- _ACEOF
--{ (ac_try="$LEX conftest.l"
-+{ { ac_try="$LEX conftest.l"
- 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$LEX conftest.l") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
- $as_echo_n "checking lex output file root... " >&6; }
--if test "${ac_cv_prog_lex_root+set}" = set; then
-+if test "${ac_cv_prog_lex_root+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -90865,19 +40135,17 @@
- elif test -f lexyy.c; then
-   ac_cv_prog_lex_root=lexyy
- else
--  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
--$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
- $as_echo "$ac_cv_prog_lex_root" >&6; }
- LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
- 
- if test -z "${LEXLIB+set}"; then
--  { $as_echo "$as_me:$LINENO: checking lex library" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
- $as_echo_n "checking lex library... " >&6; }
--if test "${ac_cv_lib_lex+set}" = set; then
-+if test "${ac_cv_lib_lex+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -90885,55 +40153,29 @@
-     ac_cv_lib_lex='none needed'
-     for ac_lib in '' -lfl -ll; do
-       LIBS="$ac_lib $ac_save_LIBS"
--      cat >conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- `cat $LEX_OUTPUT_ROOT.c`
- _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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_lex=$ac_lib
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
-       test "$ac_cv_lib_lex" != 'none needed' && break
-     done
-     LIBS=$ac_save_LIBS
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
- $as_echo "$ac_cv_lib_lex" >&6; }
-   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
- $as_echo_n "checking whether yytext is a pointer... " >&6; }
--if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -90942,52 +40184,24 @@
- ac_cv_prog_lex_yytext_pointer=no
- ac_save_LIBS=$LIBS
- LIBS="$LEXLIB $ac_save_LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- #define YYTEXT_POINTER 1
- `cat $LEX_OUTPUT_ROOT.c`
- _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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_prog_lex_yytext_pointer=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
- LIBS=$ac_save_LIBS
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
- $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
- if test $ac_cv_prog_lex_yytext_pointer = yes; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define YYTEXT_POINTER 1
--_ACEOF
-+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
- 
- fi
- rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -90997,9 +40211,9 @@
- if test x"$LEX_BASENAME" = x"flex"; then
- 	# "flex 2.5.33"
- 	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
--	{ $as_echo "$as_me:$LINENO: checking flex version" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking flex version" >&5
- $as_echo_n "checking flex version... " >&6; }
--	{ $as_echo "$as_me:$LINENO: result: $FLEX_VERSION" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX_VERSION" >&5
- $as_echo "$FLEX_VERSION" >&6; }
- 	FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
- 	FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -91012,9 +40226,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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_YACC+set}" = set; then
-+if test "${ac_cv_prog_YACC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$YACC"; then
-@@ -91025,24 +40239,24 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_YACC="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
--  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
- $as_echo "$YACC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -91055,9 +40269,9 @@
- if test x"$YACC_BASENAME" = x"bison -y"; then
- 	# bison (GNU Bison) 2.3
- 	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
--	{ $as_echo "$as_me:$LINENO: checking bison version" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking bison version" >&5
- $as_echo_n "checking bison version... " >&6; }
--	{ $as_echo "$as_me:$LINENO: result: $BISON_VERSION" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON_VERSION" >&5
- $as_echo "$BISON_VERSION" >&6; }
- 	BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
- 	BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -91065,7 +40279,7 @@
- 	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking working LEX YACC combination" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working LEX YACC combination" >&5
- $as_echo_n "checking working LEX YACC combination... " >&6; }
- LEX_YACC="no"
- if test x"$LEX_VERSION" != x"" -a x"$YACC_VERSION" != x""; then
-@@ -91081,7 +40295,7 @@
- 	LEX=false
- 	YACC=false
- fi
--{ $as_echo "$as_me:$LINENO: result: $LEX_YACC" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX_YACC" >&5
- $as_echo "$LEX_YACC" >&6; }
- 
- # Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -91089,21 +40303,15 @@
- 
- # if we ever get to using a host kerberos, we might add conditionals here
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_COM_ERR 1
--_ACEOF
-+$as_echo "#define HAVE_COM_ERR 1" >>confdefs.h
- 
- HAVE_COM_ERR=YES
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_KRB5 1
--_ACEOF
-+$as_echo "#define HAVE_KRB5 1" >>confdefs.h
- 
- HAVE_KRB5=YES
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GSSAPI 1
--_ACEOF
-+$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
- 
- HAVE_GSSAPI=YES
- 
-@@ -91195,9 +40403,7 @@
- VPATH="$VPATH:\$(HEIMDAL_VPATH)"
- 
- 
--cat >>confdefs.h <<\_ACEOF
--#define SAMBA4_INTERNAL_HEIMDAL 1
--_ACEOF
-+$as_echo "#define SAMBA4_INTERNAL_HEIMDAL 1" >>confdefs.h
- 
- 
- 
-@@ -91206,170 +40412,27 @@
- "
- 
- 
--
- for ac_header in execinfo.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
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-+if test "x$ac_cv_header_execinfo_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_EXECINFO_H 1
- _ACEOF
- 
- fi
- 
- done
- 
--{ $as_echo "$as_me:$LINENO: checking for library containing backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
- $as_echo_n "checking for library containing backtrace... " >&6; }
--if test "${ac_cv_search_ext_backtrace+set}" = set; then
-+if test "${ac_cv_search_ext_backtrace+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
- ac_func_search_ext_save_LIBS=$LIBS
- ac_cv_search_ext_backtrace=no
--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.
-@@ -91387,46 +40450,15 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_search_ext_backtrace="none required"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
- if test "$ac_cv_search_ext_backtrace" = no; then
-   for ac_lib in execinfo; do
-     LIBS="-l$ac_lib $EXECINFO_LIBS  $ac_func_search_save_ext_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.
-@@ -91444,65 +40476,32 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_search_ext_backtrace="-l$ac_lib"
- break
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- 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 conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_ext_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ext_backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_backtrace" >&5
- $as_echo "$ac_cv_search_ext_backtrace" >&6; }
--if test "$ac_cv_search_ext_backtrace" != no; then
-+if test "$ac_cv_search_ext_backtrace" != no; then :
-   test "$ac_cv_search_ext_backtrace" = "none required" || EXECINFO_LIBS="$ac_cv_search_ext_backtrace $EXECINFO_LIBS"
- 
- fi
- 
- 
--
--
-     ac_check_func_ext_save_LIBS=$LIBS
-     LIBS="$EXECINFO_LIBS $LIBS"
--        { $as_echo "$as_me:$LINENO: checking for backtrace" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace" >&5
- $as_echo_n "checking for backtrace... " >&6; }
--if test "${ac_cv_func_ext_backtrace+set}" = set; then
-+if test "${ac_cv_func_ext_backtrace+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 backtrace to an innocuous variant, in case <limits.h> declares backtrace.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -91543,43 +40542,18 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_func_ext_backtrace=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_ext_backtrace=no
-+  ac_cv_func_ext_backtrace=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_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_backtrace" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_backtrace" >&5
- $as_echo "$ac_cv_func_ext_backtrace" >&6; }
-     LIBS=$ac_check_func_ext_save_LIBS
--    if test $ac_cv_func_ext_backtrace = yes; then
-+    if test $ac_cv_func_ext_backtrace = yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_BACKTRACE 1
- _ACEOF
-@@ -91587,7 +40561,6 @@
- fi
- 
- 
--
- if test x"$ac_cv_header_execinfo_h" = x"yes" -a x"$ac_cv_func_ext_backtrace" = x"yes";then
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -91619,102 +40592,12 @@
- 
- 
- 
--
--
--
- for ac_func in sigprocmask sigblock sigaction
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
-+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
-@@ -91723,102 +40606,12 @@
- done
- 
- 
--
- for ac_func in setsid
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
--
--	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
-+do :
-+  ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
-+if test "x$ac_cv_func_setsid" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_SETSID 1
- _ACEOF
- 
- fi
-@@ -91827,221 +40620,33 @@
- 
- #################################################
- # these tests are taken from the GNU fileutils package
--{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
--$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
--
--
--
--for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.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
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--for ac_header in sys/mount.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $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
--  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
--#ifdef HAVE_SYS_PARAM_H
--#include <sys/param.h>
--#endif
--
--#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
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
-+$as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
-+for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.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_Header=no"
- fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--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; }
--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/mount.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+"
-+if test "x$ac_cv_header_sys_mount_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SYS_MOUNT_H 1
- _ACEOF
- 
- fi
-@@ -92054,19 +40659,15 @@
- # Test for statvfs64.
- if test $space = no; then
-   # SVR4
--  { $as_echo "$as_me:$LINENO: checking statvfs64 function (SVR4)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs64 function (SVR4)" >&5
- $as_echo_n "checking statvfs64 function (SVR4)... " >&6; }
--if test "${fu_cv_sys_stat_statvfs64+set}" = set; then
-+if test "${fu_cv_sys_stat_statvfs64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statvfs64=cross
- 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.  */
- 
- #if defined(HAVE_UNISTD_H)
-@@ -92080,51 +40681,22 @@
-     exit (statvfs64 (".", &fsd));
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statvfs64=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statvfs64=no
-+  fu_cv_sys_stat_statvfs64=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_statvfs64" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs64" >&5
- $as_echo "$fu_cv_sys_stat_statvfs64" >&6; }
-   if test $fu_cv_sys_stat_statvfs64 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATVFS64 1
--_ACEOF
-+$as_echo "#define STAT_STATVFS64 1" >>confdefs.h
- 
-   fi
- fi
-@@ -92137,16 +40709,12 @@
- # is what it gets when this test fails.
- if test $space = no; then
-   # SVR4
--  { $as_echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs function (SVR4)" >&5
- $as_echo_n "checking statvfs function (SVR4)... " >&6; }
--if test "${fu_cv_sys_stat_statvfs+set}" = set; then
-+if test "${fu_cv_sys_stat_statvfs+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.  */
- #include <sys/types.h>
- #include <sys/statvfs.h>
-@@ -92158,64 +40726,33 @@
-   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
-+if ac_fn_c_try_link "$LINENO"; then :
-   fu_cv_sys_stat_statvfs=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	fu_cv_sys_stat_statvfs=no
-+  fu_cv_sys_stat_statvfs=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_exeext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5
- $as_echo "$fu_cv_sys_stat_statvfs" >&6; }
-   if test $fu_cv_sys_stat_statvfs = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATVFS 1
--_ACEOF
-+$as_echo "#define STAT_STATVFS 1" >>confdefs.h
- 
-   fi
- fi
- 
- # fsusage.c assumes that statvfs has an f_frsize entry. Some weird
- # systems use f_bsize.
--{ $as_echo "$as_me:$LINENO: checking that statvfs.f_frsize works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.f_frsize works" >&5
- $as_echo_n "checking that statvfs.f_frsize works... " >&6; }
--if test "${samba_cv_frsize+set}" = set; then
-+if test "${samba_cv_frsize+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.  */
- #include <sys/types.h>
- #include <sys/statvfs.h>
-@@ -92227,59 +40764,32 @@
-   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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   samba_cv_frsize=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	samba_cv_frsize=no
-+  samba_cv_frsize=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $samba_cv_frsize" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_frsize" >&5
- $as_echo "$samba_cv_frsize" >&6; }
- if test x"$samba_cv_frsize" = x"yes"; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_FRSIZE 1
--_ACEOF
-+$as_echo "#define HAVE_FRSIZE 1" >>confdefs.h
- 
- fi
- 
- if test $space = no; then
-   # DEC Alpha running OSF/1
--  { $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5
- $as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs3_osf1=no
- 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 <sys/param.h>
-@@ -92292,71 +40802,38 @@
-     exit (statfs (".", &fsd, sizeof (struct statfs)));
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs3_osf1=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs3_osf1=no
-+  fu_cv_sys_stat_statfs3_osf1=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5
- $as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; }
-   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS3_OSF1 1
--_ACEOF
-+$as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # AIX
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
- $as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs2_bsize=no
- 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.  */
- 
- #ifdef HAVE_SYS_PARAM_H
-@@ -92375,71 +40852,38 @@
-   exit (statfs (".", &fsd));
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs2_bsize=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs2_bsize=no
-+  fu_cv_sys_stat_statfs2_bsize=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5
- $as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; }
-   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_BSIZE 1
--_ACEOF
-+$as_echo "#define STAT_STATFS2_BSIZE 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # SVR3
--  { $as_echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
- $as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs4+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs4+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs4=no
- 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 <sys/types.h>
- #include <sys/statfs.h>
-@@ -92449,71 +40893,38 @@
-   exit (statfs (".", &fsd, sizeof fsd, 0));
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs4=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs4=no
-+  fu_cv_sys_stat_statfs4=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5
- $as_echo "$fu_cv_sys_stat_statfs4" >&6; }
-   if test $fu_cv_sys_stat_statfs4 = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS4 1
--_ACEOF
-+$as_echo "#define STAT_STATFS4 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
- # 4.4BSD and NetBSD
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
- $as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
--  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
-+  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_statfs2_fsize=no
- 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 <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -92529,71 +40940,38 @@
-   exit (statfs (".", &fsd));
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_statfs2_fsize=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_statfs2_fsize=no
-+  fu_cv_sys_stat_statfs2_fsize=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5
- $as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; }
-   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_FSIZE 1
--_ACEOF
-+$as_echo "#define STAT_STATFS2_FSIZE 1" >>confdefs.h
- 
-   fi
- fi
- 
- if test $space = no; then
-   # Ultrix
--  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
- $as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
--  if test "${fu_cv_sys_stat_fs_data+set}" = set; then
-+  if test "${fu_cv_sys_stat_fs_data+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   fu_cv_sys_stat_fs_data=no
- 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 <sys/types.h>
- #ifdef HAVE_SYS_PARAM_H
-@@ -92613,201 +40991,33 @@
-   exit (statfs (".", &fsd) != 1);
-   }
- _ACEOF
--rm -f 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>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (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_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   fu_cv_sys_stat_fs_data=yes
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--fu_cv_sys_stat_fs_data=no
-+  fu_cv_sys_stat_fs_data=no
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+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:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_fs_data" >&5
- $as_echo "$fu_cv_sys_stat_fs_data" >&6; }
-   if test $fu_cv_sys_stat_fs_data = yes; then
-     space=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define STAT_STATFS2_FS_DATA 1
--_ACEOF
-+$as_echo "#define STAT_STATFS2_FS_DATA 1" >>confdefs.h
- 
-   fi
- fi
  
 -
 -
 -
- for ac_header in sys/attributes.h attr/xattr.h sys/xattr.h
+ for ac_header in pty.h util.h libutil.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
@@ -97923,7 +97510,3639 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -92816,19 +41026,15 @@
+@@ -92591,23 +40714,17 @@
+ 
+ 
+ 
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lutil $OPENPTY_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+ $as_echo_n "checking for openpty in -lutil... " >&6; }
+-if test "${ac_cv_lib_ext_util_openpty+set}" = set; then
++if test "${ac_cv_lib_ext_util_openpty+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -92625,54 +40742,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_util_openpty=yes;
+ 		  ac_cv_lib_ext_util=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_util_openpty=no;
++  ac_cv_lib_ext_util_openpty=no;
+ 		  ac_cv_lib_ext_util=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_util_openpty" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_util_openpty" >&5
+ $as_echo "$ac_cv_lib_ext_util_openpty" >&6; }
+-    if test $ac_cv_lib_ext_util_openpty = yes; then
++    if test $ac_cv_lib_ext_util_openpty = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_OPENPTY 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_util = yes; then
++if test $ac_cv_lib_ext_util = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBUTIL 1
+ _ACEOF
+@@ -92689,7 +40780,6 @@
+ fi
+ 
+ 
+-
+ 	MAKE_SETTINGS="$MAKE_SETTINGS
+ OPENPTY_ENABLE = YES
+ "
+@@ -92709,23 +40799,17 @@
+ 
+ 
+ 
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lintl $INTL_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for gettext in -lintl" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettext in -lintl" >&5
+ $as_echo_n "checking for gettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_ext_intl_gettext+set}" = set; then
++if test "${ac_cv_lib_ext_intl_gettext+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -92743,54 +40827,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_intl_gettext=yes;
+ 		  ac_cv_lib_ext_intl=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_intl_gettext=no;
++  ac_cv_lib_ext_intl_gettext=no;
+ 		  ac_cv_lib_ext_intl=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_intl_gettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_intl_gettext" >&5
+ $as_echo "$ac_cv_lib_ext_intl_gettext" >&6; }
+-    if test $ac_cv_lib_ext_intl_gettext = yes; then
++    if test $ac_cv_lib_ext_intl_gettext = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETTEXT 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_intl = yes; then
++if test $ac_cv_lib_ext_intl = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBINTL 1
+ _ACEOF
+@@ -92807,7 +40865,6 @@
+ fi
+ 
+ 
+-
+ 	MAKE_SETTINGS="$MAKE_SETTINGS
+ INTL_ENABLE = YES
+ "
+@@ -92831,150 +40888,12 @@
+ 
+ 
+ 
+-
+-
+ for ac_header in arpa/nameser.h dns.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
++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
+@@ -92984,22 +40903,9 @@
+ done
+ 
+ 
+-
+ for ac_header in resolv.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $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
+-  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
++do :
++  ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "$ac_includes_default
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+@@ -93010,46 +40916,10 @@
+ #include <arpa/nameser.h>
+ #endif
+ 
+-
+-#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
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++"
++if test "x$ac_cv_header_resolv_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_RESOLV_H 1
+ _ACEOF
+ 
+ fi
+@@ -93061,9 +40931,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for res_search" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search" >&5
+ $as_echo_n "checking for res_search... " >&6; }
+-if test "${ac_cv_funclib_res_search+set}" = set; then
++if test "${ac_cv_funclib_res_search+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -93078,11 +40948,7 @@
+ 		*) ac_lib="-l$ac_lib" ;;
+ 		esac
+ 		LIBS=" $ac_lib  $ac_save_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.  */
+ 
+ #include <stdio.h>
+@@ -93104,148 +40970,31 @@
+ {
+ res_search(0,0,0,0,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 "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-	done
+-	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+-	LIBS="$ac_save_LIBS"
+-fi
+-
+-fi
+-
+-
+-eval "ac_res=\$ac_cv_funclib_res_search"
+-
+-if false; then
+-
+-for ac_func in res_search
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	eval "$as_ac_var=no"
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
++	LIBS="$ac_save_LIBS"
+ 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
++
++
++eval "ac_res=\$ac_cv_funclib_res_search"
++
++if false; then
++	for ac_func in res_search
++do :
++  ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
++if test "x$ac_cv_func_res_search" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_RES_SEARCH 1
+ _ACEOF
+ 
+ fi
+@@ -93265,13 +41014,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+ 	*)
+@@ -93285,7 +41034,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ 	;;
+ esac
+@@ -93300,9 +41049,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for res_nsearch" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch" >&5
+ $as_echo_n "checking for res_nsearch... " >&6; }
+-if test "${ac_cv_funclib_res_nsearch+set}" = set; then
++if test "${ac_cv_funclib_res_nsearch+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -93317,11 +41066,7 @@
+ 		*) ac_lib="-l$ac_lib" ;;
+ 		esac
+ 		LIBS=" $ac_lib  $ac_save_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.  */
+ 
+ #include <stdio.h>
+@@ -93346,38 +41091,11 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_nsearch=$ac_lib; else ac_cv_funclib_res_nsearch=yes; fi";break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -93389,102 +41107,12 @@
+ eval "ac_res=\$ac_cv_funclib_res_nsearch"
+ 
+ if false; then
+-
+-for ac_func in res_nsearch
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++	for ac_func in res_nsearch
++do :
++  ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
++if test "x$ac_cv_func_res_nsearch" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_RES_NSEARCH 1
+ _ACEOF
+ 
+ fi
+@@ -93504,13 +41132,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_nsearch=no"
+ 	eval "LIB_res_nsearch="
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+ 	*)
+@@ -93524,7 +41152,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ 	;;
+ esac
+@@ -93539,9 +41167,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for res_ndestroy" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy" >&5
+ $as_echo_n "checking for res_ndestroy... " >&6; }
+-if test "${ac_cv_funclib_res_ndestroy+set}" = set; then
++if test "${ac_cv_funclib_res_ndestroy+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -93556,11 +41184,7 @@
+ 		*) ac_lib="-l$ac_lib" ;;
+ 		esac
+ 		LIBS=" $ac_lib  $ac_save_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.  */
+ 
+ #include <stdio.h>
+@@ -93585,38 +41209,11 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_ndestroy=$ac_lib; else ac_cv_funclib_res_ndestroy=yes; fi";break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -93628,102 +41225,12 @@
+ eval "ac_res=\$ac_cv_funclib_res_ndestroy"
+ 
+ if false; then
+-
+-for ac_func in res_ndestroy
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++	for ac_func in res_ndestroy
++do :
++  ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
++if test "x$ac_cv_func_res_ndestroy" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_RES_NDESTROY 1
+ _ACEOF
+ 
+ fi
+@@ -93743,13 +41250,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_ndestroy=no"
+ 	eval "LIB_res_ndestroy="
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+ 	*)
+@@ -93763,7 +41270,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ 	;;
+ esac
+@@ -93777,9 +41284,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for dns_search" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search" >&5
+ $as_echo_n "checking for dns_search... " >&6; }
+-if test "${ac_cv_funclib_dns_search+set}" = set; then
++if test "${ac_cv_funclib_dns_search+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -93794,11 +41301,7 @@
+ 		*) ac_lib="-l$ac_lib" ;;
+ 		esac
+ 		LIBS=" $ac_lib  $ac_save_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.  */
+ 
+ #ifdef HAVE_DNS_H
+@@ -93813,38 +41316,11 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dns_search=$ac_lib; else ac_cv_funclib_dns_search=yes; fi";break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dns_search=\${ac_cv_funclib_dns_search-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -93856,102 +41332,12 @@
+ eval "ac_res=\$ac_cv_funclib_dns_search"
+ 
+ if false; then
+-
+-for ac_func in dns_search
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++	for ac_func in dns_search
++do :
++  ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
++if test "x$ac_cv_func_dns_search" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DNS_SEARCH 1
+ _ACEOF
+ 
+ fi
+@@ -93971,13 +41357,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dns_search=no"
+ 	eval "LIB_dns_search="
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+ 	*)
+@@ -93991,7 +41377,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ 	;;
+ esac
+@@ -94003,9 +41389,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for dn_expand" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand" >&5
+ $as_echo_n "checking for dn_expand... " >&6; }
+-if test "${ac_cv_funclib_dn_expand+set}" = set; then
++if test "${ac_cv_funclib_dn_expand+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -94020,11 +41406,7 @@
+ 		*) ac_lib="-l$ac_lib" ;;
+ 		esac
+ 		LIBS=" $ac_lib  $ac_save_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.  */
+ 
+ #include <stdio.h>
+@@ -94049,38 +41431,11 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -94092,102 +41447,12 @@
+ eval "ac_res=\$ac_cv_funclib_dn_expand"
+ 
+ if false; then
+-
+-for ac_func in dn_expand
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++	for ac_func in dn_expand
++do :
++  ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
++if test "x$ac_cv_func_dn_expand" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DN_EXPAND 1
+ _ACEOF
+ 
+ fi
+@@ -94207,13 +41472,13 @@
+ #define $ac_tr_func 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	;;
+ 	*)
+@@ -94227,7 +41492,7 @@
+ #define $ac_tr_lib 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in $ac_res" >&5
+ $as_echo "yes, in $ac_res" >&6; }
+ 	;;
+ esac
+@@ -94239,18 +41504,14 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for _res" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _res" >&5
+ $as_echo_n "checking for _res... " >&6; }
+-if test "${ac_cv_var__res+set}" = set; then
++if test "${ac_cv_var__res+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.  */
+ #include <stdio.h>
+ #ifdef HAVE_SYS_TYPES_H
+@@ -94274,44 +41535,15 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_var__res=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_var__res=no
++  ac_cv_var__res=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_exeext conftest.$ac_ext
+ if test "$ac_cv_var__res" != yes ; then
+-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.  */
+ extern int _res;
+ int foo(void) { return _res; }
+@@ -94323,44 +41555,19 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_var__res=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_var__res=no
++  ac_cv_var__res=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_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var__res`
+-{ $as_echo "$as_me:$LINENO: result: $ac_foo" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_foo" >&5
+ $as_echo "$ac_foo" >&6; }
+ if test "$ac_foo" = yes; then
+ 
+@@ -94368,18 +41575,7 @@
+ #define HAVE__RES 1
+ _ACEOF
+ 
+-	{ $as_echo "$as_me:$LINENO: checking whether _res is declared" >&5
+-$as_echo_n "checking whether _res is declared... " >&6; }
+-if test "${ac_cv_have_decl__res+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 <stdio.h>
++	ac_fn_c_check_decl "$LINENO" "_res" "ac_cv_have_decl__res" "#include <stdio.h>
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+@@ -94392,64 +41588,17 @@
+ #ifdef HAVE_RESOLV_H
+ #include <resolv.h>
+ #endif
+-
+-int
+-main ()
+-{
+-#ifndef _res
+-  (void) _res;
+-#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
+-  ac_cv_have_decl__res=yes
++"
++if test "x$ac_cv_have_decl__res" = x""yes; then :
++  ac_have_decl=1
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl__res=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_have_decl=0
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl__res" >&5
+-$as_echo "$ac_cv_have_decl__res" >&6; }
+-if test "x$ac_cv_have_decl__res" = x""yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__RES 1
+-_ACEOF
+-
+-
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL__RES 0
++#define HAVE_DECL__RES $ac_have_decl
+ _ACEOF
+ 
+-
+-fi
+-
+-
+ fi
+ 
+ 
+@@ -94515,9 +41664,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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LEX+set}" = set; then
++if test "${ac_cv_prog_LEX+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LEX"; then
+@@ -94528,24 +41677,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_LEX="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+ $as_echo "$LEX" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -94574,20 +41723,20 @@
+   return ! yylex () + ! yywrap ();
+ }
+ _ACEOF
+-{ (ac_try="$LEX conftest.l"
++{ { ac_try="$LEX conftest.l"
+ 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_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$LEX conftest.l") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+ $as_echo_n "checking lex output file root... " >&6; }
+-if test "${ac_cv_prog_lex_root+set}" = set; then
++if test "${ac_cv_prog_lex_root+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -94596,19 +41745,17 @@
+ elif test -f lexyy.c; then
+   ac_cv_prog_lex_root=lexyy
+ else
+-  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+ $as_echo "$ac_cv_prog_lex_root" >&6; }
+ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+ 
+ if test -z "${LEXLIB+set}"; then
+-  { $as_echo "$as_me:$LINENO: checking lex library" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+ $as_echo_n "checking lex library... " >&6; }
+-if test "${ac_cv_lib_lex+set}" = set; then
++if test "${ac_cv_lib_lex+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -94616,55 +41763,29 @@
+     ac_cv_lib_lex='none needed'
+     for ac_lib in '' -lfl -ll; do
+       LIBS="$ac_lib $ac_save_LIBS"
+-      cat >conftest.$ac_ext <<_ACEOF
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ `cat $LEX_OUTPUT_ROOT.c`
+ _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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_lex=$ac_lib
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+       test "$ac_cv_lib_lex" != 'none needed' && break
+     done
+     LIBS=$ac_save_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+ $as_echo "$ac_cv_lib_lex" >&6; }
+   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+ $as_echo_n "checking whether yytext is a pointer... " >&6; }
+-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # POSIX says lex can declare yytext either as a pointer or an array; the
+@@ -94673,52 +41794,24 @@
+ ac_cv_prog_lex_yytext_pointer=no
+ ac_save_LIBS=$LIBS
+ LIBS="$LEXLIB $ac_save_LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ #define YYTEXT_POINTER 1
+ `cat $LEX_OUTPUT_ROOT.c`
+ _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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_prog_lex_yytext_pointer=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+ $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+ if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define YYTEXT_POINTER 1
+-_ACEOF
++$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+ 
+ fi
+ rm -f conftest.l $LEX_OUTPUT_ROOT.c
+@@ -94728,9 +41821,9 @@
+ if test x"$LEX_BASENAME" = x"flex"; then
+ 	# "flex 2.5.33"
+ 	FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
+-	{ $as_echo "$as_me:$LINENO: checking flex version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking flex version" >&5
+ $as_echo_n "checking flex version... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: $FLEX_VERSION" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX_VERSION" >&5
+ $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 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_YACC+set}" = set; then
++if test "${ac_cv_prog_YACC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$YACC"; then
+@@ -94756,24 +41849,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_YACC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ YACC=$ac_cv_prog_YACC
+ if test -n "$YACC"; then
+-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+ $as_echo "$YACC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -94786,9 +41879,9 @@
+ if test x"$YACC_BASENAME" = x"bison -y"; then
+ 	# bison (GNU Bison) 2.3
+ 	BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
+-	{ $as_echo "$as_me:$LINENO: checking bison version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking bison version" >&5
+ $as_echo_n "checking bison version... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: $BISON_VERSION" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON_VERSION" >&5
+ $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 @@
+ 	YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking working LEX YACC combination" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking working LEX YACC combination" >&5
+ $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 @@
+ 	LEX=false
+ 	YACC=false
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $LEX_YACC" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX_YACC" >&5
+ $as_echo "$LEX_YACC" >&6; }
+ 
+ # Portions of heimdal kerberos are unpacked into source/heimdal
+@@ -94820,21 +41913,15 @@
+ 
+ # if we ever get to using a host kerberos, we might add conditionals here
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_COM_ERR 1
+-_ACEOF
++$as_echo "#define HAVE_COM_ERR 1" >>confdefs.h
+ 
+ HAVE_COM_ERR=YES
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB5 1
+-_ACEOF
++$as_echo "#define HAVE_KRB5 1" >>confdefs.h
+ 
+ HAVE_KRB5=YES
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GSSAPI 1
+-_ACEOF
++$as_echo "#define HAVE_GSSAPI 1" >>confdefs.h
+ 
+ HAVE_GSSAPI=YES
+ 
+@@ -94914,193 +42001,48 @@
+ SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+ \$enabled{\"HEIMDAL_ROKEN_PROGNAME\"} = \"YES\";"
+ 
+-
+-	MAKE_SETTINGS="$MAKE_SETTINGS
+-HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
+-
+-fi
+-
+-VPATH="$VPATH:\$(HEIMDAL_VPATH)"
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define SAMBA4_INTERNAL_HEIMDAL 1
+-_ACEOF
+-
+-
+-
+-SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
+-mkinclude heimdal_build/internal.mk
+-"
+-
+-
+-
+-for ac_header in execinfo.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; }
+-
++
++	MAKE_SETTINGS="$MAKE_SETTINGS
++HEIMDAL_ROKEN_PROGNAME_H_ENABLE = YES
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"HEIMDAL_ROKEN_PROGNAME_H\"} = \"YES\";"
++
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++
++VPATH="$VPATH:\$(HEIMDAL_VPATH)"
++
++
++$as_echo "#define SAMBA4_INTERNAL_HEIMDAL 1" >>confdefs.h
++
++
++
++SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
++mkinclude heimdal_build/internal.mk
++"
++
++
++for ac_header in execinfo.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
++if test "x$ac_cv_header_execinfo_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_EXECINFO_H 1
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking for library containing backtrace" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5
+ $as_echo_n "checking for library containing backtrace... " >&6; }
+-if test "${ac_cv_search_ext_backtrace+set}" = set; then
++if test "${ac_cv_search_ext_backtrace+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ ac_func_search_ext_save_LIBS=$LIBS
+ ac_cv_search_ext_backtrace=no
+-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.
+@@ -95118,46 +42060,15 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_ext_backtrace="none required"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+ if test "$ac_cv_search_ext_backtrace" = no; then
+   for ac_lib in execinfo; do
+     LIBS="-l$ac_lib $EXECINFO_LIBS  $ac_func_search_save_ext_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.
+@@ -95175,65 +42086,32 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_ext_backtrace="-l$ac_lib"
+ break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ 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 conftest.$ac_ext
+   done
+ fi
+ LIBS=$ac_func_search_ext_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_ext_backtrace" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ext_backtrace" >&5
+ $as_echo "$ac_cv_search_ext_backtrace" >&6; }
+-if test "$ac_cv_search_ext_backtrace" != no; then
++if test "$ac_cv_search_ext_backtrace" != no; then :
+   test "$ac_cv_search_ext_backtrace" = "none required" || EXECINFO_LIBS="$ac_cv_search_ext_backtrace $EXECINFO_LIBS"
+ 
+ fi
+ 
+ 
+-
+-
+     ac_check_func_ext_save_LIBS=$LIBS
+     LIBS="$EXECINFO_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for backtrace" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace" >&5
+ $as_echo_n "checking for backtrace... " >&6; }
+-if test "${ac_cv_func_ext_backtrace+set}" = set; then
++if test "${ac_cv_func_ext_backtrace+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 backtrace to an innocuous variant, in case <limits.h> declares backtrace.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+@@ -95274,43 +42152,18 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_ext_backtrace=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_ext_backtrace=no
++  ac_cv_func_ext_backtrace=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ext_backtrace" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_backtrace" >&5
+ $as_echo "$ac_cv_func_ext_backtrace" >&6; }
+     LIBS=$ac_check_func_ext_save_LIBS
+-    if test $ac_cv_func_ext_backtrace = yes; then
++    if test $ac_cv_func_ext_backtrace = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BACKTRACE 1
+ _ACEOF
+@@ -95318,7 +42171,6 @@
+ fi
+ 
+ 
+-
+ 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 @@
+ 
+ 
+ 
+-
+-
+-
+ for ac_func in sigprocmask sigblock sigaction
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++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
+@@ -95508,102 +42270,12 @@
+ done
+ 
+ 
+-
+ for ac_func in setsid
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#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
+-
+-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
+-
+-	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
++do :
++  ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
++if test "x$ac_cv_func_setsid" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_SETSID 1
+ _ACEOF
+ 
+ fi
+@@ -95612,153 +42284,14 @@
+ 
+ #################################################
+ # these tests are taken from the GNU fileutils package
+-{ $as_echo "$as_me:$LINENO: checking how to get filesystem space usage..." >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get filesystem space usage..." >&5
+ $as_echo "$as_me: checking how to get filesystem space usage..." >&6;}
+-
+-
+-
+ for ac_header in sys/statfs.h sys/statvfs.h sys/vfs.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
++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
+@@ -95768,65 +42301,16 @@
+ done
+ 
+ 
+-
+ for ac_header in sys/mount.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $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
+-  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
++do :
++  ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "$ac_includes_default
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
+-
+-#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
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-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; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++"
++if test "x$ac_cv_header_sys_mount_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_SYS_MOUNT_H 1
+ _ACEOF
+ 
+ fi
+@@ -95839,19 +42323,15 @@
+ # Test for statvfs64.
+ if test $space = no; then
+   # SVR4
+-  { $as_echo "$as_me:$LINENO: checking statvfs64 function (SVR4)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs64 function (SVR4)" >&5
+ $as_echo_n "checking statvfs64 function (SVR4)... " >&6; }
+-if test "${fu_cv_sys_stat_statvfs64+set}" = set; then
++if test "${fu_cv_sys_stat_statvfs64+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_statvfs64=cross
+ 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.  */
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -95865,51 +42345,22 @@
+     exit (statvfs64 (".", &fsd));
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   fu_cv_sys_stat_statvfs64=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_statvfs64=no
++  fu_cv_sys_stat_statvfs64=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++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:$LINENO: result: $fu_cv_sys_stat_statvfs64" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs64" >&5
+ $as_echo "$fu_cv_sys_stat_statvfs64" >&6; }
+   if test $fu_cv_sys_stat_statvfs64 = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATVFS64 1
+-_ACEOF
++$as_echo "#define STAT_STATVFS64 1" >>confdefs.h
+ 
+   fi
+ fi
+@@ -95922,16 +42373,12 @@
+ # is what it gets when this test fails.
+ if test $space = no; then
+   # SVR4
+-  { $as_echo "$as_me:$LINENO: checking statvfs function (SVR4)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs function (SVR4)" >&5
+ $as_echo_n "checking statvfs function (SVR4)... " >&6; }
+-if test "${fu_cv_sys_stat_statvfs+set}" = set; then
++if test "${fu_cv_sys_stat_statvfs+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.  */
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+@@ -95943,64 +42390,33 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   fu_cv_sys_stat_statvfs=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	fu_cv_sys_stat_statvfs=no
++  fu_cv_sys_stat_statvfs=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_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_statvfs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statvfs" >&5
+ $as_echo "$fu_cv_sys_stat_statvfs" >&6; }
+   if test $fu_cv_sys_stat_statvfs = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATVFS 1
+-_ACEOF
++$as_echo "#define STAT_STATVFS 1" >>confdefs.h
+ 
+   fi
+ fi
+ 
+ # fsusage.c assumes that statvfs has an f_frsize entry. Some weird
+ # systems use f_bsize.
+-{ $as_echo "$as_me:$LINENO: checking that statvfs.f_frsize works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.f_frsize works" >&5
+ $as_echo_n "checking that statvfs.f_frsize works... " >&6; }
+-if test "${samba_cv_frsize+set}" = set; then
++if test "${samba_cv_frsize+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.  */
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+@@ -96012,59 +42428,32 @@
+   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
++if ac_fn_c_try_compile "$LINENO"; then :
+   samba_cv_frsize=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	samba_cv_frsize=no
++  samba_cv_frsize=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $samba_cv_frsize" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_frsize" >&5
+ $as_echo "$samba_cv_frsize" >&6; }
+ if test x"$samba_cv_frsize" = x"yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FRSIZE 1
+-_ACEOF
++$as_echo "#define HAVE_FRSIZE 1" >>confdefs.h
+ 
+ fi
+ 
+ if test $space = no; then
+   # DEC Alpha running OSF/1
+-  { $as_echo "$as_me:$LINENO: checking for 3-argument statfs function (DEC OSF/1)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5
+ $as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
+-  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then
++  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_statfs3_osf1=no
+ 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 <sys/param.h>
+@@ -96077,71 +42466,38 @@
+     exit (statfs (".", &fsd, sizeof (struct statfs)));
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   fu_cv_sys_stat_statfs3_osf1=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_statfs3_osf1=no
++  fu_cv_sys_stat_statfs3_osf1=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++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:$LINENO: result: $fu_cv_sys_stat_statfs3_osf1" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs3_osf1" >&5
+ $as_echo "$fu_cv_sys_stat_statfs3_osf1" >&6; }
+   if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATFS3_OSF1 1
+-_ACEOF
++$as_echo "#define STAT_STATFS3_OSF1 1" >>confdefs.h
+ 
+   fi
+ fi
+ 
+ if test $space = no; then
+ # AIX
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+ $as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
+-  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then
++  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_statfs2_bsize=no
+ 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.  */
+ 
+ #ifdef HAVE_SYS_PARAM_H
+@@ -96160,71 +42516,38 @@
+   exit (statfs (".", &fsd));
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   fu_cv_sys_stat_statfs2_bsize=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_statfs2_bsize=no
++  fu_cv_sys_stat_statfs2_bsize=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++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:$LINENO: result: $fu_cv_sys_stat_statfs2_bsize" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_bsize" >&5
+ $as_echo "$fu_cv_sys_stat_statfs2_bsize" >&6; }
+   if test $fu_cv_sys_stat_statfs2_bsize = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATFS2_BSIZE 1
+-_ACEOF
++$as_echo "#define STAT_STATFS2_BSIZE 1" >>confdefs.h
+ 
+   fi
+ fi
+ 
+ if test $space = no; then
+ # SVR3
+-  { $as_echo "$as_me:$LINENO: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+ $as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
+-  if test "${fu_cv_sys_stat_statfs4+set}" = set; then
++  if test "${fu_cv_sys_stat_statfs4+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_statfs4=no
+ 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 <sys/types.h>
+ #include <sys/statfs.h>
+@@ -96234,71 +42557,38 @@
+   exit (statfs (".", &fsd, sizeof fsd, 0));
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   fu_cv_sys_stat_statfs4=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_statfs4=no
++  fu_cv_sys_stat_statfs4=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++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:$LINENO: result: $fu_cv_sys_stat_statfs4" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs4" >&5
+ $as_echo "$fu_cv_sys_stat_statfs4" >&6; }
+   if test $fu_cv_sys_stat_statfs4 = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATFS4 1
+-_ACEOF
++$as_echo "#define STAT_STATFS4 1" >>confdefs.h
+ 
+   fi
+ fi
+ 
+ if test $space = no; then
+ # 4.4BSD and NetBSD
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+ $as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
+-  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then
++  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_statfs2_fsize=no
+ 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 <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+@@ -96314,71 +42604,38 @@
+   exit (statfs (".", &fsd));
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   fu_cv_sys_stat_statfs2_fsize=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_statfs2_fsize=no
++  fu_cv_sys_stat_statfs2_fsize=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++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:$LINENO: result: $fu_cv_sys_stat_statfs2_fsize" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fu_cv_sys_stat_statfs2_fsize" >&5
+ $as_echo "$fu_cv_sys_stat_statfs2_fsize" >&6; }
+   if test $fu_cv_sys_stat_statfs2_fsize = yes; then
+     space=yes
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATFS2_FSIZE 1
+-_ACEOF
++$as_echo "#define STAT_STATFS2_FSIZE 1" >>confdefs.h
+ 
+   fi
+ fi
+ 
+ if test $space = no; then
+   # Ultrix
+-  { $as_echo "$as_me:$LINENO: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+ $as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
+-  if test "${fu_cv_sys_stat_fs_data+set}" = set; then
++  if test "${fu_cv_sys_stat_fs_data+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   fu_cv_sys_stat_fs_data=no
+ 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 <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+@@ -96398,201 +42655,33 @@
+   exit (statfs (".", &fsd) != 1);
+   }
+ _ACEOF
+-rm -f 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>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (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_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  fu_cv_sys_stat_fs_data=yes
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-fu_cv_sys_stat_fs_data=no
+-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
+-
+-
+-fi
+-
+-  { $as_echo "$as_me:$LINENO: result: $fu_cv_sys_stat_fs_data" >&5
+-$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
+-  if test $fu_cv_sys_stat_fs_data = yes; then
+-    space=yes
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_STATFS2_FS_DATA 1
+-_ACEOF
+-
+-  fi
+-fi
+-
+-
+-
+-
+-for ac_header in sys/attributes.h attr/xattr.h sys/xattr.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
++if ac_fn_c_try_run "$LINENO"; then :
++  fu_cv_sys_stat_fs_data=yes
+ else
+-  eval "$as_ac_Header=\$ac_header_preproc"
++  fu_cv_sys_stat_fs_data=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: $fu_cv_sys_stat_fs_data" >&5
++$as_echo "$fu_cv_sys_stat_fs_data" >&6; }
++  if test $fu_cv_sys_stat_fs_data = yes; then
++    space=yes
+ 
++$as_echo "#define STAT_STATFS2_FS_DATA 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/attributes.h attr/xattr.h sys/xattr.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
+@@ -96601,19 +42690,15 @@
  
  done
  
@@ -97946,7 +101165,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -92846,46 +41052,15 @@
+@@ -96631,46 +42716,15 @@
    return 0;
  }
  _ACEOF
@@ -97997,7 +101216,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -92903,65 +41078,32 @@
+@@ -96688,65 +42742,32 @@
    return 0;
  }
  _ACEOF
@@ -98071,7 +101290,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define flistxattr to an innocuous variant, in case <limits.h> declares flistxattr.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -93002,50 +41144,24 @@
+@@ -96787,50 +42808,24 @@
    return 0;
  }
  _ACEOF
@@ -98128,7 +101347,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  MAKE_SETTINGS="$MAKE_SETTINGS
  XATTR_LIBS = ${XATTR_LIBS}
  XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -93055,18 +41171,14 @@
+@@ -96840,18 +42835,14 @@
  
  
  if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -98150,7 +101369,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  	 	#include <sys/types.h>
-@@ -93089,48 +41201,23 @@
+@@ -96874,48 +42865,23 @@
    return 0;
  }
  _ACEOF
@@ -98204,7 +101423,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -93142,20 +41229,16 @@
+@@ -96927,20 +42893,16 @@
  fi
  
  
@@ -98229,7 +101448,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <sys/capability.h>
-@@ -93170,117 +41253,55 @@
+@@ -96955,117 +42917,55 @@
  }
  
  _ACEOF
@@ -98296,7 +101515,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
 -if test "$cross_compiling" = yes; then
 +if test "$cross_compiling" = yes; then :
-   samba_cv_HAVE_GETTIMEOFDAY_TZ=cross
+   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -98363,7 +101582,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -93288,7 +41309,7 @@
+@@ -97073,7 +42973,7 @@
  INCLUDED_POPT=auto
  
  # Check whether --with-included-popt was given.
@@ -98372,7 +101591,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_included_popt;  INCLUDED_POPT=$withval
  fi
  
-@@ -93297,169 +41318,26 @@
+@@ -97082,169 +42982,26 @@
  
  
  if test x"$INCLUDED_POPT" != x"yes"; then
@@ -98550,7 +101769,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -93477,43 +41355,18 @@
+@@ -97262,43 +43019,18 @@
    return 0;
  }
  _ACEOF
@@ -98600,7 +101819,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
     POPT_LIBS="-lpopt"
  fi
  
-@@ -93525,9 +41378,9 @@
+@@ -97310,9 +43042,9 @@
  	fi
  fi
  
@@ -98612,7 +101831,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$INCLUDED_POPT" >&6; }
  if test x"$INCLUDED_POPT" != x"no"; then
  			poptdir=""
-@@ -93541,156 +41394,16 @@
+@@ -97326,156 +43058,16 @@
  		fi
  	done
          if test x"$poptdir" = "x"; then
@@ -98776,7 +101995,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -93729,12 +41442,10 @@
+@@ -97514,12 +43106,10 @@
  LOOK_DIRS="/usr /usr/local /sw"
  
  # Check whether --with-libiconv was given.
@@ -98791,7 +102010,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    else
       if test "$withval" != "yes" ; then
  
-@@ -93746,65 +41457,36 @@
+@@ -97531,26 +43121,20 @@
  	LIBS=-liconv
  
  
@@ -98825,16 +102044,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <stdlib.h>
--#include <giconv.h>
--
--int main()
--{
--   iconv_t cd = iconv_open("ASCII","UCS-2LE");
--   if (cd == 0 || cd == (iconv_t)-1) return -1;
--   return 0;
--}
--
--_ACEOF
+ #include <giconv.h>
+@@ -97563,33 +43147,10 @@
+ }
+ 
+ _ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -98858,27 +102072,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; };
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GICONV_H 1
-+#include <giconv.h>
-+
-+int main()
-+{
-+   iconv_t cd = iconv_open("ASCII","UCS-2LE");
-+   if (cd == 0 || cd == (iconv_t)-1) return -1;
-+   return 0;
-+}
-+
- _ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; };
+ $as_echo "yes" >&6; };
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GICONV_H 1
+-_ACEOF
 +$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93812,29 +41494,17 @@
+@@ -97597,29 +43158,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -98913,7 +102117,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -93847,33 +41517,10 @@
+@@ -97632,33 +43181,10 @@
  }
  
  _ACEOF
@@ -98950,7 +102154,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93881,28 +41528,17 @@
+@@ -97666,28 +43192,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -98985,7 +102189,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -93915,33 +41551,10 @@
+@@ -97700,33 +43215,10 @@
  }
  
  _ACEOF
@@ -99022,7 +102226,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		ICONV_FOUND=yes;
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93949,31 +41562,22 @@
+@@ -97734,31 +43226,22 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -99060,7 +102264,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	CPPFLAGS="$save_CPPFLAGS"
  	LDFLAGS="$save_LDFLAGS"
  	LIBS="$save_LIBS"
-@@ -93986,17 +41590,13 @@
+@@ -97771,17 +43254,13 @@
  
  if test x$ICONV_FOUND = xno; then
  
@@ -99082,7 +102286,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -94009,49 +41609,20 @@
+@@ -97794,49 +43273,20 @@
  }
  
  _ACEOF
@@ -99138,7 +102342,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi
  
  for i in $LOOK_DIRS ; do
-@@ -94068,24 +41639,20 @@
+@@ -97853,24 +43303,20 @@
  	LIBS=-liconv
  
  
@@ -99170,7 +102374,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -94098,33 +41665,10 @@
+@@ -97883,33 +43329,10 @@
  }
  
  _ACEOF
@@ -99207,7 +102411,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94132,27 +41676,17 @@
+@@ -97917,27 +43340,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -99239,7 +102443,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <iconv.h>
-@@ -94165,33 +41699,10 @@
+@@ -97950,33 +43363,10 @@
  }
  
  _ACEOF
@@ -99276,7 +102480,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  		ICONV_FOUND=yes
  		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94199,26 +41710,17 @@
+@@ -97984,26 +43374,17 @@
  		ICONV_LDFLAGS="$LDFLAGS"
  
  else
@@ -99308,10 +102512,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <stdlib.h>
  #include <giconv.h>
-@@ -94231,33 +41733,10 @@
+@@ -98015,304 +43396,92 @@
+    return 0;
  }
  
- _ACEOF
+-_ACEOF
 -rm -f conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -99335,77 +102540,85 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+if ac_fn_c_try_run "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; };
+-$as_echo "yes" >&6; };
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GICONV_H 1
 -_ACEOF
-+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
- 
- 		ICONV_FOUND=yes
- 		ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94265,29 +41744,22 @@
- 		ICONV_LDFLAGS="$LDFLAGS"
- 
- else
+-
+-		ICONV_FOUND=yes
+-		ICONV_CPPFLAGS="$CPPFLAGS"
+-		ICONV_LIBS="$LIBS"
+-		ICONV_LDFLAGS="$LDFLAGS"
+-
+-else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -{ $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; };
- fi
+-$as_echo "no" >&6; };
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
+-fi
 -
- fi
+-
+-
+-
+-fi
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
- 
- 
+-fi
 -
- 	CPPFLAGS="$save_CPPFLAGS"
- 	LDFLAGS="$save_LDFLAGS"
- 	LIBS="$save_LIBS"
-@@ -94295,7 +41767,7 @@
- done
- 
- if test x"$ICONV_FOUND" = x"no"; then
+-
+-
+-
+-	CPPFLAGS="$save_CPPFLAGS"
+-	LDFLAGS="$save_LDFLAGS"
+-	LIBS="$save_LIBS"
+-
+-done
+-
+-if test x"$ICONV_FOUND" = x"no"; then
 -    { $as_echo "$as_me:$LINENO: WARNING: Sufficient support for iconv function was not found.
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficient support for iconv function was not found.
-     Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
- $as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
-     Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
-@@ -94308,9 +41780,7 @@
- 
- else
- 
+-    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
+-$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
+-    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
+-
+-	MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_ENABLE = NO
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"ICONV\"} = \"NO\";"
+-
+-else
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_NATIVE_ICONV 1
 -_ACEOF
-+$as_echo "#define HAVE_NATIVE_ICONV 1" >>confdefs.h
- 
- 
- 	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94331,203 +41801,23 @@
- 
- 
- 
 -
- for ac_func in writev
+-
+-	MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_ENABLE = YES
+-"
+-SMB_INFO_ENABLES="$SMB_INFO_ENABLES
+-\$enabled{\"ICONV\"} = \"YES\";"
+-
+-fi
+-
+-
+-MAKE_SETTINGS="$MAKE_SETTINGS
+-ICONV_LIBS = ${ICONV_LIBS}
+-ICONV_CFLAGS = ${ICONV_CFLAGS}
+-ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
+-ICONV_LDFLAGS = ${ICONV_LDFLAGS}
+-"
+-
+-
+-
+-
+-for ac_func in writev
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -99483,14 +102696,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; };
++$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
+ 
 -	eval "$as_ac_var=no"
 -fi
--
++		ICONV_FOUND=yes
++		ICONV_CPPFLAGS="$CPPFLAGS"
++		ICONV_LIBS="$LIBS"
++		ICONV_LDFLAGS="$LDFLAGS"
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; };
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -99498,71 +102723,116 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++
+ 
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
++
++
++
++	CPPFLAGS="$save_CPPFLAGS"
++	LDFLAGS="$save_LDFLAGS"
++	LIBS="$save_LIBS"
++
+ done
+ 
++if test x"$ICONV_FOUND" = x"no"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficient support for iconv function was not found.
++    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&5
++$as_echo "$as_me: WARNING: Sufficient support for iconv function was not found.
++    Install libiconv from http://www.gnu.org/software/libiconv/ for better charset compatibility!" >&2;}
++
++	MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_ENABLE = NO
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"ICONV\"} = \"NO\";"
+ 
+-for ac_func in readv
+-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 <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++$as_echo "#define HAVE_NATIVE_ICONV 1" >>confdefs.h
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+ 
+-#undef $ac_func
++	MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_ENABLE = YES
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"ICONV\"} = \"YES\";"
+ 
+-/* 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
++fi
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
++
++MAKE_SETTINGS="$MAKE_SETTINGS
++ICONV_LIBS = ${ICONV_LIBS}
++ICONV_CFLAGS = ${ICONV_CFLAGS}
++ICONV_CPPFLAGS = ${ICONV_CPPFLAGS}
++ICONV_LDFLAGS = ${ICONV_LDFLAGS}
++"
++
++
++
++for ac_func in writev
 +do :
 +  ac_fn_c_check_func "$LINENO" "writev" "ac_cv_func_writev"
 +if test "x$ac_cv_func_writev" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++  cat >>confdefs.h <<_ACEOF
 +#define HAVE_WRITEV 1
  _ACEOF
- 
- fi
- done
- 
--
- for ac_func in readv
--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 <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#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
--
--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
@@ -99588,10 +102858,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=no"
--fi
--
+ fi
++done
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -99603,6 +102874,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_var'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
++for ac_func in readv
 +do :
 +  ac_fn_c_check_func "$LINENO" "readv" "ac_cv_func_readv"
 +if test "x$ac_cv_func_readv" = x""yes; then :
@@ -99612,7 +102884,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -94606,151 +41896,12 @@
+@@ -98391,151 +43560,12 @@
  
  
  
@@ -99768,7 +103040,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -94760,23 +41911,17 @@
+@@ -98545,23 +43575,17 @@
  
  
  
@@ -99795,7 +103067,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -94794,54 +41939,28 @@
+@@ -98579,54 +43603,28 @@
    return 0;
  }
  _ACEOF
@@ -99857,7 +103129,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -94857,18 +41976,13 @@
+@@ -98642,18 +43640,13 @@
  
  fi
  
@@ -99879,7 +103151,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -94886,40 +42000,19 @@
+@@ -98671,40 +43664,19 @@
    return 0;
  }
  _ACEOF
@@ -99922,7 +103194,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -94978,9 +42071,9 @@
+@@ -98763,9 +43735,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
@@ -99934,7 +103206,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -94993,14 +42086,14 @@
+@@ -98778,14 +43750,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -99952,7 +103224,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95009,10 +42102,10 @@
+@@ -98794,10 +43766,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -99965,20 +103237,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -95028,52 +42121,27 @@
+@@ -98813,52 +43785,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for talloc >= $TALLOC_MIN_VERSION" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= $TALLOC_MIN_VERSION" >&5
- $as_echo_n "checking for talloc >= $TALLOC_MIN_VERSION... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for talloc >= 2.0.1" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for talloc >= 2.0.1" >&5
+ $as_echo_n "checking for talloc >= 2.0.1... " >&6; }
  
- 			if $PKG_CONFIG --exists 'talloc >= $TALLOC_MIN_VERSION' ; then
+ 			if $PKG_CONFIG --exists 'talloc >= 2.0.1' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= $TALLOC_MIN_VERSION'`"
+ 				LIBTALLOC_CFLAGS="`$PKG_CONFIG --cflags 'talloc >= 2.0.1'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBTALLOC_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTALLOC_CFLAGS" >&5
@@ -100025,9 +103297,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTALLOC_ENABLE = YES
-@@ -95081,22 +42149,16 @@
+@@ -98866,22 +43813,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTALLOC} = \"YES\";"
+ \$enabled{\"LIBTALLOC\"} = \"YES\";"
  
 -					{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100051,17 +103323,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 
-@@ -95111,7 +42173,7 @@
+ 				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 @@
  				ac_cv_LIBTALLOC_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= $TALLOC_MIN_VERSION'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= 2.0.1'
  				ac_cv_LIBTALLOC_found=no
-@@ -95141,9 +42203,9 @@
+@@ -98976,9 +43917,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
@@ -100073,7 +103345,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -95156,14 +42218,14 @@
+@@ -98991,14 +43932,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -100091,7 +103363,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95172,10 +42234,10 @@
+@@ -99007,10 +43948,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -100104,20 +103376,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -95191,52 +42253,27 @@
+@@ -99026,52 +43967,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for tdb >= $TDB_MIN_VERSION" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= $TDB_MIN_VERSION" >&5
- $as_echo_n "checking for tdb >= $TDB_MIN_VERSION... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for tdb >= 1.2.1" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tdb >= 1.2.1" >&5
+ $as_echo_n "checking for tdb >= 1.2.1... " >&6; }
  
- 			if $PKG_CONFIG --exists 'tdb >= $TDB_MIN_VERSION' ; then
+ 			if $PKG_CONFIG --exists 'tdb >= 1.2.1' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= $TDB_MIN_VERSION'`"
+ 				LIBTDB_CFLAGS="`$PKG_CONFIG --cflags 'tdb >= 1.2.1'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBTDB_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTDB_CFLAGS" >&5
@@ -100164,9 +103436,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTDB_ENABLE = YES
-@@ -95244,22 +42281,16 @@
+@@ -99079,22 +43995,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTDB} = \"YES\";"
+ \$enabled{\"LIBTDB\"} = \"YES\";"
  
 -					{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100190,17 +103462,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 
-@@ -95274,7 +42305,7 @@
+ 				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 @@
  				ac_cv_LIBTDB_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= $TDB_MIN_VERSION'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= 1.2.1'
  				ac_cv_LIBTDB_found=no
-@@ -95299,9 +42330,7 @@
+@@ -99180,9 +44090,7 @@
  	fi
  done
  if test x"$tdbdir" = "x"; then
@@ -100210,8 +103482,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 +   as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
  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"
-@@ -95314,104 +42343,12 @@
+ 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 @@
  TDB_CFLAGS="-I$tdbdir/include"
  
  
@@ -100321,7 +103593,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -95419,151 +42356,12 @@
+@@ -99300,151 +44116,12 @@
  fi
  done
  
@@ -100478,7 +103750,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -95574,17 +42372,13 @@
+@@ -99455,17 +44132,13 @@
  
  
  
@@ -100499,7 +103771,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -95595,56 +42389,29 @@
+@@ -99476,56 +44149,29 @@
    return 0;
  }
  _ACEOF
@@ -100563,7 +103835,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <unistd.h>
  int
-@@ -95655,41 +42422,18 @@
+@@ -99536,41 +44182,18 @@
    return 0;
  }
  _ACEOF
@@ -100609,7 +103881,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
   fi
  
-@@ -95715,9 +42459,9 @@
+@@ -99601,9 +44224,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
@@ -100621,7 +103893,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -95730,14 +42474,14 @@
+@@ -99616,14 +44239,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -100639,7 +103911,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95746,10 +42490,10 @@
+@@ -99632,10 +44255,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -100652,20 +103924,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -95765,52 +42509,27 @@
+@@ -99651,52 +44274,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for tevent = $TEVENT_REQUIRED_VERSION" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tevent = $TEVENT_REQUIRED_VERSION" >&5
- $as_echo_n "checking for tevent = $TEVENT_REQUIRED_VERSION... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for tevent = 0.9.8" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tevent = 0.9.8" >&5
+ $as_echo_n "checking for tevent = 0.9.8... " >&6; }
  
- 			if $PKG_CONFIG --exists 'tevent = $TEVENT_REQUIRED_VERSION' ; then
+ 			if $PKG_CONFIG --exists 'tevent = 0.9.8' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBTEVENT_CFLAGS="`$PKG_CONFIG --cflags 'tevent = $TEVENT_REQUIRED_VERSION'`"
+ 				LIBTEVENT_CFLAGS="`$PKG_CONFIG --cflags 'tevent = 0.9.8'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBTEVENT_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBTEVENT_CFLAGS" >&5
@@ -100712,9 +103984,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBTEVENT_ENABLE = YES
-@@ -95818,22 +42537,16 @@
+@@ -99704,22 +44302,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBTEVENT} = \"YES\";"
+ \$enabled{\"LIBTEVENT\"} = \"YES\";"
  
 -					{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -100738,33 +104010,50 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 
-@@ -95848,7 +42561,7 @@
+ 				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 @@
  				ac_cv_LIBTEVENT_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = $TEVENT_REQUIRED_VERSION'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = 0.9.8'
  				ac_cv_LIBTEVENT_found=no
-@@ -95877,9 +42590,7 @@
- 		fi
- 	done
- 	if test x"$teventdir" = "x"; then
+@@ -99801,281 +44393,50 @@
+ 
+ if test x"$teventdir" = "x"; then
+ 	teventdir=""
+-	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
+-	for d in $teventpaths; do
+-		if test -f "$d/tevent.c"; then
+-			teventdir="$d"
+-			break;
+-		fi
+-	done
+-	if test x"$teventdir" = "x"; then
 -	   { { $as_echo "$as_me:$LINENO: error: cannot find libtevent source in $teventpaths" >&5
 -$as_echo "$as_me: error: cannot find libtevent source in $teventpaths" >&2;}
 -   { (exit 1); exit 1; }; }
-+	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
- 	fi
- fi
- 
-@@ -95897,253 +42608,24 @@
- TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
- TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
- 
+-	fi
+-fi
 -
- for ac_header in sys/epoll.h
+-TEVENT_OBJ=""
+-TEVENT_CFLAGS=""
+-TEVENT_LIBS=""
+-
+-
+-
+-
+-TEVENT_CFLAGS="-I$teventdir"
+-
+-TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
+-TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
+-
+-
+-for ac_header in sys/epoll.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
@@ -100906,20 +104195,29 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
+-  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_SYS_EPOLL_H 1
- _ACEOF
- 
+-_ACEOF
+-
++	teventpaths="$srcdir $srcdir/../lib/tevent $srcdir/tevent $srcdir/../tevent"
++	for d in $teventpaths; do
++		if test -f "$d/tevent.c"; then
++			teventdir="$d"
++			break;
++		fi
++	done
++	if test x"$teventdir" = "x"; then
++	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
++	fi
  fi
  
- done
- 
+-done
 -
- for ac_func in epoll_create
++TEVENT_OBJ=""
++TEVENT_CFLAGS=""
++TEVENT_LIBS=""
+ 
+-for ac_func in epoll_create
 -do
 -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -100936,20 +104234,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> 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 <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
+ 
 -#undef $ac_func
--
++TEVENT_CFLAGS="-I$teventdir"
+ 
 -/* 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.  */
@@ -100963,7 +104262,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
--
++TEVENT_OBJ="tevent.o tevent_debug.o tevent_util.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_fd.o tevent_timed.o tevent_immediate.o tevent_signal.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
++TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
+ 
 -int
 -main ()
 -{
@@ -100971,7 +104274,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ;
 -  return 0;
 -}
--_ACEOF
++for ac_header in sys/epoll.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_EPOLL_H 1
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -100997,10 +104306,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -	eval "$as_ac_var=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
@@ -101012,6 +104321,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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 epoll_create
 +do :
 +  ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
 +if test "x$ac_cv_func_epoll_create" = x""yes; then :
@@ -101021,7 +104333,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -96152,9 +42634,7 @@
+@@ -100084,9 +44445,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"
  
@@ -101032,7 +104344,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  fi
  
-@@ -96216,9 +42696,9 @@
+@@ -100142,9 +44501,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
@@ -101044,7 +104356,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -96231,14 +42711,14 @@
+@@ -100157,14 +44516,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -101062,7 +104374,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96247,10 +42727,10 @@
+@@ -100173,10 +44532,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -101075,20 +104387,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -96266,52 +42746,27 @@
+@@ -100192,52 +44551,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for ldb = $LDB_REQUIRED_VERSION" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = $LDB_REQUIRED_VERSION" >&5
- $as_echo_n "checking for ldb = $LDB_REQUIRED_VERSION... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for ldb = 0.9.10" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldb = 0.9.10" >&5
+ $as_echo_n "checking for ldb = 0.9.10... " >&6; }
  
- 			if $PKG_CONFIG --exists 'ldb = $LDB_REQUIRED_VERSION' ; then
+ 			if $PKG_CONFIG --exists 'ldb = 0.9.10' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = $LDB_REQUIRED_VERSION'`"
+ 				LIBLDB_CFLAGS="`$PKG_CONFIG --cflags 'ldb = 0.9.10'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $LIBLDB_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the LIBLDB_CFLAGS" >&5
@@ -101135,9 +104447,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  LIBLDB_ENABLE = YES
-@@ -96319,22 +42774,16 @@
+@@ -100245,22 +44579,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{LIBLDB} = \"YES\";"
+ \$enabled{\"LIBLDB\"} = \"YES\";"
  
 -					{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -101161,17 +104473,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 
-@@ -96349,7 +42798,7 @@
+ 				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 @@
  				ac_cv_LIBLDB_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = $LDB_REQUIRED_VERSION'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = 0.9.10'
  				ac_cv_LIBLDB_found=no
-@@ -96395,12 +42844,12 @@
+@@ -100367,12 +44695,12 @@
  
  SQLITE3_LIBS=""
  with_sqlite3_support=no
@@ -101186,7 +104498,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    withval=$with_sqlite3;  case "$withval" in
      yes|no|auto)
  	with_sqlite3_support=$withval
-@@ -96409,157 +42858,18 @@
+@@ -100381,157 +44709,18 @@
  fi
  
  
@@ -101350,7 +104662,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -96569,11 +42879,9 @@
+@@ -100541,11 +44730,9 @@
  
    if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
  	if test x"$with_sqlite3_support" = x"yes"; then
@@ -101364,7 +104676,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
  	fi
  
-@@ -96588,23 +42896,17 @@
+@@ -100560,23 +44747,17 @@
    # now see if we can find the sqlite3 libs in standard paths
  
  
@@ -101391,7 +104703,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -96622,54 +42924,28 @@
+@@ -100594,54 +44775,28 @@
    return 0;
  }
  _ACEOF
@@ -101453,7 +104765,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSQLITE3 1
  _ACEOF
-@@ -96685,21 +42961,16 @@
+@@ -100657,21 +44812,16 @@
  
  fi
  
@@ -101479,7 +104791,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
      with_sqlite3_support=yes
  
-@@ -96711,11 +42982,9 @@
+@@ -100683,11 +44833,9 @@
  
    else
      if test x"$with_sqlite3_support" = x"yes"; then
@@ -101493,7 +104805,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
      fi
  
-@@ -96776,7 +43045,7 @@
+@@ -100757,7 +44905,7 @@
  
  use_gnutls=auto
  # Check whether --enable-gnutls was given.
@@ -101502,7 +104814,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
          use_gnutls=no
      fi
-@@ -96790,9 +43059,9 @@
+@@ -100771,9 +44919,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
@@ -101514,7 +104826,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    $as_echo_n "(cached) " >&6
  else
    case $PKG_CONFIG in
-@@ -96805,14 +43074,14 @@
+@@ -100786,14 +44934,14 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -101532,7 +104844,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
    test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96821,10 +43090,10 @@
+@@ -100802,10 +44950,10 @@
  fi
  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
  if test -n "$PKG_CONFIG"; then
@@ -101545,20 +104857,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  fi
  
-@@ -96840,52 +43109,27 @@
+@@ -100821,52 +44969,27 @@
  	else
  		SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
  		if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
--			{ $as_echo "$as_me:$LINENO: checking for gnutls < 2.6.0" >&5
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls < 2.6.0" >&5
- $as_echo_n "checking for gnutls < 2.6.0... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: checking for gnutls >= 1.4.0" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 1.4.0" >&5
+ $as_echo_n "checking for gnutls >= 1.4.0... " >&6; }
  
- 			if $PKG_CONFIG --exists 'gnutls < 2.6.0' ; then
+ 			if $PKG_CONFIG --exists 'gnutls >= 1.4.0' ; then
 -				{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
- 				GNUTLS_CFLAGS="`$PKG_CONFIG --cflags 'gnutls < 2.6.0'`"
+ 				GNUTLS_CFLAGS="`$PKG_CONFIG --cflags 'gnutls >= 1.4.0'`"
  				OLD_CFLAGS="$CFLAGS"
  				CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
 -				{ $as_echo "$as_me:$LINENO: checking that the C compiler can use the GNUTLS_CFLAGS" >&5
@@ -101605,9 +104917,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
  GNUTLS_ENABLE = YES
-@@ -96893,22 +43137,16 @@
+@@ -100874,22 +44997,16 @@
  SMB_INFO_ENABLES="$SMB_INFO_ENABLES
- \$enabled{GNUTLS} = \"YES\";"
+ \$enabled{\"GNUTLS\"} = \"YES\";"
  
 -					{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -101631,23 +104943,20 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -
  				CFLAGS="$OLD_CFLAGS"
  
- 
-@@ -96923,7 +43161,7 @@
+ 				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 @@
  				ac_cv_GNUTLS_found=yes
  
  			else
 -				{ $as_echo "$as_me:$LINENO: result: no" >&5
 +				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
- 				$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls < 2.6.0'
+ 				$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls >= 1.4.0'
  				ac_cv_GNUTLS_found=no
-@@ -96940,770 +43178,161 @@
- 		use_gnutls=no
- 	fi
+@@ -100970,151 +45087,12 @@
+ fi
  
--fi
--
--if test x$use_gnutls = xauto; then
+ if test x$use_gnutls = xauto; then
 -
 -for ac_header in gnutls/gnutls.h
 -do
@@ -101791,50 +105100,47 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -as_val=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
++	for ac_header in gnutls/gnutls.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
++if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
--
--ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lgnutls $GNUTLS_LIBS  $LIBS"
--
--
++#define HAVE_GNUTLS_GNUTLS_H 1
+ _ACEOF
+ 
+ fi
+@@ -101123,23 +45101,17 @@
+ 
+ 
+ 
 -
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lgnutls $GNUTLS_LIBS  $LIBS"
+ 
+ 
+ 
 -
 -        { $as_echo "$as_me:$LINENO: checking for gnutls_global_init in -lgnutls" >&5
--$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
+ $as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
 -if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+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.  */
--
--/* 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 gnutls_global_init ();
--int
--main ()
--{
--return gnutls_global_init ();
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -101157,580 +45129,116 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -101856,7 +105162,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
 -		  ac_cv_lib_ext_gnutls=yes
 -else
 -  $as_echo "$as_me: failed program was:" >&5
@@ -101969,7 +105276,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -GNUTLS_ENABLE = YES
 -"
 -SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{GNUTLS} = \"YES\";"
+-\$enabled{\"GNUTLS\"} = \"YES\";"
 -
 -		{ $as_echo "$as_me:$LINENO: checking whether gnutls_x509_crt_set_subject_key_id is declared" >&5
 -$as_echo_n "checking whether gnutls_x509_crt_set_subject_key_id is declared... " >&6; }
@@ -101993,19 +105300,11 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#ifndef gnutls_x509_crt_set_subject_key_id
 -  (void) gnutls_x509_crt_set_subject_key_id;
 -#endif
-+fi
- 
+-
 -  ;
 -  return 0;
 -}
-+if test x$use_gnutls = xauto; then
-+	for ac_header in gnutls/gnutls.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
-+if test "x$ac_cv_header_gnutls_gnutls_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_GNUTLS_H 1
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -102028,46 +105327,40 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id=no
- fi
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&5
 -$as_echo "$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" >&6; }
 -if test "x$ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" = x""yes; then
-+done
- 
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID 1
 -_ACEOF
- 
+-
 -fi
- 
+-
 -	fi
-+ac_check_lib_ext_save_LIBS=$LIBS
-+LIBS="-lgnutls $GNUTLS_LIBS  $LIBS"
- 
+-
 -MAKE_SETTINGS="$MAKE_SETTINGS
 -GNUTLS_LIBS = $GNUTLS_LIBS
 -GNUTLS_CFLAGS =
 -GNUTLS_CPPFLAGS =
 -GNUTLS_LDFLAGS =
 -"
- 
- 
+-
+-
 -fi
 -if test x$use_gnutls = xyes; then
 -	#Some older versions have a different type name
 -	{ $as_echo "$as_me:$LINENO: checking for gnutls_datum" >&5
 -$as_echo_n "checking for gnutls_datum... " >&6; }
 -if test "${ac_cv_type_gnutls_datum+set}" = set; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
-+$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
-+if test "${ac_cv_lib_ext_gnutls_gnutls_global_init+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_cv_type_gnutls_datum=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -102109,27 +105402,18 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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 "gnutls/gnutls.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 gnutls_global_init ();
- int
- main ()
- {
+-
+-int
+-main ()
+-{
 -if (sizeof ((gnutls_datum)))
 -	  return 0;
-+return gnutls_global_init ();
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -102157,39 +105441,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_gnutls_gnutls_global_init=yes;
-+		  ac_cv_lib_ext_gnutls=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
-+  ac_cv_lib_ext_gnutls_gnutls_global_init=no;
-+		  ac_cv_lib_ext_gnutls=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum" >&5
 -$as_echo "$ac_cv_type_gnutls_datum" >&6; }
 -if test "x$ac_cv_type_gnutls_datum" = x""yes; then
 -
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_GNUTLS_DATUM 1
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
-+$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
-+    if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_GNUTLS_GLOBAL_INIT 1
- _ACEOF
- 
+-_ACEOF
+-
+-
+-fi
 -
- fi
-+LIBS=$ac_check_lib_ext_save_LIBS
- 
 -	{ $as_echo "$as_me:$LINENO: checking for gnutls_datum_t" >&5
 -$as_echo_n "checking for gnutls_datum_t... " >&6; }
 -if test "${ac_cv_type_gnutls_datum_t+set}" = set; then
@@ -102198,15 +105469,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  ac_cv_type_gnutls_datum_t=no
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+if test $ac_cv_lib_ext_gnutls = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGNUTLS 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include "gnutls/gnutls.h"
- 
+-
 -int
 -main ()
 -{
@@ -102241,14 +105509,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include "gnutls/gnutls.h"
-+		case "$GNUTLS_LIBS" in
-+		    *-lgnutls*)
-+			;;
-+		    *)
-+			GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
-+			;;
-+		esac
- 
+-
 -int
 -main ()
 -{
@@ -102277,42 +105538,72 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  :
++		  ac_cv_lib_ext_gnutls=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_ext_gnutls_gnutls_global_init=no;
++		  ac_cv_lib_ext_gnutls=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: $ac_cv_lib_ext_gnutls_gnutls_global_init" >&5
++$as_echo "$ac_cv_lib_ext_gnutls_gnutls_global_init" >&6; }
++    if test $ac_cv_lib_ext_gnutls_gnutls_global_init = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GNUTLS_GLOBAL_INIT 1
++_ACEOF
+ 
+-	ac_cv_type_gnutls_datum_t=yes
+ fi
++LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++if test $ac_cv_lib_ext_gnutls = yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBGNUTLS 1
++_ACEOF
++
++		case "$GNUTLS_LIBS" in
++		    *-lgnutls*)
++			;;
++		    *)
++			GNUTLS_LIBS="-lgnutls $GNUTLS_LIBS"
++			;;
++		esac
+ 
  
--	ac_cv_type_gnutls_datum_t=yes
  fi
 +	ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_version" "ac_cv_have_decl_gnutls_x509_crt_set_version" "
 +	#include <gnutls/gnutls.h>
 +	#include <gnutls/x509.h>
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++
 +"
 +if test "x$ac_cv_have_decl_gnutls_x509_crt_set_version" = x""yes; then :
- 
++
 +$as_echo "#define HAVE_GNUTLS_X509_CRT_SET_VERSION 1" >>confdefs.h
  
- fi
- 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_gnutls_datum_t" >&5
 -$as_echo "$ac_cv_type_gnutls_datum_t" >&6; }
 -if test "x$ac_cv_type_gnutls_datum_t" = x""yes; then
-+	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
  
 -cat >>confdefs.h <<_ACEOF
 -#define HAVE_GNUTLS_DATUM_T 1
 -_ACEOF
++	if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes" -a x"$ac_cv_have_decl_gnutls_x509_crt_set_version" = x"yes";then
++
 +	MAKE_SETTINGS="$MAKE_SETTINGS
 +GNUTLS_ENABLE = YES
 +"
 +SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{GNUTLS} = \"YES\";"
++\$enabled{\"GNUTLS\"} = \"YES\";"
 +
 +		ac_fn_c_check_decl "$LINENO" "gnutls_x509_crt_set_subject_key_id" "ac_cv_have_decl_gnutls_x509_crt_set_subject_key_id" "
 +	#include <gnutls/gnutls.h>
@@ -102506,7 +105797,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -97712,23 +43341,17 @@
+@@ -101739,23 +45247,17 @@
  
  
  
@@ -102533,7 +105824,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -97746,54 +43369,28 @@
+@@ -101773,54 +45275,28 @@
    return 0;
  }
  _ACEOF
@@ -102595,7 +105886,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGCRYPT 1
  _ACEOF
-@@ -97809,7 +43406,6 @@
+@@ -101836,7 +45312,6 @@
  
  fi
  
@@ -102603,7 +105894,647 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  MAKE_SETTINGS="$MAKE_SETTINGS
  GCRYPT_LIBS = $GCRYPT_LIBS
  GCRYPT_CFLAGS =
-@@ -97847,19 +43443,17 @@
+@@ -101853,7 +45328,7 @@
+ 
+ use_netapi=auto
+ # Check whether --enable-netapi was given.
+-if test "${enable_netapi+set}" = set; then
++if test "${enable_netapi+set}" = set; then :
+   enableval=$enable_netapi; if test x$enable_netapi = xno; then
+         use_netapi=no
+     fi
+@@ -101875,151 +45350,12 @@
+ \$enabled{\"TORTURE_LIBNETAPI\"} = \"NO\";"
+ 
+ if test x$use_netapi != xno; then
+-
+-for ac_header in netapi.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 netapi.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "netapi.h" "ac_cv_header_netapi_h" "$ac_includes_default"
++if test "x$ac_cv_header_netapi_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_NETAPI_H 1
+ _ACEOF
+ 
+ fi
+@@ -102028,23 +45364,17 @@
+ 
+ 
+ 
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for libnetapi_init in -lnetapi" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnetapi_init in -lnetapi" >&5
+ $as_echo_n "checking for libnetapi_init in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_libnetapi_init+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_libnetapi_init+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -102062,54 +45392,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_netapi_libnetapi_init=yes;
+ 		  ac_cv_lib_ext_netapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_netapi_libnetapi_init=no;
++  ac_cv_lib_ext_netapi_libnetapi_init=no;
+ 		  ac_cv_lib_ext_netapi=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_libnetapi_init" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_libnetapi_init" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_libnetapi_init" >&6; }
+-    if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then
++    if test $ac_cv_lib_ext_netapi_libnetapi_init = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI_INIT 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -102126,24 +45430,17 @@
+ fi
+ 
+ 
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for NetUserModalsGet in -lnetapi" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserModalsGet in -lnetapi" >&5
+ $as_echo_n "checking for NetUserModalsGet in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserModalsGet+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -102161,54 +45458,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_netapi_NetUserModalsGet=yes;
+ 		  ac_cv_lib_ext_netapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_netapi_NetUserModalsGet=no;
++  ac_cv_lib_ext_netapi_NetUserModalsGet=no;
+ 		  ac_cv_lib_ext_netapi=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserModalsGet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserModalsGet" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserModalsGet" >&6; }
+-    if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then
++    if test $ac_cv_lib_ext_netapi_NetUserModalsGet = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERMODALSGET 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -102225,24 +45496,17 @@
+ fi
+ 
+ 
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for NetUserGetGroups in -lnetapi" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetGroups in -lnetapi" >&5
+ $as_echo_n "checking for NetUserGetGroups in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserGetGroups+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -102260,54 +45524,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_netapi_NetUserGetGroups=yes;
+ 		  ac_cv_lib_ext_netapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_netapi_NetUserGetGroups=no;
++  ac_cv_lib_ext_netapi_NetUserGetGroups=no;
+ 		  ac_cv_lib_ext_netapi=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserGetGroups" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetGroups" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserGetGroups" >&6; }
+-    if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then
++    if test $ac_cv_lib_ext_netapi_NetUserGetGroups = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERGETGROUPS 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -102324,24 +45562,17 @@
+ fi
+ 
+ 
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for NetUserGetInfo in -lnetapi" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserGetInfo in -lnetapi" >&5
+ $as_echo_n "checking for NetUserGetInfo in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserGetInfo+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -102359,54 +45590,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_netapi_NetUserGetInfo=yes;
+ 		  ac_cv_lib_ext_netapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_netapi_NetUserGetInfo=no;
++  ac_cv_lib_ext_netapi_NetUserGetInfo=no;
+ 		  ac_cv_lib_ext_netapi=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserGetInfo" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserGetInfo" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserGetInfo" >&6; }
+-    if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then
++    if test $ac_cv_lib_ext_netapi_NetUserGetInfo = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERGETINFO 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -102423,24 +45628,17 @@
+ fi
+ 
+ 
+-
+-
+ ac_check_lib_ext_save_LIBS=$LIBS
+ LIBS="-lnetapi $NETAPI_LIBS  $LIBS"
+ 
+ 
+ 
+-
+-        { $as_echo "$as_me:$LINENO: checking for NetUserSetInfo in -lnetapi" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NetUserSetInfo in -lnetapi" >&5
+ $as_echo_n "checking for NetUserSetInfo in -lnetapi... " >&6; }
+-if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+set}" = set; then
++if test "${ac_cv_lib_ext_netapi_NetUserSetInfo+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.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -102458,54 +45656,28 @@
+   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
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_netapi_NetUserSetInfo=yes;
+ 		  ac_cv_lib_ext_netapi=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ext_netapi_NetUserSetInfo=no;
++  ac_cv_lib_ext_netapi_NetUserSetInfo=no;
+ 		  ac_cv_lib_ext_netapi=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_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_netapi_NetUserSetInfo" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_netapi_NetUserSetInfo" >&5
+ $as_echo "$ac_cv_lib_ext_netapi_NetUserSetInfo" >&6; }
+-    if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then
++    if test $ac_cv_lib_ext_netapi_NetUserSetInfo = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_NETUSERSETINFO 1
+ _ACEOF
+ 
+ fi
+-
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
+-if test $ac_cv_lib_ext_netapi = yes; then
++if test $ac_cv_lib_ext_netapi = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNETAPI 1
+ _ACEOF
+@@ -102520,12 +45692,9 @@
+ 
+ 
+ fi
+-
+ 	if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_LIBNETAPI 1
+-_ACEOF
++$as_echo "#define ENABLE_LIBNETAPI 1" >>confdefs.h
+ 
+ 
+ 	MAKE_SETTINGS="$MAKE_SETTINGS
+@@ -102543,9 +45712,7 @@
+ 
+ 	else
+ 		if test x$use_netapi != xauto; then
+-			{ { $as_echo "$as_me:$LINENO: error: --enable-netapi: libnetapi not found" >&5
+-$as_echo "$as_me: error: --enable-netapi: libnetapi not found" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "--enable-netapi: libnetapi not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -102586,19 +45753,17 @@
  
  #################################################
  # check for pthread support
@@ -102627,7 +106558,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  		fi
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97877,12 +43471,12 @@
+@@ -102616,12 +45781,12 @@
  
  	;;
  	*)
@@ -102642,7 +106573,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -97898,274 +43492,45 @@
+@@ -102637,274 +45802,45 @@
  
  
  
@@ -102930,7 +106861,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -98183,54 +43548,28 @@
+@@ -102922,54 +45858,28 @@
    return 0;
  }
  _ACEOF
@@ -102992,7 +106923,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSETPROCTITLE 1
  _ACEOF
-@@ -98246,15 +43585,14 @@
+@@ -102985,15 +45895,14 @@
  
  fi
  
@@ -103010,8 +106941,8 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "yes" >&6; }
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98264,22 +43602,20 @@
- \$enabled{SETPROCTITLE} = \"YES\";"
+@@ -103003,22 +45912,20 @@
+ \$enabled{\"SETPROCTITLE\"} = \"YES\";"
  
  
 -cat >>confdefs.h <<\_ACEOF
@@ -103037,7 +106968,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "no" >&6; }
  
  fi
-@@ -98297,17 +43633,13 @@
+@@ -103036,238 +45943,68 @@
  
  
  
@@ -103058,10 +106989,21 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  #include <sys/types.h>
-@@ -98326,209 +43658,43 @@
-   return 0;
- }
- _ACEOF
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+-int
+-main ()
+-{
+-struct stat st;
+- st.st_mtim.tv_nsec;
+- st.st_atim.tv_nsec;
+- st.st_ctim.tv_nsec;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
@@ -103080,33 +107022,29 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_decl_have_stat_tv_nsec=yes
- else
+-  ac_cv_decl_have_stat_tv_nsec=yes
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_decl_have_stat_tv_nsec=no
-+  ac_cv_decl_have_stat_tv_nsec=no
- fi
+-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
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_stat_tv_nsec" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_stat_tv_nsec" >&5
- $as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
- if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
- 
+-$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
+-if test x"$ac_cv_decl_have_stat_tv_nsec" = x"yes"; then
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STAT_TV_NSEC 1
 -_ACEOF
-+$as_echo "#define HAVE_STAT_TV_NSEC 1" >>confdefs.h
- 
- fi
- 
 -
- for ac_header in blkid/blkid.h
+-fi
+-
+-
+-for ac_header in blkid/blkid.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
@@ -103161,7 +107099,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -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; }
--
++int
++main ()
++{
++struct stat st;
++ st.st_mtim.tv_nsec;
++ st.st_atim.tv_nsec;
++ st.st_ctim.tv_nsec;
+ 
 -# Is the header present?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
 -$as_echo_n "checking $ac_header presence... " >&6; }
@@ -103172,7 +107117,10 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
--_ACEOF
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -103191,17 +107139,26 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_decl_have_stat_tv_nsec=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  ac_cv_decl_have_stat_tv_nsec=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
 -  ac_header_preproc=no
--fi
--
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_stat_tv_nsec" >&5
++$as_echo "$ac_cv_have_stat_tv_nsec" >&6; }
++if test x"$ac_cv_decl_have_stat_tv_nsec" = 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_STAT_TV_NSEC 1" >>confdefs.h
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -103238,16 +107195,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
+ 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 blkid/blkid.h
 +do :
 +  ac_fn_c_check_header_mongrel "$LINENO" "blkid/blkid.h" "ac_cv_header_blkid_blkid_h" "$ac_includes_default"
 +if test "x$ac_cv_header_blkid_blkid_h" = x""yes; then :
@@ -103279,7 +107237,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -98546,46 +43712,15 @@
+@@ -103285,46 +46022,15 @@
    return 0;
  }
  _ACEOF
@@ -103330,7 +107288,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -98603,65 +43738,32 @@
+@@ -103342,65 +46048,32 @@
    return 0;
  }
  _ACEOF
@@ -103357,13 +107315,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
    ac_cv_search_ext_blkid_get_cache="-l$ac_lib"
--break
+ break
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
-+break
  fi
 -
 -rm -rf conftest.dSYM
@@ -103405,7 +107362,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  /* Define blkid_get_cache to an innocuous variant, in case <limits.h> declares blkid_get_cache.
     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-@@ -98702,50 +43804,24 @@
+@@ -103441,50 +46114,24 @@
    return 0;
  }
  _ACEOF
@@ -103462,7 +107419,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  MAKE_SETTINGS="$MAKE_SETTINGS
  BLKID_LIBS = ${BLKID_LIBS}
  BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -98756,9 +43832,7 @@
+@@ -103495,9 +46142,7 @@
  
  if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
  
@@ -103473,7 +107430,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  	MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98786,102 +43860,12 @@
+@@ -103525,102 +46170,12 @@
  
  fi
  
@@ -103580,7 +107537,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -98891,151 +43875,12 @@
+@@ -103630,151 +46185,12 @@
  ###############################
  # start SMB_EXT_LIB_PAM
  # check for security/pam_appl.h and -lpam
@@ -103736,7 +107693,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -99044,23 +43889,17 @@
+@@ -103783,23 +46199,17 @@
  
  
  
@@ -103763,7 +107720,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -99078,54 +43917,28 @@
+@@ -103817,54 +46227,28 @@
    return 0;
  }
  _ACEOF
@@ -103825,7 +107782,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPAM 1
  _ACEOF
-@@ -99140,7 +43953,6 @@
+@@ -103879,7 +46263,6 @@
  
  
  fi
@@ -103833,7 +107790,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -99166,23 +43978,17 @@
+@@ -103905,23 +46288,17 @@
  # test for where we get crypt() from
  
  
@@ -103860,7 +107817,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -99200,54 +44006,28 @@
+@@ -103939,54 +46316,28 @@
    return 0;
  }
  _ACEOF
@@ -103922,7 +107879,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCRYPT 1
  _ACEOF
-@@ -99263,7 +44043,6 @@
+@@ -104002,7 +46353,6 @@
  
  fi
  
@@ -103930,7 +107887,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	MAKE_SETTINGS="$MAKE_SETTINGS
  CRYPT_ENABLE = YES
  "
-@@ -99280,102 +44059,12 @@
+@@ -104019,102 +46369,12 @@
  
  
  
@@ -104038,7 +107995,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -99384,151 +44073,12 @@
+@@ -104123,151 +46383,12 @@
  done
  
  
@@ -104194,44 +108151,37 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -99537,330 +44087,18 @@
+@@ -104276,23 +46397,17 @@
  
  
  
 -
  ac_check_lib_ext_save_LIBS=$LIBS
--LIBS="-lsasl2 $SASL_LIBS  $LIBS"
--
--
--
+ LIBS="-lsasl2 $SASL_LIBS  $LIBS"
+ 
+ 
+ 
 -
 -        { $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
--$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
+ $as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
 -if test "${ac_cv_lib_ext_sasl2_sasl_client_init+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++if test "${ac_cv_lib_ext_sasl2_sasl_client_init+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.  */
--
--/* 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 sasl_client_init ();
--int
--main ()
--{
--return sasl_client_init ();
--  ;
--  return 0;
--}
--_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -104310,54 +46425,28 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -104253,74 +108203,89 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--  ac_cv_lib_ext_sasl2_sasl_client_init=yes;
--		  ac_cv_lib_ext_sasl2=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ext_sasl2_sasl_client_init=yes;
+ 		  ac_cv_lib_ext_sasl2=yes
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_lib_ext_sasl2_sasl_client_init=no;
--		  ac_cv_lib_ext_sasl2=no
--fi
++  ac_cv_lib_ext_sasl2_sasl_client_init=no;
+ 		  ac_cv_lib_ext_sasl2=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
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
--$as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
+ $as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
 -    if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_SASL_CLIENT_INIT 1
--_ACEOF
--
--fi
--
--LIBS=$ac_check_lib_ext_save_LIBS
++    if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SASL_CLIENT_INIT 1
+ _ACEOF
+ 
+ fi
 -
+ LIBS=$ac_check_lib_ext_save_LIBS
+ 
 -if test $ac_cv_lib_ext_sasl2 = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBSASL2 1
--_ACEOF
++if test $ac_cv_lib_ext_sasl2 = yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSASL2 1
+ _ACEOF
+@@ -104373,7 +46462,6 @@
+ 
+ fi
+ 
 -
--		case "$SASL_LIBS" in
--		    *-lsasl2*)
--			;;
--		    *)
--			SASL_LIBS="-lsasl2 $SASL_LIBS"
--			;;
--		esac
+ 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 @@
+             ac_new_flags="$ac_new_flags$s$i";
+         else
+             ac_new_flags="$ac_new_flags$s$l $i";
+-        fi
+-        l=""
+-        ;;
+-    esac
+-  done
+-  SASL_LDFLAGS=$ac_new_flags
 -
 -
--fi
+-  ac_new_flags=""
+-  for i in $SASL_CPPFLAGS; do
+-    case $i in
+-    -I/usr/include|-I/usr/include/) ;;
+-    *) ac_new_flags="$ac_new_flags $i" ;;
+-    esac
+-  done
+-  SASL_CPPFLAGS=$ac_new_flags
 -
 -
--if test x"$ac_cv_header_sasl_sasl_h" = x"yes" -a x"$ac_cv_lib_ext_sasl2_sasl_client_init" = x"yes";then
+-  ac_new_flags=""
+-  for i in $SASL_CFLAGS; do
+-    case $i in
+-    -I/usr/include|-I/usr/include/) ;;
+-    *) ac_new_flags="$ac_new_flags $i" ;;
+-    esac
+-  done
+-  SASL_CFLAGS=$ac_new_flags
 -
--	MAKE_SETTINGS="$MAKE_SETTINGS
--SASL_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{SASL} = \"YES\";"
--
--
--	MAKE_SETTINGS="$MAKE_SETTINGS
--cyrus_sasl_ENABLE = YES
--"
--SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{cyrus_sasl} = \"YES\";"
--
--	SASL_CFLAGS="$CFLAGS"
--	SASL_CPPFLAGS="$CPPFLAGS"
--	SASL_LDFLAGS="$LDFLAGS"
 -else
 -
 -	MAKE_SETTINGS="$MAKE_SETTINGS
 -cyrus_sasl_ENABLE = NO
 -"
 -SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{cyrus_sasl} = \"NO\";"
+-\$enabled{\"cyrus_sasl\"} = \"NO\";"
 -
 -fi
 -
@@ -104339,7 +108304,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -server_service_kdc_ENABLE = $HAVE_KRB5
 -"
 -SMB_INFO_ENABLES="$SMB_INFO_ENABLES
--\$enabled{server_service_kdc} = \"$HAVE_KRB5\";"
+-\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
 -
 -
 -
@@ -104433,14 +108398,38 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++        fi
++        l=""
++        ;;
++    esac
++  done
++  SASL_LDFLAGS=$ac_new_flags
+ 
 -  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; }
--
++  ac_new_flags=""
++  for i in $SASL_CPPFLAGS; do
++    case $i in
++    -I/usr/include|-I/usr/include/) ;;
++    *) ac_new_flags="$ac_new_flags $i" ;;
++    esac
++  done
++  SASL_CPPFLAGS=$ac_new_flags
++
++
++  ac_new_flags=""
++  for i in $SASL_CFLAGS; do
++    case $i in
++    -I/usr/include|-I/usr/include/) ;;
++    *) ac_new_flags="$ac_new_flags $i" ;;
++    esac
++  done
++  SASL_CFLAGS=$ac_new_flags
+ 
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -104475,14 +108464,14 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
+ 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"'`
@@ -104490,11 +108479,16 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
--fi
--
++	MAKE_SETTINGS="$MAKE_SETTINGS
++cyrus_sasl_ENABLE = NO
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"cyrus_sasl\"} = \"NO\";"
+ 
+ fi
+ 
 -done
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking for inotify_init" >&5
 -$as_echo_n "checking for inotify_init... " >&6; }
 -if test "${ac_cv_func_inotify_init+set}" = set; then
@@ -104509,7 +108503,12 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -/* Define inotify_init to an innocuous variant, in case <limits.h> declares inotify_init.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define inotify_init innocuous_inotify_init
-+LIBS="-lsasl2 $SASL_LIBS  $LIBS"
++MAKE_SETTINGS="$MAKE_SETTINGS
++SASL_LIBS = $SASL_LIBS
++SASL_CFLAGS = ${SASL_CFLAGS}
++SASL_CPPFLAGS = ${SASL_CPPFLAGS}
++SASL_LDFLAGS = ${SASL_LDFLAGS}
++"
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char inotify_init (); below.
@@ -104523,20 +108522,13 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#endif
  
 -#undef inotify_init
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_client_init in -lsasl2" >&5
-+$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
-+if test "${ac_cv_lib_ext_sasl2_sasl_client_init+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
-@@ -99868,70 +44106,125 @@
- #ifdef __cplusplus
- extern "C"
- #endif
+-/* 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 inotify_init ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
@@ -104544,16 +108536,28 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -#if defined __stub_inotify_init || defined __stub___inotify_init
 -choke me
 -#endif
--
-+char sasl_client_init ();
- int
- main ()
- {
++	MAKE_SETTINGS="$MAKE_SETTINGS
++server_service_kdc_ENABLE = $HAVE_KRB5
++"
++SMB_INFO_ENABLES="$SMB_INFO_ENABLES
++\$enabled{\"server_service_kdc\"} = \"$HAVE_KRB5\";"
+ 
+-int
+-main ()
+-{
 -return inotify_init ();
-+return sasl_client_init ();
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++
++for ac_header in linux/inotify.h asm/unistd.h sys/inotify.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 -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
@@ -104577,100 +108581,9 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_func_inotify_init=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ext_sasl2_sasl_client_init=yes;
-+		  ac_cv_lib_ext_sasl2=yes
- else
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_lib_ext_sasl2_sasl_client_init=no;
-+		  ac_cv_lib_ext_sasl2=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: $ac_cv_lib_ext_sasl2_sasl_client_init" >&5
-+$as_echo "$ac_cv_lib_ext_sasl2_sasl_client_init" >&6; }
-+    if test $ac_cv_lib_ext_sasl2_sasl_client_init = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SASL_CLIENT_INIT 1
-+_ACEOF
-+
-+fi
-+LIBS=$ac_check_lib_ext_save_LIBS
-+
-+if test $ac_cv_lib_ext_sasl2 = yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSASL2 1
-+_ACEOF
-+
-+		case "$SASL_LIBS" in
-+		    *-lsasl2*)
-+			;;
-+		    *)
-+			SASL_LIBS="-lsasl2 $SASL_LIBS"
-+			;;
-+		esac
-+
-+
-+fi
-+
-+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
-+SASL_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{SASL} = \"YES\";"
-+
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+cyrus_sasl_ENABLE = YES
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{cyrus_sasl} = \"YES\";"
-+
-+	SASL_CFLAGS="$CFLAGS"
-+	SASL_CPPFLAGS="$CPPFLAGS"
-+	SASL_LDFLAGS="$LDFLAGS"
-+else
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+cyrus_sasl_ENABLE = NO
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{cyrus_sasl} = \"NO\";"
-+
-+fi
-+
-+
-+MAKE_SETTINGS="$MAKE_SETTINGS
-+SASL_LIBS = $SASL_LIBS
-+SASL_CFLAGS = ${SASL_CFLAGS}
-+SASL_CPPFLAGS = ${SASL_CPPFLAGS}
-+SASL_LDFLAGS = ${SASL_LDFLAGS}
-+"
-+
-+
-+
-+
-+	MAKE_SETTINGS="$MAKE_SETTINGS
-+server_service_kdc_ENABLE = $HAVE_KRB5
-+"
-+SMB_INFO_ENABLES="$SMB_INFO_ENABLES
-+\$enabled{server_service_kdc} = \"$HAVE_KRB5\";"
-+
-+
-+for ac_header in linux/inotify.h asm/unistd.h sys/inotify.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
  
 -	ac_cv_func_inotify_init=no
  fi
@@ -104705,7 +108618,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <asm/unistd.h>
  int
-@@ -99942,41 +44235,18 @@
+@@ -104735,41 +46599,18 @@
    return 0;
  }
  _ACEOF
@@ -104751,7 +108664,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
   fi
  
-@@ -100020,17 +44290,13 @@
+@@ -104813,17 +46654,13 @@
  fi
  
  
@@ -104772,7 +108685,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <fcntl.h>
  int
-@@ -100041,56 +44307,29 @@
+@@ -104834,56 +46671,29 @@
    return 0;
  }
  _ACEOF
@@ -104836,7 +108749,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  #include <signal.h>
  int
-@@ -100101,41 +44340,18 @@
+@@ -104894,41 +46704,18 @@
    return 0;
  }
  _ACEOF
@@ -104882,7 +108795,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
   fi
  
-@@ -100159,151 +44375,12 @@
+@@ -104952,151 +46739,12 @@
  
  fi
  
@@ -105039,7 +108952,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -100617,151 +44694,12 @@
+@@ -105410,151 +47058,12 @@
  
  
  
@@ -105195,7 +109108,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  fi
-@@ -100771,23 +44709,17 @@
+@@ -105564,23 +47073,17 @@
  
  
  
@@ -105222,7 +109135,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  /* Override any GCC internal prototype to avoid an error.
-@@ -100805,54 +44737,28 @@
+@@ -105598,54 +47101,28 @@
    return 0;
  }
  _ACEOF
@@ -105284,7 +109197,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBZ 1
  _ACEOF
-@@ -100868,18 +44774,13 @@
+@@ -105661,18 +47138,13 @@
  
  fi
  
@@ -105306,7 +109219,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  /* end confdefs.h.  */
  
  		#include <zlib.h>
-@@ -100897,40 +44798,19 @@
+@@ -105690,40 +47162,19 @@
    return 0;
  }
  _ACEOF
@@ -105349,7 +109262,33 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$samba_cv_zlib_1_2_3" >&6; }
  
  if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -101044,87 +44924,54 @@
+@@ -105745,7 +47196,7 @@
+ 
+ 
+ # Check whether --enable-dmalloc was given.
+-if test "${enable_dmalloc+set}" = set; then
++if test "${enable_dmalloc+set}" = set; then :
+   enableval=$enable_dmalloc;
+ fi
+ 
+@@ -105753,14 +47204,10 @@
+ if test "x$enable_dmalloc" = xyes
+ then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_DMALLOC 1
+-_ACEOF
++$as_echo "#define ENABLE_DMALLOC 1" >>confdefs.h
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DMALLOC_FUNC_CHECK 1
+-_ACEOF
++$as_echo "#define DMALLOC_FUNC_CHECK 1" >>confdefs.h
+ 
+ 	LIBS="$LIBS -ldmalloc"
+ fi
+@@ -105858,87 +47305,54 @@
  #################################################
  # Display summary of libraries detected
  
@@ -105453,7 +109392,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -101183,13 +45030,13 @@
+@@ -105997,13 +47411,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -105469,7 +109408,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
        esac ;;
      esac
    done
-@@ -101197,8 +45044,8 @@
+@@ -106011,8 +47425,8 @@
    (set) 2>&1 |
      case $as_nl`(ac_space=' '; set) 2>&1` in #(
      *${as_nl}ac_space=\ *)
@@ -105480,7 +109419,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
        sed -n \
  	"s/'/'\\\\''/g;
  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -101221,11 +45068,11 @@
+@@ -106035,11 +47449,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" &&
@@ -105494,7 +109433,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
    fi
  fi
-@@ -101245,8 +45092,8 @@
+@@ -106059,8 +47473,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.
@@ -105505,7 +109444,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  done
  LIBOBJS=$ac_libobjs
  
-@@ -101270,9 +45117,10 @@
+@@ -106084,9 +47498,10 @@
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -105518,7 +109457,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -101282,17 +45130,18 @@
+@@ -106096,17 +47511,18 @@
  debug=false
  ac_cs_recheck=false
  ac_cs_silent=false
@@ -105544,7 +109483,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -101300,23 +45149,15 @@
+@@ -106114,23 +47530,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -105573,7 +109512,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  as_nl='
  '
  export as_nl
-@@ -101324,7 +45165,13 @@
+@@ -106138,7 +47546,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
@@ -105588,7 +109527,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -101335,7 +45182,7 @@
+@@ -106149,7 +47563,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -105597,7 +109536,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -101358,13 +45205,6 @@
+@@ -106172,13 +47586,6 @@
    }
  fi
  
@@ -105611,7 +109550,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -101374,15 +45214,15 @@
+@@ -106188,15 +47595,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -105630,7 +109569,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  IFS=$as_save_IFS
  
       ;;
-@@ -101394,12 +45234,16 @@
+@@ -106208,12 +47615,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -105651,7 +109590,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  done
  PS1='$ '
  PS2='> '
-@@ -101411,7 +45255,89 @@
+@@ -106225,7 +47636,89 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -105742,7 +109681,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -101425,8 +45351,12 @@
+@@ -106239,8 +47732,12 @@
    as_basename=false
  fi
  
@@ -105756,7 +109695,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
-@@ -101446,76 +45376,25 @@
+@@ -106260,76 +47757,25 @@
  	  }
  	  s/.*/./; q'`
  
@@ -105844,7 +109783,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -101544,8 +45423,56 @@
+@@ -106358,8 +47804,56 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
  
@@ -105902,7 +109841,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -101564,10 +45491,10 @@
+@@ -106378,10 +47872,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -105915,7 +109854,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -101582,13 +45509,19 @@
+@@ -106396,13 +47890,19 @@
  
  
  exec 6>&1
@@ -105937,7 +109876,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -101620,13 +45553,15 @@
+@@ -106434,13 +47934,15 @@
  
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  ac_cs_usage="\
@@ -105956,7 +109895,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    -q, --quiet, --silent
                     do not print progress messages
    -d, --debug      don't remove temporary files
-@@ -101645,16 +45580,17 @@
+@@ -106459,16 +47961,17 @@
  Configuration commands:
  $config_commands
  
@@ -105978,7 +109917,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -101689,6 +45625,8 @@
+@@ -106503,6 +48006,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
      $as_echo "$ac_cs_version"; exit ;;
@@ -105987,7 +109926,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
-@@ -101696,20 +45634,19 @@
+@@ -106510,20 +48015,19 @@
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
@@ -106012,7 +109951,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -101717,11 +45654,10 @@
+@@ -106531,11 +48035,10 @@
      ac_cs_silent=: ;;
  
    # This is an error.
@@ -106027,7 +109966,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
       ac_need_defaults=false ;;
  
    esac
-@@ -101814,9 +45750,7 @@
+@@ -106628,9 +48131,7 @@
      "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
      "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
  
@@ -106038,7 +109977,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    esac
  done
  
-@@ -101843,7 +45777,7 @@
+@@ -106657,7 +48158,7 @@
    trap 'exit_status=$?
    { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
  ' 0
@@ -106047,7 +109986,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  }
  # Create a (secure) tmp directory for tmp files.
  
-@@ -101854,11 +45788,7 @@
+@@ -106668,11 +48169,7 @@
  {
    tmp=./conf$$-$RANDOM
    (umask 077 && mkdir "$tmp")
@@ -106060,7 +109999,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -101866,10 +45796,16 @@
+@@ -106680,10 +48177,16 @@
  if test -n "$CONFIG_FILES"; then
  
  
@@ -106079,7 +110018,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  else
    ac_cs_awk_cr=$ac_cr
  fi
-@@ -101883,24 +45819,18 @@
+@@ -106697,24 +48200,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
  } >conf$$subs.sh ||
@@ -106107,7 +110046,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -101922,7 +45852,7 @@
+@@ -106736,7 +48233,7 @@
  t delim
  :nl
  h
@@ -106116,7 +110055,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  t more1
  s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
  p
-@@ -101936,7 +45866,7 @@
+@@ -106750,7 +48247,7 @@
  t nl
  :delim
  h
@@ -106125,7 +110064,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-@@ -101989,9 +45919,7 @@
+@@ -106803,9 +48300,7 @@
  else
    cat
  fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -106136,7 +110075,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  _ACEOF
  
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -102032,9 +45960,7 @@
+@@ -106846,9 +48341,7 @@
    if test -z "$ac_t"; then
      break
    elif $ac_last_try; then
@@ -106147,7 +110086,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    else
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -102119,9 +46045,7 @@
+@@ -106933,9 +48426,7 @@
  _ACAWK
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -106158,7 +110097,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  fi # test -n "$CONFIG_HEADERS"
  
  
-@@ -102134,9 +46058,7 @@
+@@ -106948,9 +48439,7 @@
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -106169,7 +110108,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -102164,12 +46086,10 @@
+@@ -106978,12 +48467,10 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -106184,7 +110123,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      done
  
      # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -102180,7 +46100,7 @@
+@@ -106994,7 +48481,7 @@
  	`' by configure.'
      if test x"$ac_file" != x-; then
        configure_input="$ac_file.  $configure_input"
@@ -106193,7 +110132,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: creating $ac_file" >&6;}
      fi
      # Neutralize special characters interpreted by sed in replacement strings.
-@@ -102193,9 +46113,7 @@
+@@ -107007,9 +48494,7 @@
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -106204,7 +110143,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
      esac
      ;;
    esac
-@@ -102223,47 +46141,7 @@
+@@ -107037,47 +48522,7 @@
  	    q
  	  }
  	  s/.*/./; q'`
@@ -106253,7 +110192,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
    ac_builddir=.
  
  case "$ac_dir" in
-@@ -102315,7 +46193,6 @@
+@@ -107129,7 +48574,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=
@@ -106261,7 +110200,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  ac_sed_dataroot='
  /datarootdir/ {
    p
-@@ -102325,12 +46202,11 @@
+@@ -107139,12 +48583,11 @@
  /@docdir@/p
  /@infodir@/p
  /@localedir@/p
@@ -106276,7 +110215,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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
-@@ -102340,7 +46216,7 @@
+@@ -107154,7 +48597,7 @@
    s&@infodir@&$infodir&g
    s&@localedir@&$localedir&g
    s&@mandir@&$mandir&g
@@ -106285,7 +110224,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  esac
  _ACEOF
  
-@@ -102368,14 +46244,12 @@
+@@ -107182,14 +48625,12 @@
  $ac_datarootdir_hack
  "
  eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -106302,7 +110241,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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;}
-@@ -102385,9 +46259,7 @@
+@@ -107199,9 +48640,7 @@
    -) cat "$tmp/out" && rm -f "$tmp/out";;
    *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
    esac \
@@ -106313,7 +110252,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
   ;;
    :H)
    #
-@@ -102398,29 +46270,23 @@
+@@ -107212,29 +48651,23 @@
        $as_echo "/* $configure_input  */" \
        && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
      } >"$tmp/config.h" \
@@ -106348,7 +110287,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: executing $ac_file commands" >&6;}
   ;;
    esac
-@@ -102446,15 +46312,12 @@
+@@ -107260,15 +48693,12 @@
  done # for ac_tag
  
  
@@ -106366,7 +110305,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -102475,10 +46338,10 @@
+@@ -107289,10 +48719,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.
@@ -106379,7 +110318,7 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.patch/source3/configure
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-@@ -102489,8 +46352,8 @@
+@@ -107303,8 +48733,8 @@
  # Print very concise instructions on building/use
  if test "x$enable_dmalloc" = xyes
  then
@@ -106390,17 +110329,17 @@ diff -Naur samba-3.4.5/source3/configure samba-3.4.5.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.4.5/source3/configure.in samba-3.4.5.patch/source3/configure.in
---- samba-3.4.5/source3/configure.in	2010-01-18 12:38:09.000000000 +0100
-+++ samba-3.4.5.patch/source3/configure.in	2010-02-18 09:19:10.615600853 +0100
-@@ -1224,34 +1224,7 @@
+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 @@
  #
  #
  #
 -case "$host_os" in
 -    *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 -       # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
+-       AC_CACHE_CHECK([for good getgrouplist],samba_cv_linux_getgrouplist_ok,[AC_TRY_RUN([
 -#include <unistd.h>
 -#include <sys/utsname.h>
 -main() {
@@ -106416,8 +110355,10 @@ diff -Naur samba-3.4.5/source3/configure.in samba-3.4.5.patch/source3/configure.
 -#endif
 -       exit(0);
 -}
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
--       if test x"$linux_getgrouplist_ok" = x"yes"; then
+-], [samba_cv_linux_getgrouplist_ok=yes],
+-   [samba_cv_linux_getgrouplist_ok=no],
+-   [samba_cv_linux_getgrouplist_ok=cross])])
+-       if test x"$samba_cv_linux_getgrouplist_ok" = x"yes"; then
 -          AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
 -       fi
 -       ;;
@@ -106429,10 +110370,10 @@ diff -Naur samba-3.4.5/source3/configure.in samba-3.4.5.patch/source3/configure.
  
  #
  # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
-diff -Naur samba-3.4.5/source3/include/config.h.in samba-3.4.5.patch/source3/include/config.h.in
---- samba-3.4.5/source3/include/config.h.in	2010-01-18 13:04:17.000000000 +0100
-+++ samba-3.4.5.patch/source3/include/config.h.in	2010-02-18 09:20:10.000000000 +0100
-@@ -2127,19 +2127,21 @@
+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 @@
  /* Whether struct ifaddrs is available */
  #undef HAVE_STRUCT_IFADDRS
  
@@ -106458,7 +110399,7 @@ diff -Naur samba-3.4.5/source3/include/config.h.in samba-3.4.5.patch/source3/inc
  #undef HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR
  
  /* Define to 1 if the system has the type `struct sockaddr'. */
-@@ -2148,37 +2150,37 @@
+@@ -2243,37 +2245,37 @@
  /* Define to 1 if the system has the type `struct sockaddr_in6'. */
  #undef HAVE_STRUCT_SOCKADDR_IN6
  
@@ -106506,7 +110447,7 @@ diff -Naur samba-3.4.5/source3/include/config.h.in samba-3.4.5.patch/source3/inc
  #undef HAVE_STRUCT_STAT_ST_UMTIME
  
  /* Whether we have struct timespec */
-@@ -2913,6 +2915,9 @@
+@@ -3026,6 +3028,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 f42277542e..3de7229e21 100644
--- a/packages/network/samba/url
+++ b/packages/network/samba/url
@@ -1 +1 @@
-http://samba.org/samba/ftp/stable/samba-3.4.5.tar.gz
\ No newline at end of file
+http://samba.org/samba/ftp/stable/samba-3.5.2.tar.gz
\ No newline at end of file