[Pkg-samba-maint] r3325 - trunk/samba/debian/patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Feb 27 05:59:42 UTC 2010
Author: bubulle
Date: 2010-02-27 05:59:38 +0000 (Sat, 27 Feb 2010)
New Revision: 3325
Modified:
trunk/samba/debian/patches/adapt_machine_creation_script.patch
trunk/samba/debian/patches/autoconf.patch
trunk/samba/debian/patches/documentation.patch
Log:
Adapt patches for 3.4.6
Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch 2010-02-25 22:04:31 UTC (rev 3324)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch 2010-02-27 05:59:38 UTC (rev 3325)
@@ -7,12 +7,12 @@
===================================================================
--- samba.orig/docs/manpages/smb.conf.5
+++ samba/docs/manpages/smb.conf.5
-@@ -877,8 +877,8 @@
+@@ -1153,8 +1153,8 @@
Default:
- \fI\fIadd machine script\fR\fR\fI = \fR\fI\fR\fI \fR
+ \fI\fIadd machine script\fR\fR\fI = \fR\fI\FC\F[]\fR\fI \fR
.sp
-Example:
--\fI\fIadd machine script\fR\fR\fI = \fR\fI/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\fR\fI \fR
+-\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\F[]\fR\fI \fR
+Example for Debian:
+\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-\-disabled-password \-\-ingroup machines \-\-gecos Machine \-\-home /var/lib/samba \-\-shell /bin/false %u\F[]\fR\fI \fR
.RE
Modified: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch 2010-02-25 22:04:31 UTC (rev 3324)
+++ trunk/samba/debian/patches/autoconf.patch 2010-02-27 05:59:38 UTC (rev 3325)
@@ -2486,10 +2486,10 @@
@@ -2683,13 +3267,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
@@ -48576,7 +48576,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -44916,2861 +12352,2216 @@
+@@ -44916,2855 +12352,2216 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -49959,13 +49959,7 @@
- *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; }; }; }
+- linux_getgrouplist_ok=cross
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
@@ -53029,7 +53023,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47778,100 +14569,41 @@
+@@ -47772,100 +14569,41 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53150,7 +53144,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -47880,111 +14612,149 @@
+@@ -47874,111 +14612,149 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53371,7 +53365,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -47992,100 +14762,67 @@
+@@ -47986,100 +14762,67 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53510,7 +53504,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48094,113 +14831,55 @@
+@@ -48088,113 +14831,55 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53651,7 +53645,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48208,100 +14887,42 @@
+@@ -48202,100 +14887,42 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -53772,7 +53766,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48310,213 +14931,299 @@
+@@ -48304,213 +14931,299 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54219,7 +54213,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -48525,111 +15232,223 @@
+@@ -48519,111 +15232,223 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54510,7 +54504,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48637,214 +15456,192 @@
+@@ -48631,214 +15456,192 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -54857,7 +54851,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -48852,856 +15649,641 @@
+@@ -48846,856 +15649,638 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -55466,10 +55460,7 @@
+ *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:${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; }
++ linux_getgrouplist_ok=cross
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
@@ -56152,7 +56143,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49709,85 +16291,43 @@
+@@ -49703,85 +16288,43 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56258,7 +56249,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -49796,108 +16336,44 @@
+@@ -49790,108 +16333,44 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56389,7 +56380,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -49905,103 +16381,80 @@
+@@ -49899,103 +16378,80 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56544,7 +56535,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50009,100 +16462,90 @@
+@@ -50003,100 +16459,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56708,7 +56699,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50110,82 +16553,90 @@
+@@ -50104,82 +16550,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -56857,7 +56848,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -50194,109 +16645,90 @@
+@@ -50188,109 +16642,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57026,7 +57017,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50304,105 +16736,92 @@
+@@ -50298,105 +16733,92 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57193,7 +57184,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50410,65 +16829,47 @@
+@@ -50404,65 +16826,47 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57289,7 +57280,7 @@
fi
done
-@@ -50476,39 +16877,43 @@
+@@ -50470,39 +16874,43 @@
@@ -57359,7 +57350,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50516,103 +16921,90 @@
+@@ -50510,103 +16918,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57524,7 +57515,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50620,102 +17012,91 @@
+@@ -50614,102 +17009,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57689,7 +57680,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50723,103 +17104,90 @@
+@@ -50717,103 +17101,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -57853,7 +57844,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50827,103 +17195,91 @@
+@@ -50821,103 +17192,91 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58018,7 +58009,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -50931,107 +17287,90 @@
+@@ -50925,107 +17284,90 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58188,7 +58179,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51039,190 +17378,77 @@
+@@ -51033,190 +17375,77 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58417,7 +58408,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51230,62 +17456,66 @@
+@@ -51224,62 +17453,66 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58529,7 +58520,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51293,39 +17523,27 @@
+@@ -51287,39 +17520,27 @@
fi
done
@@ -58585,7 +58576,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -51333,62 +17551,53 @@
+@@ -51327,62 +17548,53 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -58684,7 +58675,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51396,102 +17605,64 @@
+@@ -51390,102 +17602,64 @@
fi
done
@@ -58834,7 +58825,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51499,102 +17670,141 @@
+@@ -51493,102 +17667,141 @@
fi
done
@@ -59051,7 +59042,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -51606,7 +17816,7 @@
+@@ -51600,7 +17813,7 @@
esac
# Check whether --enable-static was given.
@@ -59060,7 +59051,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -51628,7 +17838,7 @@
+@@ -51622,7 +17835,7 @@
fi
# Check whether --enable-shared was given.
@@ -59069,7 +59060,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -51655,16 +17865,16 @@
+@@ -51649,16 +17862,16 @@
PIE_CFLAGS=""
PIE_LDFLAGS=""
# Check whether --enable-pie was given.
@@ -59089,7 +59080,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51673,11 +17883,11 @@
+@@ -51667,11 +17880,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&5'
@@ -59104,7 +59095,7 @@
then
samba_cv_fpie=yes
else
-@@ -51686,7 +17896,7 @@
+@@ -51680,7 +17893,7 @@
rm -f conftest*
fi
@@ -59113,7 +59104,7 @@
$as_echo "$samba_cv_fpie" >&6; }
if test x"${samba_cv_fpie}" = x"yes"
then
-@@ -51698,16 +17908,16 @@
+@@ -51692,16 +17905,16 @@
# Set defaults
RELRO_LDFLAGS=""
# Check whether --enable-relro was given.
@@ -59133,7 +59124,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -51716,11 +17926,11 @@
+@@ -51710,11 +17923,11 @@
main () { return 0;}
EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Wl,-z,relro -o conftest conftest.c 1>&5'
@@ -59148,7 +59139,7 @@
then
samba_cv_relro=yes
else
-@@ -51729,7 +17939,7 @@
+@@ -51723,7 +17936,7 @@
rm -f conftest*
fi
@@ -59157,7 +59148,7 @@
$as_echo "$samba_cv_relro" >&6; }
if test x"${samba_cv_relro}" = x"yes"
then
-@@ -51758,7 +17968,7 @@
+@@ -51752,7 +17965,7 @@
# You need to specify how to create a shared library and
# how to compile C code to produce PIC object files
@@ -59166,7 +59157,7 @@
$as_echo_n "checking ability to build shared libraries... " >&6; }
# and these are for particular systems
-@@ -51766,14 +17976,10 @@
+@@ -51760,14 +17973,10 @@
*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
case "$host_os" in
*linux*)
@@ -59183,7 +59174,7 @@
;;
esac
BLDSHARED="true"
-@@ -51785,15 +17991,11 @@
+@@ -51779,15 +17988,11 @@
DYNEXP="-Wl,--export-dynamic"
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
@@ -59201,7 +59192,7 @@
BLDSHARED="true"
LDSHFLAGS="-G"
-@@ -51811,33 +18013,23 @@
+@@ -51805,33 +18010,23 @@
LDSHFLAGS="-G \${CFLAGS}"
fi
@@ -59240,7 +59231,7 @@
;;
*netbsd* | *freebsd* | *dragonfly* )
-@@ -51847,14 +18039,10 @@
+@@ -51841,14 +18036,10 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC -DPIC"
@@ -59257,7 +59248,7 @@
;;
*openbsd*) BLDSHARED="true"
-@@ -51863,26 +18051,18 @@
+@@ -51857,26 +18048,18 @@
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC"
@@ -59288,7 +59279,7 @@
;;
esac
-@@ -51896,15 +18076,11 @@
+@@ -51890,15 +18073,11 @@
PICFLAG="-KPIC"
fi
@@ -59306,7 +59297,7 @@
BLDSHARED="true"
# use expfull to export underscored symbols
-@@ -51920,25 +18096,17 @@
+@@ -51914,25 +18093,17 @@
fi
@@ -59336,7 +59327,7 @@
# Use special PIC flags for the native HP-UX compiler.
BLDSHARED="true"
-@@ -51960,74 +18128,52 @@
+@@ -51954,74 +18125,52 @@
DYNEXP="-Wl,-E,+b/usr/local/lib:/usr/lib"
fi
@@ -59424,7 +59415,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ROFF"; then
-@@ -52038,91 +18184,71 @@
+@@ -52032,91 +18181,71 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -59531,7 +59522,7 @@
BLDSHARED="true"
LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-@@ -52136,16 +18262,12 @@
+@@ -52130,16 +18259,12 @@
# actually support the PIE stuff.
PIE_LDFLAGS=
PIE_CFLAGS=
@@ -59550,7 +59541,7 @@
;;
esac
-@@ -52162,53 +18284,53 @@
+@@ -52156,53 +18281,53 @@
LDFLAGS="$LDFLAGS -L./bin"
fi
@@ -59623,7 +59614,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -52224,7 +18346,7 @@
+@@ -52218,7 +18343,7 @@
fi
@@ -59632,7 +59623,7 @@
$as_echo "$ac_cv_shlib_works" >&6; }
if test $ac_cv_shlib_works = no; then
BLDSHARED=false
-@@ -52240,9 +18362,9 @@
+@@ -52234,9 +18359,9 @@
SHLIBEXT="shared_libraries_disabled"
fi
@@ -59644,7 +59635,7 @@
$as_echo "$PICFLAG" >&6; }
-@@ -52284,165 +18406,39 @@
+@@ -52278,165 +18403,39 @@
################
@@ -59822,7 +59813,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52452,102 +18448,9 @@
+@@ -52446,102 +18445,9 @@
fi
else
@@ -59927,7 +59918,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -52562,17 +18465,13 @@
+@@ -52556,17 +18462,13 @@
# Check if the compiler supports the LL prefix on long long integers.
# AIX needs this.
@@ -59948,7 +59939,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -52583,190 +18482,97 @@
+@@ -52577,190 +18479,97 @@
return 0;
}
_ACEOF
@@ -60167,7 +60158,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52776,67 +18582,34 @@
+@@ -52770,67 +18579,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
@@ -60245,7 +60236,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52846,67 +18619,34 @@
+@@ -52840,67 +18616,34 @@
#include <sys/stat.h>
main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60323,7 +60314,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52914,69 +18654,36 @@
+@@ -52908,69 +18651,36 @@
#endif
#include <stdio.h>
#include <sys/stat.h>
@@ -60405,7 +60396,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -52986,67 +18693,34 @@
+@@ -52980,67 +18690,34 @@
#include <sys/stat.h>
main() { exit((sizeof(dev_t) == 8) ? 0 : 1); }
_ACEOF
@@ -60483,7 +60474,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53056,64 +18730,31 @@
+@@ -53050,64 +18727,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
@@ -60557,7 +60548,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53129,55 +18770,28 @@
+@@ -53123,55 +18767,28 @@
return 0;
}
_ACEOF
@@ -60620,7 +60611,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53193,58 +18807,31 @@
+@@ -53187,58 +18804,31 @@
return 0;
}
_ACEOF
@@ -60687,7 +60678,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53253,67 +18840,34 @@
+@@ -53247,67 +18837,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = major(dev); return 0; }
_ACEOF
@@ -60765,7 +60756,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53322,67 +18876,34 @@
+@@ -53316,67 +18873,34 @@
#include <sys/types.h>
main() { dev_t dev; int i = minor(dev); return 0; }
_ACEOF
@@ -60843,7 +60834,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -53391,129 +18912,63 @@
+@@ -53385,129 +18909,63 @@
#include <sys/types.h>
main() { dev_t dev = makedev(1,2); return 0; }
_ACEOF
@@ -60992,7 +60983,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -53526,55 +18981,28 @@
+@@ -53520,55 +18978,28 @@
return 0;
}
_ACEOF
@@ -61055,7 +61046,7 @@
/* end confdefs.h. */
#include <stdio.h>
int
-@@ -53585,55 +19013,28 @@
+@@ -53579,55 +19010,28 @@
return 0;
}
_ACEOF
@@ -61118,7 +61109,7 @@
/* end confdefs.h. */
#include <sys/time.h>
-@@ -53646,46 +19047,19 @@
+@@ -53640,46 +19044,19 @@
return 0;
}
_ACEOF
@@ -61171,7 +61162,7 @@
fi
-@@ -53697,120 +19071,24 @@
+@@ -53691,120 +19068,24 @@
# which rely on signals.
@@ -61300,7 +61291,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53834,58 +19112,27 @@
+@@ -53828,58 +19109,27 @@
return 0;
}
_ACEOF
@@ -61367,7 +61358,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53909,58 +19156,27 @@
+@@ -53903,58 +19153,27 @@
return 0;
}
_ACEOF
@@ -61434,7 +61425,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -53984,49 +19200,22 @@
+@@ -53978,49 +19197,22 @@
return 0;
}
_ACEOF
@@ -61490,7 +61481,7 @@
-@@ -54044,18 +19233,14 @@
+@@ -54038,18 +19230,14 @@
;;
*)
# clock_gettime was not found, try adding librt
@@ -61512,7 +61503,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -54073,60 +19258,29 @@
+@@ -54067,60 +19255,29 @@
return 0;
}
_ACEOF
@@ -61582,7 +61573,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54150,58 +19304,27 @@
+@@ -54144,58 +19301,27 @@
return 0;
}
_ACEOF
@@ -61649,7 +61640,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54225,58 +19348,27 @@
+@@ -54219,58 +19345,27 @@
return 0;
}
_ACEOF
@@ -61716,7 +61707,7 @@
/* end confdefs.h. */
#if TIME_WITH_SYS_TIME
-@@ -54300,49 +19392,22 @@
+@@ -54294,49 +19389,22 @@
return 0;
}
_ACEOF
@@ -61772,7 +61763,7 @@
-@@ -54367,20 +19432,16 @@
+@@ -54361,20 +19429,16 @@
fi
@@ -61797,7 +61788,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <dirent.h>
-@@ -54388,64 +19449,31 @@
+@@ -54382,64 +19446,31 @@
if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
di->d_name[0] == 0) exit(0); exit(1);}
_ACEOF
@@ -61871,7 +61862,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utime.h>
-@@ -54457,41 +19485,18 @@
+@@ -54451,41 +19482,18 @@
return 0;
}
_ACEOF
@@ -61917,7 +61908,7 @@
fi
-@@ -54499,104 +19504,12 @@
+@@ -54493,104 +19501,12 @@
# Check utmp details, but only if our OS offers utmp.h
if test x"$ac_cv_header_utmp_h" = x"yes"; then
@@ -62027,7 +62018,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -54605,17 +19518,13 @@
+@@ -54599,17 +19515,13 @@
done
@@ -62048,7 +62039,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54627,55 +19536,28 @@
+@@ -54621,55 +19533,28 @@
return 0;
}
_ACEOF
@@ -62111,7 +62102,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54687,55 +19569,28 @@
+@@ -54681,55 +19566,28 @@
return 0;
}
_ACEOF
@@ -62174,7 +62165,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54747,55 +19602,28 @@
+@@ -54741,55 +19599,28 @@
return 0;
}
_ACEOF
@@ -62237,7 +62228,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54807,55 +19635,28 @@
+@@ -54801,55 +19632,28 @@
return 0;
}
_ACEOF
@@ -62300,7 +62291,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54863,59 +19664,32 @@
+@@ -54857,59 +19661,32 @@
main ()
{
struct utmp ut; time_t t; ut.ut_time = t;
@@ -62371,7 +62362,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54927,55 +19701,28 @@
+@@ -54921,55 +19698,28 @@
return 0;
}
_ACEOF
@@ -62434,7 +62425,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -54987,55 +19734,28 @@
+@@ -54981,55 +19731,28 @@
return 0;
}
_ACEOF
@@ -62497,7 +62488,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55047,55 +19767,28 @@
+@@ -55041,55 +19764,28 @@
return 0;
}
_ACEOF
@@ -62560,7 +62551,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55107,55 +19800,28 @@
+@@ -55101,55 +19797,28 @@
return 0;
}
_ACEOF
@@ -62623,7 +62614,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55167,55 +19833,28 @@
+@@ -55161,55 +19830,28 @@
return 0;
}
_ACEOF
@@ -62686,7 +62677,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55227,56 +19866,29 @@
+@@ -55221,56 +19863,29 @@
return 0;
}
_ACEOF
@@ -62750,7 +62741,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmp.h>
-@@ -55288,56 +19900,29 @@
+@@ -55282,56 +19897,29 @@
return 0;
}
_ACEOF
@@ -62814,7 +62805,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <utmpx.h>
-@@ -55349,41 +19934,18 @@
+@@ -55343,41 +19931,18 @@
return 0;
}
_ACEOF
@@ -62860,7 +62851,7 @@
fi
-@@ -55394,12 +19956,10 @@
+@@ -55388,12 +19953,10 @@
ICONV_LOOK_DIRS="/usr /usr/local /sw /opt"
# Check whether --with-libiconv was given.
@@ -62875,7 +62866,7 @@
else
if test "$withval" != "yes" ; then
ICONV_PATH_SPEC=yes
-@@ -55445,7 +20005,7 @@
+@@ -55439,7 +20002,7 @@
export LDFLAGS LIBS CPPFLAGS
# Try to find iconv(3)
@@ -62884,7 +62875,7 @@
$as_echo_n "checking for iconv in $i/$l... " >&6; }
jm_cv_func_iconv="no"
jm_cv_lib_iconv=""
-@@ -55453,11 +20013,7 @@
+@@ -55447,11 +20010,7 @@
jm_save_LIBS="$LIBS"
if test "$jm_cv_func_iconv" != yes; then
@@ -62897,7 +62888,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55471,48 +20027,17 @@
+@@ -55465,48 +20024,17 @@
return 0;
}
_ACEOF
@@ -62950,7 +62941,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55526,49 +20051,18 @@
+@@ -55520,49 +20048,18 @@
return 0;
}
_ACEOF
@@ -63004,7 +62995,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -55582,53 +20076,22 @@
+@@ -55576,53 +20073,22 @@
return 0;
}
_ACEOF
@@ -63062,7 +63053,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -55642,50 +20105,19 @@
+@@ -55636,50 +20102,19 @@
return 0;
}
_ACEOF
@@ -63117,7 +63108,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <biconv.h>
-@@ -55699,42 +20131,15 @@
+@@ -55693,42 +20128,15 @@
return 0;
}
_ACEOF
@@ -63163,7 +63154,7 @@
LIBS="$jm_save_LIBS"
fi
-@@ -55745,36 +20150,30 @@
+@@ -55739,36 +20147,30 @@
if test "$jm_cv_func_iconv" = yes; then
if test "$jm_cv_giconv" = yes; then
@@ -63207,7 +63198,7 @@
$as_echo "no" >&6; }
fi
-@@ -55812,16 +20211,12 @@
+@@ -55806,16 +20208,12 @@
# check for default dos charset name
for j in CP850 IBM850 ; do
@@ -63227,7 +63218,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55834,43 +20229,16 @@
+@@ -55828,43 +20226,16 @@
}
_ACEOF
@@ -63276,7 +63267,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_dos_charset="$ICONV_CHARSET"
-@@ -55882,16 +20250,12 @@
+@@ -55876,16 +20247,12 @@
# check for default display charset name
for j in ASCII 646 ; do
@@ -63296,7 +63287,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55904,43 +20268,16 @@
+@@ -55898,43 +20265,16 @@
}
_ACEOF
@@ -63345,7 +63336,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_display_charset="$ICONV_CHARSET"
-@@ -55952,16 +20289,12 @@
+@@ -55946,16 +20286,12 @@
# check for default unix charset name
for j in UTF-8 UTF8 ; do
@@ -63365,7 +63356,7 @@
/* end confdefs.h. */
#include <$jm_cv_include>
-@@ -55974,43 +20307,16 @@
+@@ -55968,43 +20304,16 @@
}
_ACEOF
@@ -63414,7 +63405,7 @@
$as_echo "$ICONV_CHARSET" >&6; }
default_unix_charset="$ICONV_CHARSET"
-@@ -56049,9 +20355,9 @@
+@@ -56043,9 +20352,9 @@
default_display_charset="ASCII"
default_unix_charset="UTF-8"
samba_cv_HAVE_NATIVE_ICONV=yes
@@ -63426,7 +63417,7 @@
$as_echo "$as_me: WARNING: $default_dos_charset, $default_display_charset and $default_unix_charset to UCS-16LE" >&2;}
fi
-@@ -56075,9 +20381,7 @@
+@@ -56069,9 +20378,7 @@
default_unix_charset="\"$default_unix_charset\""
@@ -63437,7 +63428,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -56111,7 +20415,7 @@
+@@ -56105,7 +20412,7 @@
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
@@ -63446,7 +63437,7 @@
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 +20437,16 @@
+@@ -56127,20 +20434,16 @@
fi
@@ -63471,7 +63462,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56160,67 +20460,34 @@
+@@ -56154,67 +20457,34 @@
}
_ACEOF
@@ -63549,7 +63540,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -56234,204 +20501,36 @@
+@@ -56228,204 +20498,36 @@
}
_ACEOF
@@ -63767,7 +63758,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -56440,119 +20539,25 @@
+@@ -56434,119 +20536,25 @@
done
@@ -63894,7 +63885,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -56563,54 +20568,29 @@
+@@ -56557,54 +20565,29 @@
return 0;
}
_ACEOF
@@ -63955,7 +63946,7 @@
fi
-@@ -56619,157 +20599,18 @@
+@@ -56613,157 +20596,18 @@
# http://oss.sgi.com/projects/fam/
# http://savannah.nongnu.org/projects/fam/
# Check whether --enable-fam was given.
@@ -64119,7 +64110,7 @@
_ACEOF
samba_cv_HAVE_FAM_H=yes
else
-@@ -56781,18 +20622,14 @@
+@@ -56775,18 +20619,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.
@@ -64141,7 +64132,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56809,44 +20646,19 @@
+@@ -56803,44 +20643,19 @@
;
return 0;
}
@@ -64193,7 +64184,7 @@
samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam"
else
samba_cv_HAVE_LIBFAM=no
-@@ -56857,23 +20669,17 @@
+@@ -56851,23 +20666,17 @@
samba_fam_xtra=-lC
@@ -64220,7 +64211,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -56891,72 +20697,41 @@
+@@ -56885,72 +20694,41 @@
return 0;
}
_ACEOF
@@ -64301,7 +64292,7 @@
/* end confdefs.h. */
#include <fam.h>
int
-@@ -56967,43 +20742,16 @@
+@@ -56961,43 +20739,16 @@
return 0;
}
_ACEOF
@@ -64348,7 +64339,7 @@
fi
fi
-@@ -57016,18 +20764,14 @@
+@@ -57010,18 +20761,14 @@
samba_dmapi_libs=""
if test x"$samba_dmapi_libs" = x"" ; then
@@ -64370,7 +64361,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57045,61 +20789,32 @@
+@@ -57039,61 +20786,32 @@
return 0;
}
_ACEOF
@@ -64441,7 +64432,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57117,61 +20832,32 @@
+@@ -57111,61 +20829,32 @@
return 0;
}
_ACEOF
@@ -64512,7 +64503,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57189,61 +20875,32 @@
+@@ -57183,61 +20872,32 @@
return 0;
}
_ACEOF
@@ -64583,7 +64574,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -57261,43 +20918,18 @@
+@@ -57255,43 +20915,18 @@
return 0;
}
_ACEOF
@@ -64633,7 +64624,7 @@
samba_dmapi_libs="-ldmapi"
fi
-@@ -57306,153 +20938,12 @@
+@@ -57300,153 +20935,12 @@
# Only bother to test ehaders if we have a candidate DMAPI library
if test x"$samba_dmapi_libs" != x"" ; then
@@ -64793,7 +64784,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -57466,11 +20957,7 @@
+@@ -57460,11 +20954,7 @@
if test x"$samba_dmapi_libs" != x"" ; then
samba_dmapi_save_LIBS="$LIBS"
LIBS="$LIBS $samba_dmapi_libs"
@@ -64806,7 +64797,7 @@
/* end confdefs.h. */
#include <time.h> /* needed by Tru64 */
-@@ -57505,50 +20992,25 @@
+@@ -57499,50 +20989,25 @@
return 0;
}
_ACEOF
@@ -64861,7 +64852,7 @@
$as_echo "$as_me: DMAPI support not present" >&6;}
# DMAPI detection failure actions end
-@@ -57556,11 +21018,9 @@
+@@ -57550,11 +21015,9 @@
# DMAPI detection success actions start
@@ -64875,7 +64866,7 @@
$as_echo "$as_me: Found DMAPI support in $samba_dmapi_libs" >&6;}
# DMAPI detection success actions end
-@@ -57574,20 +21034,16 @@
+@@ -57568,20 +21031,16 @@
default_shared_modules="$default_shared_modules vfs_tsmsm"
fi
@@ -64900,7 +64891,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -57603,65 +21059,32 @@
+@@ -57597,65 +21056,32 @@
}
_ACEOF
@@ -64975,7 +64966,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <fcntl.h>
-@@ -57673,185 +21096,29 @@
+@@ -57667,185 +21093,29 @@
return 0;
}
_ACEOF
@@ -65168,7 +65159,7 @@
fi
-@@ -57861,110 +21128,18 @@
+@@ -57855,110 +21125,18 @@
ac_save_LIBS=$LIBS
@@ -65285,7 +65276,7 @@
-@@ -57981,18 +21156,14 @@
+@@ -57975,18 +21153,14 @@
;;
*)
# cap_get_proc was not found, try adding libcap
@@ -65307,7 +65298,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -58010,50 +21181,23 @@
+@@ -58004,50 +21178,23 @@
return 0;
}
_ACEOF
@@ -65365,7 +65356,7 @@
-@@ -58075,20 +21219,16 @@
+@@ -58069,20 +21216,16 @@
@@ -65390,7 +65381,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -58104,52 +21244,23 @@
+@@ -58098,52 +21241,23 @@
exit(0);
}
_ACEOF
@@ -65449,7 +65440,7 @@
else
LIBS=$ac_save_LIBS
-@@ -58162,17 +21273,13 @@
+@@ -58156,17 +21270,13 @@
# This is *really* broken but some systems (DEC OSF1) do this.... JRA.
#
@@ -65470,7 +65461,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58186,55 +21293,28 @@
+@@ -58180,55 +21290,28 @@
return 0;
}
_ACEOF
@@ -65533,7 +65524,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58248,55 +21328,28 @@
+@@ -58242,55 +21325,28 @@
return 0;
}
_ACEOF
@@ -65596,7 +65587,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58310,55 +21363,28 @@
+@@ -58304,55 +21360,28 @@
return 0;
}
_ACEOF
@@ -65659,7 +65650,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#if defined(HAVE_RPC_RPC_H)
-@@ -58372,56 +21398,29 @@
+@@ -58366,56 +21395,29 @@
return 0;
}
_ACEOF
@@ -65723,7 +65714,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_SECURITY_H
-@@ -58439,238 +21438,112 @@
+@@ -58433,238 +21435,112 @@
return 0;
}
_ACEOF
@@ -65998,7 +65989,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58681,63 +21554,32 @@
+@@ -58675,63 +21551,32 @@
return 0;
}
_ACEOF
@@ -66072,7 +66063,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58748,63 +21590,32 @@
+@@ -58742,63 +21587,32 @@
return 0;
}
_ACEOF
@@ -66145,7 +66136,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58815,63 +21626,32 @@
+@@ -58809,63 +21623,32 @@
return 0;
}
_ACEOF
@@ -66218,7 +66209,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -58882,147 +21662,30 @@
+@@ -58876,147 +21659,30 @@
return 0;
}
_ACEOF
@@ -66376,7 +66367,7 @@
_ACEOF
fi
-@@ -59034,20 +21697,16 @@
+@@ -59028,20 +21694,16 @@
seteuid=no;
if test $seteuid = no; then
@@ -66401,7 +66392,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59055,50 +21714,21 @@
+@@ -59049,50 +21711,21 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66458,7 +66449,7 @@
fi
fi
-@@ -59106,20 +21736,16 @@
+@@ -59100,20 +21733,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
@@ -66483,7 +66474,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59127,69 +21753,36 @@
+@@ -59121,69 +21750,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66563,7 +66554,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59197,69 +21790,36 @@
+@@ -59191,69 +21787,36 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66643,7 +66634,7 @@
/* end confdefs.h. */
#define AUTOCONF_TEST 1
-@@ -59267,64 +21827,31 @@
+@@ -59261,64 +21824,31 @@
#include "confdefs.h"
#include "${srcdir-.}/lib/util_sec.c"
_ACEOF
@@ -66717,7 +66708,7 @@
/* end confdefs.h. */
#include <sys/syscall.h>
-@@ -59338,195 +21865,98 @@
+@@ -59332,195 +21862,98 @@
return 0;
}
_ACEOF
@@ -66943,7 +66934,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -59550,66 +21980,33 @@
+@@ -59544,66 +21977,33 @@
#endif
}
_ACEOF
@@ -67019,7 +67010,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59622,55 +22019,28 @@
+@@ -59616,55 +22016,28 @@
return 0;
}
_ACEOF
@@ -67082,7 +67073,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59683,55 +22053,28 @@
+@@ -59677,55 +22050,28 @@
return 0;
}
_ACEOF
@@ -67145,7 +67136,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/stat.h>
-@@ -59744,57 +22087,30 @@
+@@ -59738,57 +22084,30 @@
return 0;
}
_ACEOF
@@ -67210,7 +67201,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -59810,58 +22126,31 @@
+@@ -59804,58 +22123,31 @@
return 0;
}
_ACEOF
@@ -67277,7 +67268,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -59880,74 +22169,45 @@
+@@ -59874,74 +22166,45 @@
}
_ACEOF
@@ -67363,7 +67354,7 @@
$as_echo "no" >&6; }
fi
-@@ -59956,24 +22216,24 @@
+@@ -59950,24 +22213,24 @@
####################################################
# check for Linux-specific AFS fake-kaserver support
samba_cv_WITH_FAKE_KASERVER=no
@@ -67393,7 +67384,7 @@
$as_echo "no" >&6; }
fi
-@@ -59985,18 +22245,14 @@
+@@ -59979,18 +22242,14 @@
test x"$samba_cv_WITH_FAKE_KASERVER" != x"no"; then
# see if this box has the OpenSSL DES libraries
@@ -67415,7 +67406,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60014,208 +22270,43 @@
+@@ -60008,208 +22267,43 @@
return 0;
}
_ACEOF
@@ -67640,7 +67631,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -60227,12 +22318,10 @@
+@@ -60221,12 +22315,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
@@ -67655,7 +67646,7 @@
fi
else
have_afs_headers=yes
-@@ -60242,9 +22331,7 @@
+@@ -60236,9 +22328,7 @@
FAKE_KASERVER_OBJ=""
if test x"$samba_cv_WITH_FAKE_KASERVER" != x"no" && test x"$have_afs_headers" = x"yes"; then
@@ -67666,7 +67657,7 @@
FAKE_KASERVER_OBJ="utils/net_afs.o"
fi
-@@ -60253,24 +22340,24 @@
+@@ -60247,24 +22337,24 @@
#################################################
# check whether to compile AFS/NT ACL mapping module
samba_cv_WITH_VFS_AFSACL=no
@@ -67696,7 +67687,7 @@
$as_echo "no" >&6; }
fi
-@@ -60280,220 +22367,78 @@
+@@ -60274,220 +22364,78 @@
default_shared_modules="$default_shared_modules vfs_afsacl"
fi
@@ -67980,7 +67971,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -60505,11 +22450,9 @@
+@@ -60499,11 +22447,9 @@
if test x"$ac_cv_header_ldap_h" != x"yes"; then
if test x"$with_ldap_support" = x"yes"; then
@@ -67994,7 +67985,7 @@
$as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
fi
-@@ -60521,117 +22464,24 @@
+@@ -60515,117 +22461,24 @@
# unsigned int in include/includes.h
case $host_os in
*hpux*)
@@ -68119,7 +68110,7 @@
$as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
fi
with_ldap_support=no
-@@ -60648,23 +22498,17 @@
+@@ -60642,23 +22495,17 @@
# this test must be before the libldap test
@@ -68146,7 +68137,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -60682,54 +22526,28 @@
+@@ -60676,54 +22523,28 @@
return 0;
}
_ACEOF
@@ -68208,7 +68199,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLBER 1
_ACEOF
-@@ -60745,25 +22563,19 @@
+@@ -60739,25 +22560,19 @@
fi
@@ -68237,7 +68228,7 @@
/* 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 +22616,31 @@
+@@ -60798,61 +22613,31 @@
return 0;
}
_ACEOF
@@ -68308,7 +68299,7 @@
/* end confdefs.h. */
#include <ldap.h>
int
-@@ -60869,59 +22651,32 @@
+@@ -60863,59 +22648,32 @@
return 0;
}
_ACEOF
@@ -68375,7 +68366,7 @@
/* end confdefs.h. */
#include <lber.h>
int
-@@ -60932,42 +22687,19 @@
+@@ -60926,42 +22684,19 @@
return 0;
}
_ACEOF
@@ -68422,7 +68413,7 @@
fi
-@@ -60975,23 +22707,17 @@
+@@ -60969,23 +22704,17 @@
# now see if we can find the ldap libs in standard paths
@@ -68449,7 +68440,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -61009,54 +22735,28 @@
+@@ -61003,54 +22732,28 @@
return 0;
}
_ACEOF
@@ -68511,7 +68502,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBLDAP 1
_ACEOF
-@@ -61072,25 +22772,19 @@
+@@ -61066,25 +22769,19 @@
fi
@@ -68540,7 +68531,7 @@
/* 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 +22825,32 @@
+@@ -61125,62 +22822,32 @@
return 0;
}
_ACEOF
@@ -68612,7 +68603,7 @@
/* end confdefs.h. */
#include <lber.h>
-@@ -61199,37 +22863,16 @@
+@@ -61193,37 +22860,16 @@
return 0;
}
_ACEOF
@@ -68653,7 +68644,7 @@
$as_echo "$smb_ldap_cv_ldap_set_rebind_proc" >&6; }
-@@ -61240,19 +22883,14 @@
+@@ -61234,19 +22880,14 @@
@@ -68676,7 +68667,7 @@
/* 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 +22931,27 @@
+@@ -61287,55 +22928,27 @@
return 0;
}
_ACEOF
@@ -68739,7 +68730,7 @@
CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-@@ -61349,17 +22959,15 @@
+@@ -61343,17 +22956,15 @@
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
with_ldap_support=yes
@@ -68761,7 +68752,7 @@
$as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
fi
-@@ -61374,12 +22982,12 @@
+@@ -61368,12 +22979,12 @@
# active directory support
with_ads_support=auto
@@ -68776,7 +68767,7 @@
withval=$with_ads; case "$withval" in
yes|no)
with_ads_support="$withval"
-@@ -61388,7 +22996,7 @@
+@@ -61382,7 +22993,7 @@
fi
@@ -68785,7 +68776,7 @@
$as_echo "$with_ads_support" >&6; }
FOUND_KRB5=no
-@@ -61397,11 +23005,9 @@
+@@ -61391,11 +23002,9 @@
if test x"$with_ldap_support" != x"yes"; then
if test x"$with_ads_support" = x"yes"; then
@@ -68799,7 +68790,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
with_ads_support=no
fi
-@@ -61416,19 +23022,14 @@
+@@ -61410,19 +23019,14 @@
*hpux*)
@@ -68822,7 +68813,7 @@
/* 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 +23070,29 @@
+@@ -61463,57 +23067,29 @@
return 0;
}
_ACEOF
@@ -68888,7 +68879,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
with_ads_support=no
fi
-@@ -61528,19 +23101,14 @@
+@@ -61522,19 +23098,14 @@
*)
@@ -68911,7 +68902,7 @@
/* 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 +23149,29 @@
+@@ -61575,57 +23146,29 @@
return 0;
}
_ACEOF
@@ -68977,7 +68968,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
with_ads_support=no
fi
-@@ -61642,19 +23182,14 @@
+@@ -61636,19 +23179,14 @@
@@ -69000,7 +68991,7 @@
/* 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 +23230,29 @@
+@@ -61689,57 +23227,29 @@
return 0;
}
_ACEOF
@@ -69066,7 +69057,7 @@
$as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
with_ads_support=no
fi
-@@ -61761,23 +23268,23 @@
+@@ -61755,23 +23265,23 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# check for location of Kerberos 5 install
@@ -69095,7 +69086,7 @@
$as_echo "$withval" >&6; }
KRB5_CFLAGS="-I$withval/include"
KRB5_CPPFLAGS="-I$withval/include"
-@@ -61789,7 +23296,7 @@
+@@ -61783,7 +23293,7 @@
;;
esac
else
@@ -69104,7 +69095,7 @@
$as_echo "no krb5-path given" >&6; }
fi
-@@ -61800,9 +23307,9 @@
+@@ -61794,9 +23304,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
@@ -69116,7 +69107,7 @@
$as_echo_n "(cached) " >&6
else
case $KRB5CONFIG in
-@@ -61815,14 +23322,14 @@
+@@ -61809,14 +23319,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -69134,7 +69125,7 @@
IFS=$as_save_IFS
;;
-@@ -61830,15 +23337,15 @@
+@@ -61824,15 +23334,15 @@
fi
KRB5CONFIG=$ac_cv_path_KRB5CONFIG
if test -n "$KRB5CONFIG"; then
@@ -69153,7 +69144,7 @@
$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 +23359,17 @@
+@@ -61846,17 +23356,17 @@
CFLAGS=$ac_save_CFLAGS;export CFLAGS
LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS
FOUND_KRB5=yes
@@ -69174,7 +69165,7 @@
$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 +23377,17 @@
+@@ -61864,17 +23374,17 @@
KRB5_CPPFLAGS="-I/usr/include/heimdal"
KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
FOUND_KRB5=yes
@@ -69195,7 +69186,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61888,17 +23395,17 @@
+@@ -61882,17 +23392,17 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the RedHat location for kerberos
@@ -69216,7 +69207,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -61906,16 +23413,16 @@
+@@ -61900,16 +23410,16 @@
if test x$FOUND_KRB5 = x"no"; then
#################################################
# see if this box has the OpenBSD location for heimdal krb5
@@ -69236,7 +69227,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -62002,151 +23509,12 @@
+@@ -61996,151 +23506,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
@@ -69393,7 +69384,7 @@
_ACEOF
fi
-@@ -62160,11 +23528,9 @@
+@@ -62154,11 +23525,9 @@
# i.e with_ads_support = auto, otherwise die with an error.
if test x"$with_ads_support" = x"yes"; then
@@ -69407,7 +69398,7 @@
$as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
fi
-@@ -62176,65 +23542,16 @@
+@@ -62170,65 +23539,16 @@
CPPFLAGS=$ac_save_CPPFLAGS
LDFLAGS=$ac_save_LDFLAGS
fi
@@ -69479,7 +69470,7 @@
_ACEOF
fi
-@@ -62249,17 +23566,13 @@
+@@ -62243,17 +23563,13 @@
# check for new heimdal KRB5_DEPRECATED handling
@@ -69500,7 +69491,7 @@
/* end confdefs.h. */
#define KRB5_DEPRECATED 1
#include <krb5.h>
-@@ -62271,42 +23584,19 @@
+@@ -62265,42 +23581,19 @@
return 0;
}
_ACEOF
@@ -69547,7 +69538,7 @@
fi
fi
-@@ -62320,152 +23610,12 @@
+@@ -62314,152 +23607,12 @@
# now check for gssapi headers. This is also done here to allow for
# different kerberos include paths
@@ -69706,7 +69697,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -62479,23 +23629,17 @@
+@@ -62473,23 +23626,17 @@
# we might need the k5crypto and com_err libraries on some systems
@@ -69733,7 +69724,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62513,54 +23657,28 @@
+@@ -62507,54 +23654,28 @@
return 0;
}
_ACEOF
@@ -69795,7 +69786,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCOM_ERR 1
_ACEOF
-@@ -62577,24 +23695,17 @@
+@@ -62571,24 +23692,17 @@
fi
@@ -69823,7 +69814,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62612,54 +23723,28 @@
+@@ -62606,54 +23720,28 @@
return 0;
}
_ACEOF
@@ -69885,7 +69876,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBK5CRYPTO 1
_ACEOF
-@@ -62675,27 +23760,20 @@
+@@ -62669,27 +23757,20 @@
fi
@@ -69916,7 +69907,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62713,54 +23791,28 @@
+@@ -62707,54 +23788,28 @@
return 0;
}
_ACEOF
@@ -69978,7 +69969,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPTO 1
_ACEOF
-@@ -62777,24 +23829,17 @@
+@@ -62771,24 +23826,17 @@
fi
@@ -70006,7 +69997,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62812,54 +23857,28 @@
+@@ -62806,54 +23854,28 @@
return 0;
}
_ACEOF
@@ -70068,7 +70059,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBASN1 1
_ACEOF
-@@ -62876,24 +23895,17 @@
+@@ -62870,24 +23892,17 @@
fi
@@ -70096,7 +70087,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -62911,54 +23923,28 @@
+@@ -62905,54 +23920,28 @@
return 0;
}
_ACEOF
@@ -70158,7 +70149,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBROKEN 1
_ACEOF
-@@ -62974,27 +23960,20 @@
+@@ -62968,27 +23957,20 @@
fi
@@ -70189,7 +70180,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63012,54 +23991,28 @@
+@@ -63006,54 +23988,28 @@
return 0;
}
_ACEOF
@@ -70251,7 +70242,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI 1
_ACEOF
-@@ -63075,29 +24028,22 @@
+@@ -63069,29 +24025,22 @@
fi
@@ -70284,7 +70275,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63115,54 +24061,28 @@
+@@ -63109,54 +24058,28 @@
return 0;
}
_ACEOF
@@ -70346,7 +70337,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63179,24 +24099,17 @@
+@@ -63173,24 +24096,17 @@
fi
@@ -70374,7 +70365,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63214,54 +24127,28 @@
+@@ -63208,54 +24124,28 @@
return 0;
}
_ACEOF
@@ -70436,7 +70427,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBKRB5 1
_ACEOF
-@@ -63277,29 +24164,22 @@
+@@ -63271,29 +24161,22 @@
fi
@@ -70469,7 +70460,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -63317,54 +24197,28 @@
+@@ -63311,54 +24194,28 @@
return 0;
}
_ACEOF
@@ -70531,7 +70522,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGSSAPI_KRB5 1
_ACEOF
-@@ -63379,24 +24233,18 @@
+@@ -63373,24 +24230,18 @@
have_gssapi=yes
fi
@@ -70559,7 +70550,7 @@
/* 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 +24285,18 @@
+@@ -63431,43 +24282,18 @@
return 0;
}
_ACEOF
@@ -70609,7 +70600,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_REAL_TIME 1
_ACEOF
-@@ -63481,20 +24304,14 @@
+@@ -63475,20 +24301,14 @@
fi
@@ -70633,7 +70624,7 @@
/* 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 +24352,18 @@
+@@ -63529,43 +24349,18 @@
return 0;
}
_ACEOF
@@ -70683,7 +70674,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -63579,20 +24371,14 @@
+@@ -63573,20 +24368,14 @@
fi
@@ -70707,7 +70698,7 @@
/* 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 +24419,18 @@
+@@ -63627,43 +24416,18 @@
return 0;
}
_ACEOF
@@ -70757,7 +70748,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES 1
_ACEOF
-@@ -63677,20 +24438,14 @@
+@@ -63671,20 +24435,14 @@
fi
@@ -70781,7 +70772,7 @@
/* 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 +24486,18 @@
+@@ -63725,43 +24483,18 @@
return 0;
}
_ACEOF
@@ -70831,7 +70822,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_SET_DEFAULT_TGS_KTYPES 1
_ACEOF
-@@ -63775,20 +24505,14 @@
+@@ -63769,20 +24502,14 @@
fi
@@ -70855,7 +70846,7 @@
/* 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 +24553,18 @@
+@@ -63823,43 +24550,18 @@
return 0;
}
_ACEOF
@@ -70905,7 +70896,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL2SALT 1
_ACEOF
-@@ -63873,20 +24572,14 @@
+@@ -63867,20 +24569,14 @@
fi
@@ -70929,7 +70920,7 @@
/* 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 +24620,18 @@
+@@ -63921,43 +24617,18 @@
return 0;
}
_ACEOF
@@ -70979,7 +70970,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_USE_ENCTYPE 1
_ACEOF
-@@ -63971,20 +24639,14 @@
+@@ -63965,20 +24636,14 @@
fi
@@ -71003,7 +70994,7 @@
/* 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 +24687,18 @@
+@@ -64019,43 +24684,18 @@
return 0;
}
_ACEOF
@@ -71053,7 +71044,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY 1
_ACEOF
-@@ -64069,20 +24706,14 @@
+@@ -64063,20 +24703,14 @@
fi
@@ -71077,7 +71068,7 @@
/* 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 +24754,18 @@
+@@ -64117,43 +24751,18 @@
return 0;
}
_ACEOF
@@ -71127,7 +71118,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PW_SALT 1
_ACEOF
-@@ -64167,20 +24773,14 @@
+@@ -64161,20 +24770,14 @@
fi
@@ -71151,7 +71142,7 @@
/* 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 +24821,18 @@
+@@ -64215,43 +24818,18 @@
return 0;
}
_ACEOF
@@ -71201,7 +71192,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_STRING_TO_KEY_SALT 1
_ACEOF
-@@ -64265,20 +24840,14 @@
+@@ -64259,20 +24837,14 @@
fi
@@ -71225,7 +71216,7 @@
/* 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 +24888,18 @@
+@@ -64313,43 +24885,18 @@
return 0;
}
_ACEOF
@@ -71275,7 +71266,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETKEY 1
_ACEOF
-@@ -64363,20 +24907,14 @@
+@@ -64357,20 +24904,14 @@
fi
@@ -71299,7 +71290,7 @@
/* 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 +24955,18 @@
+@@ -64411,43 +24952,18 @@
return 0;
}
_ACEOF
@@ -71349,7 +71340,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_AUTH_CON_SETUSERUSERKEY 1
_ACEOF
-@@ -64461,20 +24974,14 @@
+@@ -64455,20 +24971,14 @@
fi
@@ -71373,7 +71364,7 @@
/* 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 +25022,18 @@
+@@ -64509,43 +25019,18 @@
return 0;
}
_ACEOF
@@ -71423,7 +71414,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_LOCATE_KDC 1
_ACEOF
-@@ -64559,20 +25041,14 @@
+@@ -64553,20 +25038,14 @@
fi
@@ -71447,7 +71438,7 @@
/* 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 +25089,18 @@
+@@ -64607,43 +25086,18 @@
return 0;
}
_ACEOF
@@ -71497,7 +71488,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_PERMITTED_ENCTYPES 1
_ACEOF
-@@ -64657,20 +25108,14 @@
+@@ -64651,20 +25105,14 @@
fi
@@ -71521,7 +71512,7 @@
/* 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 +25156,18 @@
+@@ -64705,43 +25153,18 @@
return 0;
}
_ACEOF
@@ -71571,7 +71562,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES 1
_ACEOF
-@@ -64755,20 +25175,14 @@
+@@ -64749,20 +25172,14 @@
fi
@@ -71595,7 +71586,7 @@
/* 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 +25223,18 @@
+@@ -64803,43 +25220,18 @@
return 0;
}
_ACEOF
@@ -71645,7 +71636,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_DATA_CONTENTS 1
_ACEOF
-@@ -64853,20 +25242,14 @@
+@@ -64847,20 +25239,14 @@
fi
@@ -71669,7 +71660,7 @@
/* 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 +25290,18 @@
+@@ -64901,43 +25287,18 @@
return 0;
}
_ACEOF
@@ -71719,7 +71710,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_GET_COMP_STRING 1
_ACEOF
-@@ -64951,20 +25309,14 @@
+@@ -64945,20 +25306,14 @@
fi
@@ -71743,7 +71734,7 @@
/* 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 +25357,18 @@
+@@ -64999,43 +25354,18 @@
return 0;
}
_ACEOF
@@ -71793,7 +71784,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_UNPARSED_NAME 1
_ACEOF
-@@ -65049,20 +25376,14 @@
+@@ -65043,20 +25373,14 @@
fi
@@ -71817,7 +71808,7 @@
/* 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 +25424,18 @@
+@@ -65097,43 +25421,18 @@
return 0;
}
_ACEOF
@@ -71867,7 +71858,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS 1
_ACEOF
-@@ -65147,20 +25443,14 @@
+@@ -65141,20 +25440,14 @@
fi
@@ -71891,7 +71882,7 @@
/* 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 +25491,18 @@
+@@ -65195,43 +25488,18 @@
return 0;
}
_ACEOF
@@ -71941,7 +71932,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KT_FREE_ENTRY 1
_ACEOF
-@@ -65245,20 +25510,14 @@
+@@ -65239,20 +25507,14 @@
fi
@@ -71965,7 +71956,7 @@
/* 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 +25558,18 @@
+@@ -65293,43 +25555,18 @@
return 0;
}
_ACEOF
@@ -72015,7 +72006,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_INIT 1
_ACEOF
-@@ -65343,20 +25577,14 @@
+@@ -65337,20 +25574,14 @@
fi
@@ -72039,7 +72030,7 @@
/* 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 +25625,18 @@
+@@ -65391,43 +25622,18 @@
return 0;
}
_ACEOF
@@ -72089,7 +72080,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_KRBHST_GET_ADDRINFO 1
_ACEOF
-@@ -65441,20 +25644,14 @@
+@@ -65435,20 +25641,14 @@
fi
@@ -72113,7 +72104,7 @@
/* 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 +25683,27 @@
+@@ -65480,52 +25680,27 @@
#if defined __stub_krb5_c_enctype_compare || defined __stub___krb5_c_enctype_compare
choke me
#endif
@@ -72181,7 +72172,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_ENCTYPE_COMPARE 1
_ACEOF
-@@ -65539,20 +25711,14 @@
+@@ -65533,20 +25708,14 @@
fi
@@ -72205,7 +72196,7 @@
/* 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 +25759,18 @@
+@@ -65587,43 +25756,18 @@
return 0;
}
_ACEOF
@@ -72255,7 +72246,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPES_COMPATIBLE_KEYS 1
_ACEOF
-@@ -65637,20 +25778,14 @@
+@@ -65631,20 +25775,14 @@
fi
@@ -72279,7 +72270,7 @@
/* 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 +25826,18 @@
+@@ -65685,43 +25823,18 @@
return 0;
}
_ACEOF
@@ -72329,7 +72320,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_INIT 1
_ACEOF
-@@ -65735,20 +25845,14 @@
+@@ -65729,20 +25842,14 @@
fi
@@ -72353,7 +72344,7 @@
/* 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 +25893,18 @@
+@@ -65783,43 +25890,18 @@
return 0;
}
_ACEOF
@@ -72403,7 +72394,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_CRYPTO_DESTROY 1
_ACEOF
-@@ -65833,20 +25912,14 @@
+@@ -65827,20 +25909,14 @@
fi
@@ -72427,7 +72418,7 @@
/* 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 +25960,18 @@
+@@ -65881,43 +25957,18 @@
return 0;
}
_ACEOF
@@ -72477,7 +72468,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_DECODE_AP_REQ 1
_ACEOF
-@@ -65931,20 +25979,14 @@
+@@ -65925,20 +25976,14 @@
fi
@@ -72501,7 +72492,7 @@
/* 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 +26027,18 @@
+@@ -65979,43 +26024,18 @@
return 0;
}
_ACEOF
@@ -72551,7 +72542,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_FREE_AP_REQ 1
_ACEOF
-@@ -66029,20 +26046,14 @@
+@@ -66023,20 +26043,14 @@
fi
@@ -72575,7 +72566,7 @@
/* 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 +26094,18 @@
+@@ -66077,43 +26091,18 @@
return 0;
}
_ACEOF
@@ -72625,7 +72616,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66127,20 +26113,14 @@
+@@ -66121,20 +26110,14 @@
fi
@@ -72649,7 +72640,7 @@
/* 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 +26161,18 @@
+@@ -66175,43 +26158,18 @@
return 0;
}
_ACEOF
@@ -72699,7 +72690,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_C_VERIFY_CHECKSUM 1
_ACEOF
-@@ -66225,20 +26180,14 @@
+@@ -66219,20 +26177,14 @@
fi
@@ -72723,7 +72714,7 @@
/* 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 +26228,18 @@
+@@ -66273,43 +26225,18 @@
return 0;
}
_ACEOF
@@ -72773,7 +72764,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM 1
_ACEOF
-@@ -66323,20 +26247,14 @@
+@@ -66317,20 +26244,14 @@
fi
@@ -72797,7 +72788,7 @@
/* 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 +26295,18 @@
+@@ -66371,43 +26292,18 @@
return 0;
}
_ACEOF
@@ -72847,7 +72838,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PARSE_NAME_NOREALM 1
_ACEOF
-@@ -66421,20 +26314,14 @@
+@@ -66415,20 +26311,14 @@
fi
@@ -72871,7 +72862,7 @@
/* 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 +26362,18 @@
+@@ -66469,43 +26359,18 @@
return 0;
}
_ACEOF
@@ -72921,7 +72912,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_PRINC_SIZE 1
_ACEOF
-@@ -66519,20 +26381,14 @@
+@@ -66513,20 +26378,14 @@
fi
@@ -72945,7 +72936,7 @@
/* 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 +26429,18 @@
+@@ -66567,43 +26426,18 @@
return 0;
}
_ACEOF
@@ -72995,7 +72986,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_SET_PAC_REQUEST 1
_ACEOF
-@@ -66617,20 +26448,14 @@
+@@ -66611,20 +26445,14 @@
fi
@@ -73019,7 +73010,7 @@
/* 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 +26496,18 @@
+@@ -66665,43 +26493,18 @@
return 0;
}
_ACEOF
@@ -73069,7 +73060,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_RENEWED_CREDS 1
_ACEOF
-@@ -66715,20 +26515,14 @@
+@@ -66709,20 +26512,14 @@
fi
@@ -73093,7 +73084,7 @@
/* 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 +26563,18 @@
+@@ -66763,43 +26560,18 @@
return 0;
}
_ACEOF
@@ -73143,7 +73134,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_KDC_CRED 1
_ACEOF
-@@ -66813,20 +26582,14 @@
+@@ -66807,20 +26579,14 @@
fi
@@ -73167,7 +73158,7 @@
/* 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 +26630,18 @@
+@@ -66861,43 +26627,18 @@
return 0;
}
_ACEOF
@@ -73217,7 +73208,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FREE_ERROR_CONTENTS 1
_ACEOF
-@@ -66911,20 +26649,14 @@
+@@ -66905,20 +26646,14 @@
fi
@@ -73241,7 +73232,7 @@
/* 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 +26697,18 @@
+@@ -66959,43 +26694,18 @@
return 0;
}
_ACEOF
@@ -73291,7 +73282,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_INITIALIZE_KRB5_ERROR_TABLE 1
_ACEOF
-@@ -67009,20 +26716,14 @@
+@@ -67003,20 +26713,14 @@
fi
@@ -73315,7 +73306,7 @@
/* 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 +26764,18 @@
+@@ -67057,43 +26761,18 @@
return 0;
}
_ACEOF
@@ -73365,7 +73356,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC 1
_ACEOF
-@@ -67107,20 +26783,14 @@
+@@ -67101,20 +26780,14 @@
fi
@@ -73389,7 +73380,7 @@
/* 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 +26831,18 @@
+@@ -67155,43 +26828,18 @@
return 0;
}
_ACEOF
@@ -73439,7 +73430,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_FREE 1
_ACEOF
-@@ -67205,20 +26850,14 @@
+@@ -67199,20 +26847,14 @@
fi
@@ -73463,7 +73454,7 @@
/* 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 +26898,18 @@
+@@ -67253,43 +26895,18 @@
return 0;
}
_ACEOF
@@ -73513,7 +73504,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_GET_INIT_CREDS_OPT_GET_ERROR 1
_ACEOF
-@@ -67303,20 +26917,14 @@
+@@ -67297,20 +26914,14 @@
fi
@@ -73537,7 +73528,7 @@
/* 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 +26965,18 @@
+@@ -67351,43 +26962,18 @@
return 0;
}
_ACEOF
@@ -73587,7 +73578,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_ENCTYPE_TO_STRING 1
_ACEOF
-@@ -67401,20 +26984,14 @@
+@@ -67395,20 +26981,14 @@
fi
@@ -73611,7 +73602,7 @@
/* 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 +27032,18 @@
+@@ -67449,43 +27029,18 @@
return 0;
}
_ACEOF
@@ -73661,7 +73652,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_KRB5_FWD_TGT_CREDS 1
_ACEOF
-@@ -67499,20 +27051,14 @@
+@@ -67493,20 +27048,14 @@
fi
@@ -73685,7 +73676,7 @@
/* 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 +27099,48 @@
+@@ -67547,136 +27096,48 @@
return 0;
}
_ACEOF
@@ -73837,7 +73828,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67702,57 +27160,30 @@
+@@ -67696,57 +27157,30 @@
return 0;
}
_ACEOF
@@ -73902,7 +73893,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67768,58 +27199,31 @@
+@@ -67762,58 +27196,31 @@
return 0;
}
_ACEOF
@@ -73968,7 +73959,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -67831,36 +27235,15 @@
+@@ -67825,36 +27232,15 @@
return 0;
}
_ACEOF
@@ -74008,7 +73999,7 @@
$as_echo "$smb_krb5_cv_verify_checksum" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -67868,17 +27251,13 @@
+@@ -67862,17 +27248,13 @@
_ACEOF
@@ -74029,7 +74020,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67889,56 +27268,29 @@
+@@ -67883,56 +27265,29 @@
return 0;
}
_ACEOF
@@ -74093,7 +74084,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -67949,56 +27301,29 @@
+@@ -67943,56 +27298,29 @@
return 0;
}
_ACEOF
@@ -74157,7 +74148,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68009,56 +27334,29 @@
+@@ -68003,56 +27331,29 @@
return 0;
}
_ACEOF
@@ -74221,7 +74212,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68069,56 +27367,29 @@
+@@ -68063,56 +27364,29 @@
return 0;
}
_ACEOF
@@ -74285,7 +74276,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68129,56 +27400,29 @@
+@@ -68123,56 +27397,29 @@
return 0;
}
_ACEOF
@@ -74349,7 +74340,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68189,56 +27433,29 @@
+@@ -68183,56 +27430,29 @@
return 0;
}
_ACEOF
@@ -74413,7 +74404,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68249,56 +27466,29 @@
+@@ -68243,56 +27463,29 @@
return 0;
}
_ACEOF
@@ -74477,7 +74468,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68309,55 +27499,28 @@
+@@ -68303,55 +27496,28 @@
return 0;
}
_ACEOF
@@ -74540,7 +74531,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68368,56 +27531,29 @@
+@@ -68362,56 +27528,29 @@
return 0;
}
_ACEOF
@@ -74604,7 +74595,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68428,56 +27564,29 @@
+@@ -68422,56 +27561,29 @@
return 0;
}
_ACEOF
@@ -74668,7 +74659,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68488,56 +27597,29 @@
+@@ -68482,56 +27594,29 @@
return 0;
}
_ACEOF
@@ -74732,7 +74723,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68548,56 +27630,29 @@
+@@ -68542,56 +27627,29 @@
return 0;
}
_ACEOF
@@ -74796,7 +74787,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68608,47 +27663,22 @@
+@@ -68602,47 +27660,22 @@
return 0;
}
_ACEOF
@@ -74850,7 +74841,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68659,58 +27689,31 @@
+@@ -68653,58 +27686,31 @@
return 0;
}
_ACEOF
@@ -74916,7 +74907,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68721,56 +27724,29 @@
+@@ -68715,56 +27721,29 @@
return 0;
}
_ACEOF
@@ -74980,7 +74971,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68781,56 +27757,29 @@
+@@ -68775,56 +27754,29 @@
return 0;
}
_ACEOF
@@ -75044,7 +75035,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68841,56 +27790,29 @@
+@@ -68835,56 +27787,29 @@
return 0;
}
_ACEOF
@@ -75108,7 +75099,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68901,56 +27823,29 @@
+@@ -68895,56 +27820,29 @@
return 0;
}
_ACEOF
@@ -75172,7 +75163,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -68961,61 +27856,30 @@
+@@ -68955,61 +27853,30 @@
return 0;
}
_ACEOF
@@ -75243,7 +75234,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69026,56 +27890,29 @@
+@@ -69020,56 +27887,29 @@
return 0;
}
_ACEOF
@@ -75307,7 +75298,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69086,56 +27923,29 @@
+@@ -69080,56 +27920,29 @@
return 0;
}
_ACEOF
@@ -75371,7 +75362,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69146,65 +27956,35 @@
+@@ -69140,65 +27953,35 @@
return 0;
}
_ACEOF
@@ -75448,7 +75439,7 @@
/* end confdefs.h. */
#include<krb5.h>
-@@ -69217,65 +27997,32 @@
+@@ -69211,65 +27994,32 @@
return krb5_kt_resolve(context, "WRFILE:api", &keytab);
}
_ACEOF
@@ -75523,7 +75514,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69289,56 +28036,29 @@
+@@ -69283,56 +28033,29 @@
return 0;
}
_ACEOF
@@ -75587,7 +75578,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69349,56 +28069,29 @@
+@@ -69343,56 +28066,29 @@
return 0;
}
_ACEOF
@@ -75651,7 +75642,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69410,49 +28103,26 @@
+@@ -69404,49 +28100,26 @@
return 0;
}
_ACEOF
@@ -75707,7 +75698,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69466,20 +28136,13 @@
+@@ -69460,20 +28133,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75733,7 +75724,7 @@
/* end confdefs.h. */
#include <stdlib.h>
-@@ -69493,42 +28156,15 @@
+@@ -69487,42 +28153,15 @@
}
_ACEOF
@@ -75780,7 +75771,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69540,20 +28176,18 @@
+@@ -69534,20 +28173,18 @@
export LDFLAGS;
fi
@@ -75805,7 +75796,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -69567,20 +28201,13 @@
+@@ -69561,20 +28198,13 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -75831,7 +75822,7 @@
/* end confdefs.h. */
#include <krb5.h>
-@@ -69591,42 +28218,15 @@
+@@ -69585,42 +28215,15 @@
}
_ACEOF
@@ -75878,7 +75869,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -69638,29 +28238,23 @@
+@@ -69632,29 +28235,23 @@
export LDFLAGS;
fi
@@ -75913,7 +75904,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69671,61 +28265,30 @@
+@@ -69665,61 +28262,30 @@
return 0;
}
_ACEOF
@@ -75984,7 +75975,7 @@
/* end confdefs.h. */
#include <krb5.h>
int
-@@ -69736,47 +28299,20 @@
+@@ -69730,47 +28296,20 @@
return 0;
}
_ACEOF
@@ -76038,7 +76029,7 @@
fi
-@@ -69788,7 +28324,7 @@
+@@ -69782,7 +28321,7 @@
#
#
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" != x"yes"; then
@@ -76047,7 +76038,7 @@
$as_echo "$as_me: WARNING: krb5_mk_req_extended not found in -lkrb5" >&2;}
use_ads=no
fi
-@@ -69796,7 +28332,7 @@
+@@ -69790,7 +28329,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
@@ -76056,7 +76047,7 @@
$as_echo "$as_me: WARNING: no CREATE_KEY_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69804,7 +28340,7 @@
+@@ -69798,7 +28337,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
@@ -76065,7 +76056,7 @@
$as_echo "$as_me: WARNING: no GET_ENCTYPES_FUNCTIONS detected" >&2;}
use_ads=no
fi
-@@ -69812,7 +28348,7 @@
+@@ -69806,7 +28345,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
@@ -76074,7 +76065,7 @@
$as_echo "$as_me: WARNING: no KT_FREE_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69820,7 +28356,7 @@
+@@ -69814,7 +28353,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
@@ -76083,7 +76074,7 @@
$as_echo "$as_me: WARNING: no KRB5_VERIFY_CHECKSUM_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69832,14 +28368,14 @@
+@@ -69826,14 +28365,14 @@
if test x"$ac_cv_func_ext_free_AP_REQ" != x"yes"
then
@@ -76100,7 +76091,7 @@
$as_echo "$as_me: WARNING: no KRB5_AP_REQ_DECODING_FUNCTION detected" >&2;}
use_ads=no
fi
-@@ -69848,29 +28384,21 @@
+@@ -69842,29 +28381,21 @@
if test x"$use_ads" = x"yes"; then
@@ -76135,7 +76126,7 @@
$as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
fi
-@@ -69896,9 +28424,9 @@
+@@ -69890,9 +28421,9 @@
KRB5_LIBS=""
with_ads_support=no
fi
@@ -76147,7 +76138,7 @@
$as_echo "$use_ads" >&6; }
LIBS="$ac_save_LIBS"
-@@ -69910,23 +28438,17 @@
+@@ -69904,23 +28435,17 @@
@@ -76174,7 +76165,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -69944,54 +28466,28 @@
+@@ -69938,54 +28463,28 @@
return 0;
}
_ACEOF
@@ -76236,7 +76227,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNSCD 1
_ACEOF
-@@ -70006,7 +28502,6 @@
+@@ -70000,7 +28499,6 @@
fi
@@ -76244,7 +76235,7 @@
PASSDB_LIBS="$PASSDB_LIBS $NSCD_LIBS"
-@@ -70014,12 +28509,12 @@
+@@ -70008,12 +28506,12 @@
# Compile with DNS Updates support?
with_dnsupdate_support=no
@@ -76259,7 +76250,7 @@
withval=$with_dnsupdate; case "$withval" in
yes|no)
with_dnsupdate_support=$withval
-@@ -70028,7 +28523,7 @@
+@@ -70022,7 +28520,7 @@
fi
@@ -76268,7 +76259,7 @@
$as_echo "$with_dnsupdate_support" >&6; }
if test x"$with_dnsupdate_support" != x"no"; then
-@@ -70042,151 +28537,12 @@
+@@ -70036,151 +28534,12 @@
##################################################################
# then test for uuid.h (necessary to generate unique DNS keynames
# (uuid.h is required for this test)
@@ -76425,7 +76416,7 @@
_ACEOF
fi
-@@ -70196,11 +28552,9 @@
+@@ -70190,11 +28549,9 @@
if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76439,7 +76430,7 @@
$as_echo "$as_me: WARNING: uuid.h is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70216,102 +28570,12 @@
+@@ -70210,102 +28567,12 @@
UUID_LIBS=""
@@ -76547,7 +76538,7 @@
_ACEOF
# uuid_generate was found in libc or existing $LIBS
-@@ -70328,9 +28592,7 @@
+@@ -70322,9 +28589,7 @@
with_dnsupdate_support=yes
@@ -76558,7 +76549,7 @@
-@@ -70343,11 +28605,9 @@
+@@ -70337,11 +28602,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76572,7 +76563,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70356,18 +28616,14 @@
+@@ -70350,18 +28613,14 @@
;;
*)
# uuid_generate was not found, try adding libuuid
@@ -76594,7 +76585,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -70385,43 +28641,18 @@
+@@ -70379,43 +28638,18 @@
return 0;
}
_ACEOF
@@ -76644,7 +76635,7 @@
LIBS="-luuid $LIBS"
-@@ -70437,9 +28668,7 @@
+@@ -70431,9 +28665,7 @@
with_dnsupdate_support=yes
@@ -76655,7 +76646,7 @@
-@@ -70449,11 +28678,9 @@
+@@ -70443,11 +28675,9 @@
if test x"$with_dnsupdate_support" = x"yes"; then
@@ -76669,7 +76660,7 @@
$as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
fi
with_dnsupdate_support=no
-@@ -70473,28 +28700,26 @@
+@@ -70467,28 +28697,26 @@
#################################################
# check for automount support
@@ -76704,7 +76695,7 @@
$as_echo "no" >&6; }
fi
-@@ -70505,34 +28730,30 @@
+@@ -70499,34 +28727,30 @@
CIFSMOUNT_PROGS=""
INSTALL_CIFSMOUNT=""
UNINSTALL_CIFSMOUNT=""
@@ -76745,7 +76736,7 @@
;;
esac
;;
-@@ -70540,19 +28761,17 @@
+@@ -70534,19 +28758,17 @@
else
case "$host_os" in
*linux*)
@@ -76768,7 +76759,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -70562,151 +28781,12 @@
+@@ -70556,151 +28778,12 @@
#################################################
# check for cifs.upcall support
@@ -76924,7 +76915,7 @@
_ACEOF
HAVE_KEYUTILS_H=1
else
-@@ -70718,34 +28798,28 @@
+@@ -70712,34 +28795,28 @@
CIFSUPCALL_PROGS=""
INSTALL_CIFSUPCALL=""
UNINSTALL_CIFSUPCALL=""
@@ -76966,7 +76957,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70753,9 +28827,7 @@
+@@ -70747,9 +28824,7 @@
fi
;;
*)
@@ -76977,7 +76968,7 @@
;;
esac
;;
-@@ -70764,18 +28836,16 @@
+@@ -70758,18 +28833,16 @@
case "$host_os" in
*linux*)
if test x"$use_ads" != x"yes"; then
@@ -77000,7 +76991,7 @@
CIFSUPCALL_PROGS="bin/cifs.upcall"
INSTALL_CIFSUPCALL="installcifsupcall"
-@@ -70783,7 +28853,7 @@
+@@ -70777,7 +28850,7 @@
fi
;;
*)
@@ -77009,7 +77000,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -70800,11 +28870,11 @@
+@@ -70794,11 +28867,11 @@
with_pam_for_crypt=no
try_pam=no
@@ -77023,7 +77014,7 @@
withval=$with_pam; case "$withval" in
yes|no)
try_pam=$withval
-@@ -70813,7 +28883,7 @@
+@@ -70807,7 +28880,7 @@
fi
@@ -77032,7 +77023,7 @@
$as_echo "$try_pam" >&6; }
use_pam=no
-@@ -70824,150 +28894,12 @@
+@@ -70818,150 +28891,12 @@
# Most systems have PAM headers in /usr/include/security, but Darwin
# has them in /usr/include/pam.
@@ -77189,7 +77180,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -70979,9 +28911,7 @@
+@@ -70973,9 +28908,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
@@ -77200,7 +77191,7 @@
fi
use_pam=no
create_pam_modules=no
-@@ -70989,23 +28919,17 @@
+@@ -70983,23 +28916,17 @@
@@ -77227,7 +77218,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -71023,54 +28947,28 @@
+@@ -71017,54 +28944,28 @@
return 0;
}
_ACEOF
@@ -77289,7 +77280,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -71085,34 +28983,18 @@
+@@ -71079,34 +28980,18 @@
fi
@@ -77329,7 +77320,7 @@
#if HAVE_SECURITY_PAM_APPL_H
#include <security/pam_appl.h>
#endif
-@@ -71120,44 +29002,9 @@
+@@ -71114,44 +28999,9 @@
#include <pam/pam_appl.h>
#endif
@@ -77377,7 +77368,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71169,179 +29016,33 @@
+@@ -71163,179 +29013,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
@@ -77567,7 +77558,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71350,150 +29051,12 @@
+@@ -71344,150 +29048,12 @@
done
@@ -77724,7 +77715,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -71504,19 +29067,14 @@
+@@ -71498,19 +29064,14 @@
@@ -77747,7 +77738,7 @@
/* 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 +29115,36 @@
+@@ -71551,62 +29112,36 @@
return 0;
}
_ACEOF
@@ -77821,7 +77812,7 @@
$as_echo "$create_pam_modules" >&6; }
fi # try_pam != no
-@@ -71621,26 +29153,22 @@
+@@ -71615,26 +29150,22 @@
PAM_MODULES=""
INSTALL_PAM_MODULES=""
UNINSTALL_PAM_MODULES=""
@@ -77853,7 +77844,7 @@
else
PAM_MODULES="pam_smbpass"
INSTALL_PAM_MODULES="installpammodules"
-@@ -71648,12 +29176,12 @@
+@@ -71642,12 +29173,12 @@
fi
;;
*)
@@ -77868,7 +77859,7 @@
$as_echo "no" >&6; }
fi
-@@ -71667,98 +29195,63 @@
+@@ -71661,98 +29192,63 @@
## $with_pam_for_crypt variable as above --jerry
##
if test $with_pam_for_crypt = no; then
@@ -77983,7 +77974,7 @@
$as_echo "no" >&6; }
fi
-@@ -71766,28 +29259,26 @@
+@@ -71760,28 +29256,26 @@
#################################################
# check for syslog logging
@@ -78018,7 +78009,7 @@
$as_echo "no" >&6; }
fi
-@@ -71795,16 +29286,14 @@
+@@ -71789,16 +29283,14 @@
#################################################
# check for custom syslog facility
@@ -78038,7 +78029,7 @@
else
if test "$withval" != "yes" ; then
syslog_facility="$withval"
-@@ -71829,14 +29318,14 @@
+@@ -71823,14 +29315,14 @@
samba_cv_TRY_SYS_QUOTAS=auto
samba_cv_SYSQUOTA_FOUND=no
@@ -78056,7 +78047,7 @@
$as_echo "yes" >&6; }
samba_cv_WITH_QUOTAS=yes
samba_cv_TRY_QUOTAS=yes
-@@ -71845,7 +29334,7 @@
+@@ -71839,7 +29331,7 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
auto)
@@ -78065,7 +78056,7 @@
$as_echo "auto" >&6; }
samba_cv_WITH_QUOTAS=auto
samba_cv_TRY_QUOTAS=auto
-@@ -71854,74 +29343,74 @@
+@@ -71848,74 +29340,74 @@
samba_cv_TRY_SYS_QUOTAS=auto
;;
no)
@@ -78153,7 +78144,7 @@
$as_echo "no" >&6; }
samba_cv_TRY_SYS_QUOTAS=no
;;
-@@ -71937,483 +29426,68 @@
+@@ -71931,483 +29423,68 @@
*linux*)
samba_cv_SYSQUOTA_FOUND=yes
@@ -78666,7 +78657,7 @@
_ACEOF
fi
-@@ -72422,151 +29496,12 @@
+@@ -72416,151 +29493,12 @@
# For sys/quota.h and linux/quota.h
@@ -78822,7 +78813,7 @@
_ACEOF
fi
-@@ -72576,17 +29511,13 @@
+@@ -72570,17 +29508,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
@@ -78843,7 +78834,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72606,35 +29537,14 @@
+@@ -72600,35 +29534,14 @@
return 0;
}
_ACEOF
@@ -78882,7 +78873,7 @@
$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 +29552,13 @@
+@@ -72636,17 +29549,13 @@
fi
# if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
@@ -78903,7 +78894,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -72670,41 +29576,18 @@
+@@ -72664,41 +29573,18 @@
return 0;
}
_ACEOF
@@ -78949,7 +78940,7 @@
fi
-@@ -72712,9 +29595,9 @@
+@@ -72706,9 +29592,9 @@
# look for a working quota system
if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
@@ -78961,7 +78952,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72728,14 +29611,10 @@
+@@ -72722,14 +29608,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -78978,7 +78969,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4A 1
-@@ -72743,42 +29622,15 @@
+@@ -72737,42 +29619,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -79025,7 +79016,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72790,23 +29642,21 @@
+@@ -72784,23 +29639,21 @@
export LDFLAGS;
fi
@@ -79053,7 +79044,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72820,14 +29670,10 @@
+@@ -72814,14 +29667,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -79070,7 +79061,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_4B 1
-@@ -72835,42 +29681,15 @@
+@@ -72829,42 +29678,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -79117,7 +79108,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72882,24 +29701,22 @@
+@@ -72876,24 +29698,22 @@
export LDFLAGS;
fi
@@ -79146,7 +79137,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -72913,14 +29730,10 @@
+@@ -72907,14 +29727,10 @@
old_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS";
export LDFLAGS;
@@ -79163,7 +79154,7 @@
/* end confdefs.h. */
#define HAVE_QUOTACTL_3 1
-@@ -72928,42 +29741,15 @@
+@@ -72922,42 +29738,15 @@
#include "confdefs.h"
#include "${srcdir-.}/../tests/sysquotas.c"
_ACEOF
@@ -79210,7 +79201,7 @@
CFLAGS="$old_CFLAGS";
old_CFLAGS="";
export CFLAGS;
-@@ -72975,15 +29761,13 @@
+@@ -72969,15 +29758,13 @@
export LDFLAGS;
fi
@@ -79228,7 +79219,7 @@
samba_cv_sysquotas_file="lib/sysquotas_3.c"
fi
-@@ -72991,151 +29775,12 @@
+@@ -72985,151 +29772,12 @@
#################################################
# check for mntent.h and struct mntent
@@ -79384,7 +79375,7 @@
_ACEOF
fi
-@@ -73144,102 +29789,12 @@
+@@ -73138,102 +29786,12 @@
#################################################
# check for setmntent,getmntent,endmntent
@@ -79492,7 +79483,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -73250,151 +29805,12 @@
+@@ -73244,151 +29802,12 @@
#################################################
# check for devnm.h and struct mntent
@@ -79648,7 +79639,7 @@
_ACEOF
fi
-@@ -73403,102 +29819,12 @@
+@@ -73397,102 +29816,12 @@
#################################################
# check for devnm
@@ -79755,7 +79746,7 @@
_ACEOF
fi
-@@ -73521,19 +29847,15 @@
+@@ -73515,19 +29844,15 @@
fi
if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
@@ -79778,7 +79769,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73551,76 +29873,47 @@
+@@ -73545,76 +29870,47 @@
return 0;
}
_ACEOF
@@ -79866,7 +79857,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73638,62 +29931,35 @@
+@@ -73632,62 +29928,35 @@
return 0;
}
_ACEOF
@@ -79937,7 +79928,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -73709,56 +29975,33 @@
+@@ -73703,56 +29972,33 @@
return 0;
}
_ACEOF
@@ -80002,7 +79993,7 @@
$as_echo "no" >&6; }
fi
fi
-@@ -73770,12 +30013,12 @@
+@@ -73764,12 +30010,12 @@
#################################################
# check for experimental utmp accounting
@@ -80017,7 +80008,7 @@
withval=$with_utmp; case "$withval" in
no)
WITH_UTMP=no
-@@ -73798,15 +30041,13 @@
+@@ -73792,15 +30038,13 @@
# Display test results
if test x"$WITH_UTMP" = x"yes"; then
@@ -80036,7 +80027,7 @@
$as_echo "no$utmp_no_reason" >&6; }
fi
-@@ -73832,10 +30073,10 @@
+@@ -73826,10 +30070,10 @@
USESHARED=false
@@ -80049,7 +80040,7 @@
enableval=$enable_shared_libs; enable_shared_libs=$enableval
else
enable_shared_libs=yes
-@@ -73846,11 +30087,11 @@
+@@ -73840,11 +30084,11 @@
USESHARED=$BLDSHARED
fi
@@ -80063,7 +80054,7 @@
$as_echo "$as_me: WARNING: --enable-shared-libs: no support for shared libraries" >&2;}
fi
-@@ -73878,14 +30119,13 @@
+@@ -73872,14 +30116,13 @@
# Check whether --with-static-libs was given.
@@ -80080,7 +80071,7 @@
fi
-@@ -73934,16 +30174,16 @@
+@@ -73928,16 +30171,16 @@
@@ -80100,7 +80091,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -73969,7 +30209,7 @@
+@@ -73963,7 +30206,7 @@
if eval $BLDSHARED = true; then
LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
@@ -80109,7 +80100,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
enable_static=yes
-@@ -73982,12 +30222,12 @@
+@@ -73976,12 +30219,12 @@
enable_static=yes
LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
@@ -80124,7 +80115,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74038,16 +30278,16 @@
+@@ -74032,16 +30275,16 @@
@@ -80144,7 +80135,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74073,7 +30313,7 @@
+@@ -74067,7 +30310,7 @@
if eval $BLDSHARED = true; then
LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
@@ -80153,7 +80144,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
enable_static=yes
-@@ -74086,12 +30326,12 @@
+@@ -74080,12 +30323,12 @@
enable_static=yes
LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
@@ -80168,7 +80159,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74129,16 +30369,16 @@
+@@ -74123,16 +30366,16 @@
@@ -80188,7 +80179,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74164,7 +30404,7 @@
+@@ -74158,7 +30401,7 @@
if eval $BLDSHARED = true; then
LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
@@ -80197,7 +80188,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
enable_static=yes
-@@ -74177,12 +30417,12 @@
+@@ -74171,12 +30414,12 @@
enable_static=yes
LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
@@ -80212,7 +80203,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74220,16 +30460,16 @@
+@@ -74214,16 +30457,16 @@
@@ -80232,7 +80223,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74255,7 +30495,7 @@
+@@ -74249,7 +30492,7 @@
if eval $BLDSHARED = true; then
LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
@@ -80241,7 +80232,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
enable_static=yes
-@@ -74268,12 +30508,12 @@
+@@ -74262,12 +30505,12 @@
enable_static=yes
LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
@@ -80256,7 +80247,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74311,16 +30551,16 @@
+@@ -74305,16 +30548,16 @@
@@ -80276,7 +80267,7 @@
$as_echo "no" >&6; }
build_lib=no
;;
-@@ -74346,7 +30586,7 @@
+@@ -74340,7 +30583,7 @@
if eval $BLDSHARED = true; then
LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
@@ -80285,7 +80276,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
enable_static=yes
-@@ -74359,12 +30599,12 @@
+@@ -74353,12 +30596,12 @@
enable_static=yes
LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
@@ -80300,7 +80291,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74402,19 +30642,19 @@
+@@ -74396,19 +30639,19 @@
@@ -80323,7 +80314,7 @@
$as_echo "yes" >&6; }
build_lib=no
;;
-@@ -74423,7 +30663,7 @@
+@@ -74417,7 +30660,7 @@
else
# if unspecified, default is not to build
@@ -80332,7 +80323,7 @@
$as_echo "yes" >&6; }
build_lib=no
-@@ -74439,7 +30679,7 @@
+@@ -74433,7 +30676,7 @@
if eval $BLDSHARED = true; then
LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
@@ -80341,7 +80332,7 @@
$as_echo "yes" >&6; }
if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
enable_static=yes
-@@ -74452,12 +30692,12 @@
+@@ -74446,12 +30689,12 @@
enable_static=yes
LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
@@ -80356,7 +80347,7 @@
$as_echo "shared library not selected" >&6; }
fi
if test $enable_static = yes; then
-@@ -74473,26 +30713,22 @@
+@@ -74467,26 +30710,22 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -80388,7 +80379,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -74506,51 +30742,22 @@
+@@ -74500,51 +30739,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -80446,7 +80437,7 @@
fi
fi
-@@ -74563,16 +30770,12 @@
+@@ -74557,16 +30767,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -80466,7 +80457,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74584,47 +30787,20 @@
+@@ -74578,47 +30784,20 @@
return 0;
}
_ACEOF
@@ -80520,7 +80511,7 @@
fi
fi
-@@ -74632,17 +30808,13 @@
+@@ -74626,17 +30805,13 @@
# smbd/statvfs.c assumes that statvfs.f_fsid is an integer.
# This is not the case on ancient Linux systems.
@@ -80541,7 +80532,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74654,57 +30826,30 @@
+@@ -74648,57 +30823,30 @@
return 0;
}
_ACEOF
@@ -80606,7 +80597,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74716,56 +30861,29 @@
+@@ -74710,56 +30858,29 @@
return 0;
}
_ACEOF
@@ -80670,7 +80661,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74777,55 +30895,28 @@
+@@ -74771,55 +30892,28 @@
return 0;
}
_ACEOF
@@ -80733,7 +80724,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -74837,59 +30928,32 @@
+@@ -74831,59 +30925,32 @@
return 0;
}
_ACEOF
@@ -80801,7 +80792,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -74902,71 +30966,38 @@
+@@ -74896,71 +30963,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -80883,7 +80874,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -74985,71 +31016,38 @@
+@@ -74979,71 +31013,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -80965,7 +80956,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -75059,71 +31057,38 @@
+@@ -75053,71 +31054,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -81047,7 +81038,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -75139,71 +31104,38 @@
+@@ -75133,71 +31101,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -81129,7 +81120,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -75223,52 +31155,23 @@
+@@ -75217,52 +31152,23 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -81188,7 +81179,7 @@
fi
fi
-@@ -75281,13 +31184,9 @@
+@@ -75275,13 +31181,9 @@
# If we don't have all of these then disable large
# file support.
#
@@ -81204,7 +81195,7 @@
/* end confdefs.h. */
#if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-@@ -75304,41 +31203,18 @@
+@@ -75298,41 +31200,18 @@
return 0;
}
_ACEOF
@@ -81250,7 +81241,7 @@
$as_echo "$samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT" >&6; }
#################################################
-@@ -75348,10 +31224,10 @@
+@@ -75342,10 +31221,10 @@
# Check whether --with-ctdb was given.
@@ -81263,7 +81254,7 @@
$as_echo "$as_me: WARNING: --with-ctdb called without argument" >&2;}
;;
*)
-@@ -75365,471 +31241,40 @@
+@@ -75359,471 +31238,40 @@
CPPFLAGS="$CPPFLAGS $CTDB_CPPFLAGS"
ctdb_broken="missing or broken headers"
@@ -81760,7 +81751,7 @@
/* end confdefs.h. */
#include "confdefs.h"
-@@ -75842,71 +31287,109 @@
+@@ -75836,71 +31284,109 @@
#include <ctdb.h>
#include <ctdb_private.h>
@@ -81908,7 +81899,7 @@
withval=$with_cluster_support;
fi
-@@ -75917,44 +31400,38 @@
+@@ -75911,44 +31397,38 @@
if test x"$ac_cv_header_ctdb_private_h" != x"yes"; then
if test "x$with_cluster_support" = "xyes"; then
@@ -81960,7 +81951,7 @@
withval=$with_acl_support; case "$withval" in
yes|no)
with_acl_support="$withval"
-@@ -75967,105 +31444,85 @@
+@@ -75961,105 +31441,85 @@
with_acl_support="auto"
fi
@@ -82087,7 +82078,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76083,60 +31540,31 @@
+@@ -76077,60 +31537,31 @@
return 0;
}
_ACEOF
@@ -82157,7 +82148,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76154,61 +31582,32 @@
+@@ -76148,61 +31579,32 @@
return 0;
}
_ACEOF
@@ -82228,7 +82219,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76227,64 +31626,33 @@
+@@ -76221,64 +31623,33 @@
return 0;
}
_ACEOF
@@ -82303,7 +82294,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -76302,58 +31670,29 @@
+@@ -76296,58 +31667,29 @@
return 0;
}
_ACEOF
@@ -82370,7 +82361,7 @@
fi
;;
-@@ -76365,31 +31704,27 @@
+@@ -76359,31 +31701,27 @@
#################################################
# check for AIO support
@@ -82408,7 +82399,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76407,58 +31742,29 @@
+@@ -76401,58 +31739,29 @@
return 0;
}
_ACEOF
@@ -82476,7 +82467,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -76476,59 +31782,30 @@
+@@ -76470,59 +31779,30 @@
return 0;
}
_ACEOF
@@ -82545,7 +82536,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76540,55 +31817,26 @@
+@@ -76534,55 +31814,26 @@
return 0;
}
_ACEOF
@@ -82609,7 +82600,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <aio.h>
-@@ -76600,716 +31848,317 @@
+@@ -76594,716 +31845,317 @@
return 0;
}
_ACEOF
@@ -83464,7 +83455,7 @@
$as_echo "no" >&6; }
fi
-@@ -77326,30 +32175,26 @@
+@@ -77320,30 +32172,26 @@
# check for sendfile support
with_sendfile_support=yes
@@ -83501,7 +83492,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77365,53 +32210,24 @@
+@@ -77359,53 +32207,24 @@
return 0;
}
_ACEOF
@@ -83563,7 +83554,7 @@
/* end confdefs.h. */
#include <sys/sendfile.h>
int
-@@ -77427,54 +32243,25 @@
+@@ -77421,54 +32240,25 @@
return 0;
}
_ACEOF
@@ -83626,7 +83617,7 @@
/* end confdefs.h. */
\
#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-@@ -77494,103 +32281,58 @@
+@@ -77488,103 +32278,58 @@
return 0;
}
_ACEOF
@@ -83747,7 +83738,7 @@
/* end confdefs.h. */
\
#include <sys/types.h>
-@@ -77608,85 +32350,50 @@
+@@ -77602,85 +32347,50 @@
hdr.headers = &hdtrl;
hdr.hdr_cnt = 1;
hdr.trailers = NULL;
@@ -83854,7 +83845,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77710,73 +32417,38 @@
+@@ -77704,73 +32414,38 @@
return 0;
}
_ACEOF
@@ -83940,7 +83931,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -77800,77 +32472,41 @@
+@@ -77794,77 +32469,41 @@
return 0;
}
_ACEOF
@@ -84030,7 +84021,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -77888,43 +32524,18 @@
+@@ -77882,43 +32521,18 @@
return 0;
}
_ACEOF
@@ -84080,7 +84071,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSENDFILE 1
_ACEOF
-@@ -77933,17 +32544,13 @@
+@@ -77927,17 +32541,13 @@
fi
@@ -84101,7 +84092,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -77974,74 +32581,39 @@
+@@ -77968,74 +32578,39 @@
return 0;
}
_ACEOF
@@ -84188,7 +84179,7 @@
/* end confdefs.h. */
\
#include <sys/sendfile.h>
-@@ -78072,75 +32644,40 @@
+@@ -78066,75 +32641,40 @@
return 0;
}
_ACEOF
@@ -84276,7 +84267,7 @@
/* end confdefs.h. */
\
#include <sys/socket.h>
-@@ -78168,59 +32705,28 @@
+@@ -78162,59 +32702,28 @@
return 0;
}
_ACEOF
@@ -84345,7 +84336,7 @@
$as_echo "no" >&6; };
fi
;;
-@@ -78229,12 +32735,12 @@
+@@ -78223,12 +32732,12 @@
esac
;;
*)
@@ -84360,7 +84351,7 @@
$as_echo "yes" >&6; }
fi
-@@ -78243,17 +32749,13 @@
+@@ -78237,17 +32746,13 @@
############################################
# See if we have the Linux readahead syscall.
@@ -84381,7 +84372,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78268,62 +32770,31 @@
+@@ -78262,62 +32767,31 @@
return 0;
}
_ACEOF
@@ -84453,7 +84444,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78334,41 +32805,18 @@
+@@ -78328,41 +32802,18 @@
return 0;
}
_ACEOF
@@ -84499,7 +84490,7 @@
fi
-@@ -78376,17 +32824,13 @@
+@@ -78370,17 +32821,13 @@
############################################
# See if we have the posix_fadvise syscall.
@@ -84520,7 +84511,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78401,47 +32845,20 @@
+@@ -78395,47 +32842,20 @@
return 0;
}
_ACEOF
@@ -84574,7 +84565,7 @@
fi
-@@ -78450,17 +32867,13 @@
+@@ -78444,17 +32864,13 @@
case "$host_os" in
*linux*)
@@ -84595,7 +84586,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -78475,40 +32888,15 @@
+@@ -78469,40 +32885,15 @@
return 0;
}
_ACEOF
@@ -84641,7 +84632,7 @@
$as_echo "$samba_cv_HAVE_LINUX_SPLICE" >&6; }
;;
*)
-@@ -78518,24 +32906,18 @@
+@@ -78512,24 +32903,18 @@
if test x"$samba_cv_HAVE_LINUX_SPLICE" = x"yes"; then
@@ -84670,7 +84661,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -78546,41 +32928,18 @@
+@@ -78540,41 +32925,18 @@
return 0;
}
_ACEOF
@@ -84716,7 +84707,7 @@
fi
-@@ -78588,68 +32947,35 @@
+@@ -78582,68 +32944,35 @@
############################################
# See if we have the a broken readlink syscall.
@@ -84795,7 +84786,7 @@
fi
-@@ -78657,7 +32983,7 @@
+@@ -78651,7 +32980,7 @@
# Check whether winbind is supported on this platform. If so we need to
# build and install client programs, sbin programs and shared libraries
@@ -84804,7 +84795,7 @@
$as_echo_n "checking whether to build winbind... " >&6; }
# Initially, the value of $host_os decides whether winbind is supported
-@@ -78669,7 +32995,7 @@
+@@ -78663,7 +32992,7 @@
# We define this here so --with-winbind can override it.
# Check whether --with-wbclient was given.
@@ -84813,7 +84804,7 @@
withval=$with_wbclient;
case "$withval" in
no)
-@@ -78770,7 +33096,7 @@
+@@ -78764,7 +33093,7 @@
# Check whether --with-winbind was given.
@@ -84822,7 +84813,7 @@
withval=$with_winbind;
case "$withval" in
yes)
-@@ -78801,18 +33127,14 @@
+@@ -78795,18 +33124,14 @@
WINBIND_WINS_NSS=""
fi
if test x"$HAVE_WBCLIENT" = x"yes"; then
@@ -84844,7 +84835,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78830,57 +33152,28 @@
+@@ -78824,57 +33149,28 @@
return 0;
}
_ACEOF
@@ -84911,7 +84902,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
else
-@@ -78911,12 +33204,10 @@
+@@ -78905,12 +33201,10 @@
fi
if test x"$HAVE_WINBIND" = x"yes"; then
@@ -84926,7 +84917,7 @@
EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/wbinfo\$(EXEEXT)"
-@@ -78927,22 +33218,18 @@
+@@ -78921,22 +33215,18 @@
UNINSTALL_PAM_MODULES="uninstallpammodules"
fi
else
@@ -84953,7 +84944,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -78960,48 +33247,21 @@
+@@ -78954,48 +33244,21 @@
return 0;
}
_ACEOF
@@ -85009,7 +85000,7 @@
fi
-@@ -79018,533 +33278,52 @@
+@@ -79012,533 +33275,52 @@
# Solaris 10 does have new member in nss_XbyY_key
@@ -85579,7 +85570,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
-@@ -79554,17 +33333,13 @@
+@@ -79548,17 +33330,13 @@
fi
@@ -85600,7 +85591,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-@@ -79579,41 +33354,18 @@
+@@ -79573,41 +33351,18 @@
return 0;
}
_ACEOF
@@ -85646,7 +85637,7 @@
fi
-@@ -79623,7 +33375,7 @@
+@@ -79617,7 +33372,7 @@
# Check whether --with-included-popt was given.
@@ -85655,7 +85646,7 @@
withval=$with_included_popt;
case "$withval" in
yes)
-@@ -79636,18 +33388,14 @@
+@@ -79630,18 +33385,14 @@
fi
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -85677,7 +85668,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -79665,43 +33413,18 @@
+@@ -79659,43 +33410,18 @@
return 0;
}
_ACEOF
@@ -85727,7 +85718,7 @@
INCLUDED_POPT=no
else
INCLUDED_POPT=yes
-@@ -79709,16 +33432,16 @@
+@@ -79703,16 +33429,16 @@
fi
@@ -85747,7 +85738,7 @@
$as_echo "no" >&6; }
BUILD_POPT=""
POPTLIBS="-lpopt"
-@@ -79731,7 +33454,7 @@
+@@ -79725,7 +33451,7 @@
# Check if user wants DNS service discovery support
# Check whether --enable-dnssd was given.
@@ -85756,7 +85747,7 @@
enableval=$enable_dnssd;
fi
-@@ -79740,151 +33463,12 @@
+@@ -79734,151 +33460,12 @@
if test x"$enable_dnssd" = x"yes"; then
have_dnssd_support=yes
@@ -85913,7 +85904,7 @@
_ACEOF
fi
-@@ -79897,102 +33481,12 @@
+@@ -79891,102 +33478,12 @@
# On Darwin the DNSSD API is in libc, but on other platforms it's
# probably in -ldns_sd
@@ -86021,7 +86012,7 @@
_ACEOF
fi
-@@ -80000,23 +33494,17 @@
+@@ -79994,23 +33491,17 @@
@@ -86048,7 +86039,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80034,54 +33522,28 @@
+@@ -80028,54 +33519,28 @@
return 0;
}
_ACEOF
@@ -86110,7 +86101,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDNS_SD 1
_ACEOF
-@@ -80096,7 +33558,6 @@
+@@ -80090,7 +33555,6 @@
fi
@@ -86118,7 +86109,7 @@
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 +33565,11 @@
+@@ -80098,15 +33562,11 @@
if test x"$have_dnssd_support" = x"yes"; then
@@ -86136,7 +86127,7 @@
fi
fi
-@@ -80122,7 +33579,7 @@
+@@ -80116,7 +33576,7 @@
# Check if user wants avahi support
# Check whether --enable-avahi was given.
@@ -86145,7 +86136,7 @@
enableval=$enable_avahi;
fi
-@@ -80130,151 +33587,12 @@
+@@ -80124,151 +33584,12 @@
if test x"$enable_avahi" != x"no"; then
have_avahi_support=yes
@@ -86302,7 +86293,7 @@
_ACEOF
fi
-@@ -80285,151 +33603,12 @@
+@@ -80279,151 +33600,12 @@
have_avahi_support=no
fi
@@ -86459,7 +86450,7 @@
_ACEOF
fi
-@@ -80441,18 +33620,14 @@
+@@ -80435,18 +33617,14 @@
fi
save_LIBS="$LIBS"
@@ -86481,7 +86472,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80470,58 +33645,29 @@
+@@ -80464,58 +33642,29 @@
return 0;
}
_ACEOF
@@ -86549,7 +86540,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80539,43 +33685,18 @@
+@@ -80533,43 +33682,18 @@
return 0;
}
_ACEOF
@@ -86599,7 +86590,7 @@
have_avahi_strerror=yes
fi
-@@ -80590,17 +33711,13 @@
+@@ -80584,17 +33708,13 @@
AVAHI_LIBS="-lavahi-client -lavahi-common"
@@ -86619,7 +86610,7 @@
fi
fi
fi
-@@ -80610,7 +33727,7 @@
+@@ -80604,7 +33724,7 @@
# Check whether --with-included-iniparser was given.
@@ -86628,7 +86619,7 @@
withval=$with_included_iniparser;
case "$withval" in
yes)
-@@ -80623,18 +33740,14 @@
+@@ -80617,18 +33737,14 @@
fi
if test x"$INCLUDED_INIPARSER" != x"yes"; then
@@ -86650,7 +86641,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -80652,43 +33765,18 @@
+@@ -80646,43 +33762,18 @@
return 0;
}
_ACEOF
@@ -86700,7 +86691,7 @@
INCLUDED_INIPARSER=no
else
INCLUDED_INIPARSER=yes
-@@ -80696,260 +33784,40 @@
+@@ -80690,260 +33781,40 @@
fi
@@ -86981,7 +86972,7 @@
_ACEOF
fi
-@@ -80957,20 +33825,16 @@
+@@ -80951,20 +33822,16 @@
done
@@ -87006,7 +86997,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -80982,46 +33846,19 @@
+@@ -80976,46 +33843,19 @@
return statfs (".", &fsd);
}
_ACEOF
@@ -87058,7 +87049,7 @@
$as_echo "$vfsfileid_cv_statfs" >&6; }
if test x"$ac_cv_func_getmntent" = x"yes" -a \
-@@ -81056,7 +33893,7 @@
+@@ -81050,7 +33890,7 @@
# Check whether --with-static-modules was given.
@@ -87067,7 +87058,7 @@
withval=$with_static_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -81068,7 +33905,7 @@
+@@ -81062,7 +33902,7 @@
# Check whether --with-shared-modules was given.
@@ -87076,7 +87067,7 @@
withval=$with_shared_modules; if test $withval; then
for i in `echo $withval | sed -e 's/,/ /g'`
do
-@@ -81079,7 +33916,7 @@
+@@ -81073,7 +33913,7 @@
@@ -87085,7 +87076,7 @@
$as_echo_n "checking how to build pdb_ldap... " >&6; }
if test "$MODULE_pdb_ldap"; then
DEST=$MODULE_pdb_ldap
-@@ -81091,12 +33928,10 @@
+@@ -81085,12 +33925,10 @@
if test x"$DEST" = xSHARED; then
@@ -87100,7 +87091,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_ldap"
-@@ -81107,16 +33942,16 @@
+@@ -81101,16 +33939,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_ldap.o passdb/pdb_nds.o"
PASSDB_LIBS="$PASSDB_LIBS $LDAP_LIBS"
@@ -87120,7 +87111,7 @@
$as_echo_n "checking how to build pdb_smbpasswd... " >&6; }
if test "$MODULE_pdb_smbpasswd"; then
DEST=$MODULE_pdb_smbpasswd
-@@ -81128,12 +33963,10 @@
+@@ -81122,12 +33960,10 @@
if test x"$DEST" = xSHARED; then
@@ -87135,7 +87126,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_smbpasswd"
-@@ -81144,16 +33977,16 @@
+@@ -81138,16 +33974,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_smbpasswd.o"
@@ -87155,7 +87146,7 @@
$as_echo_n "checking how to build pdb_tdbsam... " >&6; }
if test "$MODULE_pdb_tdbsam"; then
DEST=$MODULE_pdb_tdbsam
-@@ -81165,12 +33998,10 @@
+@@ -81159,12 +33995,10 @@
if test x"$DEST" = xSHARED; then
@@ -87170,7 +87161,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_tdbsam"
-@@ -81181,16 +34012,16 @@
+@@ -81175,16 +34009,16 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_tdb.o"
@@ -87190,7 +87181,7 @@
$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 +34033,10 @@
+@@ -81196,12 +34030,10 @@
if test x"$DEST" = xSHARED; then
@@ -87205,7 +87196,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules pdb_wbc_sam"
-@@ -81218,11 +34047,11 @@
+@@ -81212,11 +34044,11 @@
PDB_STATIC="$PDB_STATIC passdb/pdb_wbc_sam.o"
@@ -87219,7 +87210,7 @@
$as_echo "not" >&6; }
fi
-@@ -81244,7 +34073,7 @@
+@@ -81238,7 +34070,7 @@
@@ -87228,7 +87219,7 @@
$as_echo_n "checking how to build rpc_lsarpc... " >&6; }
if test "$MODULE_rpc_lsarpc"; then
DEST=$MODULE_rpc_lsarpc
-@@ -81256,12 +34085,10 @@
+@@ -81250,12 +34082,10 @@
if test x"$DEST" = xSHARED; then
@@ -87243,7 +87234,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_lsarpc"
-@@ -81272,16 +34099,16 @@
+@@ -81266,16 +34096,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_LSA_OBJ)"
@@ -87263,7 +87254,7 @@
$as_echo_n "checking how to build rpc_winreg... " >&6; }
if test "$MODULE_rpc_winreg"; then
DEST=$MODULE_rpc_winreg
-@@ -81293,12 +34120,10 @@
+@@ -81287,12 +34117,10 @@
if test x"$DEST" = xSHARED; then
@@ -87278,7 +87269,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_winreg"
-@@ -81309,16 +34134,16 @@
+@@ -81303,16 +34131,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_REG_OBJ)"
@@ -87298,7 +87289,7 @@
$as_echo_n "checking how to build rpc_initshutdown... " >&6; }
if test "$MODULE_rpc_initshutdown"; then
DEST=$MODULE_rpc_initshutdown
-@@ -81330,12 +34155,10 @@
+@@ -81324,12 +34152,10 @@
if test x"$DEST" = xSHARED; then
@@ -87313,7 +87304,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_initshutdown"
-@@ -81346,16 +34169,16 @@
+@@ -81340,16 +34166,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_INITSHUTDOWN_OBJ)"
@@ -87333,7 +87324,7 @@
$as_echo_n "checking how to build rpc_dssetup... " >&6; }
if test "$MODULE_rpc_dssetup"; then
DEST=$MODULE_rpc_dssetup
-@@ -81367,12 +34190,10 @@
+@@ -81361,12 +34187,10 @@
if test x"$DEST" = xSHARED; then
@@ -87348,7 +87339,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_dssetup"
-@@ -81383,16 +34204,16 @@
+@@ -81377,16 +34201,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DSSETUP_OBJ)"
@@ -87368,7 +87359,7 @@
$as_echo_n "checking how to build rpc_wkssvc... " >&6; }
if test "$MODULE_rpc_wkssvc"; then
DEST=$MODULE_rpc_wkssvc
-@@ -81404,12 +34225,10 @@
+@@ -81398,12 +34222,10 @@
if test x"$DEST" = xSHARED; then
@@ -87383,7 +87374,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_wkssvc"
-@@ -81420,16 +34239,16 @@
+@@ -81414,16 +34236,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_WKS_OBJ)"
@@ -87403,7 +87394,7 @@
$as_echo_n "checking how to build rpc_svcctl... " >&6; }
if test "$MODULE_rpc_svcctl"; then
DEST=$MODULE_rpc_svcctl
-@@ -81441,12 +34260,10 @@
+@@ -81435,12 +34257,10 @@
if test x"$DEST" = xSHARED; then
@@ -87418,7 +87409,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_svcctl"
-@@ -81457,16 +34274,16 @@
+@@ -81451,16 +34271,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVCCTL_OBJ)"
@@ -87438,7 +87429,7 @@
$as_echo_n "checking how to build rpc_ntsvcs... " >&6; }
if test "$MODULE_rpc_ntsvcs"; then
DEST=$MODULE_rpc_ntsvcs
-@@ -81478,12 +34295,10 @@
+@@ -81472,12 +34292,10 @@
if test x"$DEST" = xSHARED; then
@@ -87453,7 +87444,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_ntsvcs"
-@@ -81494,16 +34309,16 @@
+@@ -81488,16 +34306,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NTSVCS_OBJ)"
@@ -87473,7 +87464,7 @@
$as_echo_n "checking how to build rpc_netlogon... " >&6; }
if test "$MODULE_rpc_netlogon"; then
DEST=$MODULE_rpc_netlogon
-@@ -81515,12 +34330,10 @@
+@@ -81509,12 +34327,10 @@
if test x"$DEST" = xSHARED; then
@@ -87488,7 +87479,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netlogon"
-@@ -81531,16 +34344,16 @@
+@@ -81525,16 +34341,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_NETLOG_OBJ)"
@@ -87508,7 +87499,7 @@
$as_echo_n "checking how to build rpc_netdfs... " >&6; }
if test "$MODULE_rpc_netdfs"; then
DEST=$MODULE_rpc_netdfs
-@@ -81552,12 +34365,10 @@
+@@ -81546,12 +34362,10 @@
if test x"$DEST" = xSHARED; then
@@ -87523,7 +87514,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_netdfs"
-@@ -81568,16 +34379,16 @@
+@@ -81562,16 +34376,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_DFS_OBJ)"
@@ -87543,7 +87534,7 @@
$as_echo_n "checking how to build rpc_srvsvc... " >&6; }
if test "$MODULE_rpc_srvsvc"; then
DEST=$MODULE_rpc_srvsvc
-@@ -81589,12 +34400,10 @@
+@@ -81583,12 +34397,10 @@
if test x"$DEST" = xSHARED; then
@@ -87558,7 +87549,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_srvsvc"
-@@ -81605,16 +34414,16 @@
+@@ -81599,16 +34411,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SVC_OBJ)"
@@ -87578,7 +87569,7 @@
$as_echo_n "checking how to build rpc_spoolss... " >&6; }
if test "$MODULE_rpc_spoolss"; then
DEST=$MODULE_rpc_spoolss
-@@ -81626,12 +34435,10 @@
+@@ -81620,12 +34432,10 @@
if test x"$DEST" = xSHARED; then
@@ -87593,7 +87584,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_spoolss"
-@@ -81642,16 +34449,16 @@
+@@ -81636,16 +34446,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SPOOLSS_OBJ)"
@@ -87613,7 +87604,7 @@
$as_echo_n "checking how to build rpc_eventlog... " >&6; }
if test "$MODULE_rpc_eventlog"; then
DEST=$MODULE_rpc_eventlog
-@@ -81663,12 +34470,10 @@
+@@ -81657,12 +34467,10 @@
if test x"$DEST" = xSHARED; then
@@ -87628,7 +87619,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_eventlog"
-@@ -81679,16 +34484,16 @@
+@@ -81673,16 +34481,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_EVENTLOG_OBJ)"
@@ -87648,7 +87639,7 @@
$as_echo_n "checking how to build rpc_samr... " >&6; }
if test "$MODULE_rpc_samr"; then
DEST=$MODULE_rpc_samr
-@@ -81700,12 +34505,10 @@
+@@ -81694,12 +34502,10 @@
if test x"$DEST" = xSHARED; then
@@ -87663,7 +87654,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_samr"
-@@ -81716,16 +34519,16 @@
+@@ -81710,16 +34516,16 @@
RPC_STATIC="$RPC_STATIC \$(RPC_SAMR_OBJ)"
@@ -87683,7 +87674,7 @@
$as_echo_n "checking how to build rpc_rpcecho... " >&6; }
if test "$MODULE_rpc_rpcecho"; then
DEST=$MODULE_rpc_rpcecho
-@@ -81737,12 +34540,10 @@
+@@ -81731,12 +34537,10 @@
if test x"$DEST" = xSHARED; then
@@ -87698,7 +87689,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules rpc_rpcecho"
-@@ -81753,11 +34554,11 @@
+@@ -81747,11 +34551,11 @@
RPC_STATIC="$RPC_STATIC \$(RPC_ECHO_OBJ)"
@@ -87712,7 +87703,7 @@
$as_echo "not" >&6; }
fi
-@@ -81778,7 +34579,7 @@
+@@ -81772,7 +34576,7 @@
@@ -87721,7 +87712,7 @@
$as_echo_n "checking how to build idmap_ldap... " >&6; }
if test "$MODULE_idmap_ldap"; then
DEST=$MODULE_idmap_ldap
-@@ -81790,12 +34591,10 @@
+@@ -81784,12 +34588,10 @@
if test x"$DEST" = xSHARED; then
@@ -87736,7 +87727,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ldap"
-@@ -81806,16 +34605,16 @@
+@@ -81800,16 +34602,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ldap.o"
@@ -87756,7 +87747,7 @@
$as_echo_n "checking how to build idmap_tdb... " >&6; }
if test "$MODULE_idmap_tdb"; then
DEST=$MODULE_idmap_tdb
-@@ -81827,12 +34626,10 @@
+@@ -81821,12 +34623,10 @@
if test x"$DEST" = xSHARED; then
@@ -87771,7 +87762,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb"
-@@ -81843,16 +34640,16 @@
+@@ -81837,16 +34637,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb.o"
@@ -87791,7 +87782,7 @@
$as_echo_n "checking how to build idmap_tdb2... " >&6; }
if test "$MODULE_idmap_tdb2"; then
DEST=$MODULE_idmap_tdb2
-@@ -81864,12 +34661,10 @@
+@@ -81858,12 +34658,10 @@
if test x"$DEST" = xSHARED; then
@@ -87806,7 +87797,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_tdb2"
-@@ -81880,16 +34675,16 @@
+@@ -81874,16 +34672,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_tdb2.o"
@@ -87826,7 +87817,7 @@
$as_echo_n "checking how to build idmap_passdb... " >&6; }
if test "$MODULE_idmap_passdb"; then
DEST=$MODULE_idmap_passdb
-@@ -81901,12 +34696,10 @@
+@@ -81895,12 +34693,10 @@
if test x"$DEST" = xSHARED; then
@@ -87841,7 +87832,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_passdb"
-@@ -81917,16 +34710,16 @@
+@@ -81911,16 +34707,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_passdb.o"
@@ -87861,7 +87852,7 @@
$as_echo_n "checking how to build idmap_nss... " >&6; }
if test "$MODULE_idmap_nss"; then
DEST=$MODULE_idmap_nss
-@@ -81938,12 +34731,10 @@
+@@ -81932,12 +34728,10 @@
if test x"$DEST" = xSHARED; then
@@ -87876,7 +87867,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_nss"
-@@ -81954,16 +34745,16 @@
+@@ -81948,16 +34742,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_nss.o"
@@ -87896,7 +87887,7 @@
$as_echo_n "checking how to build idmap_rid... " >&6; }
if test "$MODULE_idmap_rid"; then
DEST=$MODULE_idmap_rid
-@@ -81975,12 +34766,10 @@
+@@ -81969,12 +34763,10 @@
if test x"$DEST" = xSHARED; then
@@ -87911,7 +87902,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_rid"
-@@ -81991,16 +34780,16 @@
+@@ -81985,16 +34777,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_rid.o"
@@ -87931,7 +87922,7 @@
$as_echo_n "checking how to build idmap_ad... " >&6; }
if test "$MODULE_idmap_ad"; then
DEST=$MODULE_idmap_ad
-@@ -82012,12 +34801,10 @@
+@@ -82006,12 +34798,10 @@
if test x"$DEST" = xSHARED; then
@@ -87946,7 +87937,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_ad"
-@@ -82028,16 +34815,16 @@
+@@ -82022,16 +34812,16 @@
IDMAP_STATIC="$IDMAP_STATIC winbindd/idmap_ad.o"
@@ -87966,7 +87957,7 @@
$as_echo_n "checking how to build idmap_hash... " >&6; }
if test "$MODULE_idmap_hash"; then
DEST=$MODULE_idmap_hash
-@@ -82049,12 +34836,10 @@
+@@ -82043,12 +34833,10 @@
if test x"$DEST" = xSHARED; then
@@ -87981,7 +87972,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_hash"
-@@ -82065,16 +34850,16 @@
+@@ -82059,16 +34847,16 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_HASH_OBJ)"
@@ -88001,7 +87992,7 @@
$as_echo_n "checking how to build idmap_adex... " >&6; }
if test "$MODULE_idmap_adex"; then
DEST=$MODULE_idmap_adex
-@@ -82086,12 +34871,10 @@
+@@ -82080,12 +34868,10 @@
if test x"$DEST" = xSHARED; then
@@ -88016,7 +88007,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules idmap_adex"
-@@ -82102,11 +34885,11 @@
+@@ -82096,11 +34882,11 @@
IDMAP_STATIC="$IDMAP_STATIC \$(IDMAP_ADEX_OBJ)"
@@ -88030,7 +88021,7 @@
$as_echo "not" >&6; }
fi
-@@ -82127,7 +34910,7 @@
+@@ -82121,7 +34907,7 @@
@@ -88039,7 +88030,7 @@
$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 +34922,10 @@
+@@ -82133,12 +34919,10 @@
if test x"$DEST" = xSHARED; then
@@ -88054,7 +88045,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules nss_info_template"
-@@ -82155,11 +34936,11 @@
+@@ -82149,11 +34933,11 @@
NSS_INFO_STATIC="$NSS_INFO_STATIC winbindd/nss_info_template.o"
@@ -88068,7 +88059,7 @@
$as_echo "not" >&6; }
fi
-@@ -82180,7 +34961,7 @@
+@@ -82174,7 +34958,7 @@
@@ -88077,7 +88068,7 @@
$as_echo_n "checking how to build charset_weird... " >&6; }
if test "$MODULE_charset_weird"; then
DEST=$MODULE_charset_weird
-@@ -82192,12 +34973,10 @@
+@@ -82186,12 +34970,10 @@
if test x"$DEST" = xSHARED; then
@@ -88092,7 +88083,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_weird"
-@@ -82208,16 +34987,16 @@
+@@ -82202,16 +34984,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/weird.o"
@@ -88112,7 +88103,7 @@
$as_echo_n "checking how to build charset_CP850... " >&6; }
if test "$MODULE_charset_CP850"; then
DEST=$MODULE_charset_CP850
-@@ -82229,12 +35008,10 @@
+@@ -82223,12 +35005,10 @@
if test x"$DEST" = xSHARED; then
@@ -88127,7 +88118,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP850"
-@@ -82245,16 +35022,16 @@
+@@ -82239,16 +35019,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP850.o"
@@ -88147,7 +88138,7 @@
$as_echo_n "checking how to build charset_CP437... " >&6; }
if test "$MODULE_charset_CP437"; then
DEST=$MODULE_charset_CP437
-@@ -82266,12 +35043,10 @@
+@@ -82260,12 +35040,10 @@
if test x"$DEST" = xSHARED; then
@@ -88162,7 +88153,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_CP437"
-@@ -82282,16 +35057,16 @@
+@@ -82276,16 +35054,16 @@
CHARSET_STATIC="$CHARSET_STATIC modules/CP437.o"
@@ -88182,7 +88173,7 @@
$as_echo_n "checking how to build charset_macosxfs... " >&6; }
if test "$MODULE_charset_macosxfs"; then
DEST=$MODULE_charset_macosxfs
-@@ -82303,12 +35078,10 @@
+@@ -82297,12 +35075,10 @@
if test x"$DEST" = xSHARED; then
@@ -88197,7 +88188,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules charset_macosxfs"
-@@ -82319,11 +35092,11 @@
+@@ -82313,11 +35089,11 @@
CHARSET_STATIC="$CHARSET_STATIC modules/charset_macosxfs.o"
@@ -88211,7 +88202,7 @@
$as_echo "not" >&6; }
fi
-@@ -82344,7 +35117,7 @@
+@@ -82338,7 +35114,7 @@
@@ -88220,7 +88211,7 @@
$as_echo_n "checking how to build auth_sam... " >&6; }
if test "$MODULE_auth_sam"; then
DEST=$MODULE_auth_sam
-@@ -82356,12 +35129,10 @@
+@@ -82350,12 +35126,10 @@
if test x"$DEST" = xSHARED; then
@@ -88235,7 +88226,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_sam"
-@@ -82372,16 +35143,16 @@
+@@ -82366,16 +35140,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SAM_OBJ)"
@@ -88255,7 +88246,7 @@
$as_echo_n "checking how to build auth_unix... " >&6; }
if test "$MODULE_auth_unix"; then
DEST=$MODULE_auth_unix
-@@ -82393,12 +35164,10 @@
+@@ -82387,12 +35161,10 @@
if test x"$DEST" = xSHARED; then
@@ -88270,7 +88261,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_unix"
-@@ -82409,16 +35178,16 @@
+@@ -82403,16 +35175,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_UNIX_OBJ)"
@@ -88290,7 +88281,7 @@
$as_echo_n "checking how to build auth_winbind... " >&6; }
if test "$MODULE_auth_winbind"; then
DEST=$MODULE_auth_winbind
-@@ -82430,12 +35199,10 @@
+@@ -82424,12 +35196,10 @@
if test x"$DEST" = xSHARED; then
@@ -88305,7 +88296,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_winbind"
-@@ -82446,16 +35213,16 @@
+@@ -82440,16 +35210,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WINBIND_OBJ)"
@@ -88325,7 +88316,7 @@
$as_echo_n "checking how to build auth_wbc... " >&6; }
if test "$MODULE_auth_wbc"; then
DEST=$MODULE_auth_wbc
-@@ -82467,12 +35234,10 @@
+@@ -82461,12 +35231,10 @@
if test x"$DEST" = xSHARED; then
@@ -88340,7 +88331,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_wbc"
-@@ -82483,16 +35248,16 @@
+@@ -82477,16 +35245,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_WBC_OBJ)"
@@ -88360,7 +88351,7 @@
$as_echo_n "checking how to build auth_server... " >&6; }
if test "$MODULE_auth_server"; then
DEST=$MODULE_auth_server
-@@ -82504,12 +35269,10 @@
+@@ -82498,12 +35266,10 @@
if test x"$DEST" = xSHARED; then
@@ -88375,7 +88366,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_server"
-@@ -82520,16 +35283,16 @@
+@@ -82514,16 +35280,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SERVER_OBJ)"
@@ -88395,7 +88386,7 @@
$as_echo_n "checking how to build auth_domain... " >&6; }
if test "$MODULE_auth_domain"; then
DEST=$MODULE_auth_domain
-@@ -82541,12 +35304,10 @@
+@@ -82535,12 +35301,10 @@
if test x"$DEST" = xSHARED; then
@@ -88410,7 +88401,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_domain"
-@@ -82557,16 +35318,16 @@
+@@ -82551,16 +35315,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_DOMAIN_OBJ)"
@@ -88430,7 +88421,7 @@
$as_echo_n "checking how to build auth_builtin... " >&6; }
if test "$MODULE_auth_builtin"; then
DEST=$MODULE_auth_builtin
-@@ -82578,12 +35339,10 @@
+@@ -82572,12 +35336,10 @@
if test x"$DEST" = xSHARED; then
@@ -88445,7 +88436,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_builtin"
-@@ -82594,16 +35353,16 @@
+@@ -82588,16 +35350,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_BUILTIN_OBJ)"
@@ -88465,7 +88456,7 @@
$as_echo_n "checking how to build auth_script... " >&6; }
if test "$MODULE_auth_script"; then
DEST=$MODULE_auth_script
-@@ -82615,12 +35374,10 @@
+@@ -82609,12 +35371,10 @@
if test x"$DEST" = xSHARED; then
@@ -88480,7 +88471,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_script"
-@@ -82631,16 +35388,16 @@
+@@ -82625,16 +35385,16 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_SCRIPT_OBJ)"
@@ -88500,7 +88491,7 @@
$as_echo_n "checking how to build auth_netlogond... " >&6; }
if test "$MODULE_auth_netlogond"; then
DEST=$MODULE_auth_netlogond
-@@ -82652,12 +35409,10 @@
+@@ -82646,12 +35406,10 @@
if test x"$DEST" = xSHARED; then
@@ -88515,7 +88506,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules auth_netlogond"
-@@ -82668,11 +35423,11 @@
+@@ -82662,11 +35420,11 @@
AUTH_STATIC="$AUTH_STATIC \$(AUTH_NETLOGOND_OBJ)"
@@ -88529,7 +88520,7 @@
$as_echo "not" >&6; }
fi
-@@ -82693,7 +35448,7 @@
+@@ -82687,7 +35445,7 @@
@@ -88538,7 +88529,7 @@
$as_echo_n "checking how to build vfs_default... " >&6; }
if test "$MODULE_vfs_default"; then
DEST=$MODULE_vfs_default
-@@ -82705,12 +35460,10 @@
+@@ -82699,12 +35457,10 @@
if test x"$DEST" = xSHARED; then
@@ -88553,7 +88544,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default"
-@@ -82721,16 +35474,16 @@
+@@ -82715,16 +35471,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_OBJ)"
@@ -88573,7 +88564,7 @@
$as_echo_n "checking how to build vfs_recycle... " >&6; }
if test "$MODULE_vfs_recycle"; then
DEST=$MODULE_vfs_recycle
-@@ -82742,12 +35495,10 @@
+@@ -82736,12 +35492,10 @@
if test x"$DEST" = xSHARED; then
@@ -88588,7 +88579,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_recycle"
-@@ -82758,16 +35509,16 @@
+@@ -82752,16 +35506,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_RECYCLE_OBJ)"
@@ -88608,7 +88599,7 @@
$as_echo_n "checking how to build vfs_audit... " >&6; }
if test "$MODULE_vfs_audit"; then
DEST=$MODULE_vfs_audit
-@@ -82779,12 +35530,10 @@
+@@ -82773,12 +35527,10 @@
if test x"$DEST" = xSHARED; then
@@ -88623,7 +88614,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_audit"
-@@ -82795,16 +35544,16 @@
+@@ -82789,16 +35541,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AUDIT_OBJ)"
@@ -88643,7 +88634,7 @@
$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 +35565,10 @@
+@@ -82810,12 +35562,10 @@
if test x"$DEST" = xSHARED; then
@@ -88658,7 +88649,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_extd_audit"
-@@ -82832,16 +35579,16 @@
+@@ -82826,16 +35576,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXTD_AUDIT_OBJ)"
@@ -88678,7 +88669,7 @@
$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 +35600,10 @@
+@@ -82847,12 +35597,10 @@
if test x"$DEST" = xSHARED; then
@@ -88693,7 +88684,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_full_audit"
-@@ -82869,16 +35614,16 @@
+@@ -82863,16 +35611,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FULL_AUDIT_OBJ)"
@@ -88713,7 +88704,7 @@
$as_echo_n "checking how to build vfs_netatalk... " >&6; }
if test "$MODULE_vfs_netatalk"; then
DEST=$MODULE_vfs_netatalk
-@@ -82890,12 +35635,10 @@
+@@ -82884,12 +35632,10 @@
if test x"$DEST" = xSHARED; then
@@ -88728,7 +88719,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_netatalk"
-@@ -82906,16 +35649,16 @@
+@@ -82900,16 +35646,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NETATALK_OBJ)"
@@ -88748,7 +88739,7 @@
$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 +35670,10 @@
+@@ -82921,12 +35667,10 @@
if test x"$DEST" = xSHARED; then
@@ -88763,7 +88754,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fake_perms"
-@@ -82943,16 +35684,16 @@
+@@ -82937,16 +35681,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FAKE_PERMS_OBJ)"
@@ -88783,7 +88774,7 @@
$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 +35705,10 @@
+@@ -82958,12 +35702,10 @@
if test x"$DEST" = xSHARED; then
@@ -88798,7 +88789,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_default_quota"
-@@ -82980,16 +35719,16 @@
+@@ -82974,16 +35716,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DEFAULT_QUOTA_OBJ)"
@@ -88818,7 +88809,7 @@
$as_echo_n "checking how to build vfs_readonly... " >&6; }
if test "$MODULE_vfs_readonly"; then
DEST=$MODULE_vfs_readonly
-@@ -83001,12 +35740,10 @@
+@@ -82995,12 +35737,10 @@
if test x"$DEST" = xSHARED; then
@@ -88833,7 +88824,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readonly"
-@@ -83017,16 +35754,16 @@
+@@ -83011,16 +35751,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READONLY_OBJ)"
@@ -88853,7 +88844,7 @@
$as_echo_n "checking how to build vfs_cap... " >&6; }
if test "$MODULE_vfs_cap"; then
DEST=$MODULE_vfs_cap
-@@ -83038,12 +35775,10 @@
+@@ -83032,12 +35772,10 @@
if test x"$DEST" = xSHARED; then
@@ -88868,7 +88859,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cap"
-@@ -83054,16 +35789,16 @@
+@@ -83048,16 +35786,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CAP_OBJ)"
@@ -88888,7 +88879,7 @@
$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 +35810,10 @@
+@@ -83069,12 +35807,10 @@
if test x"$DEST" = xSHARED; then
@@ -88903,7 +88894,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_expand_msdfs"
-@@ -83091,16 +35824,16 @@
+@@ -83085,16 +35821,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_EXPAND_MSDFS_OBJ)"
@@ -88923,7 +88914,7 @@
$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 +35845,10 @@
+@@ -83106,12 +35842,10 @@
if test x"$DEST" = xSHARED; then
@@ -88938,7 +88929,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy"
-@@ -83128,16 +35859,16 @@
+@@ -83122,16 +35856,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY_OBJ)"
@@ -88958,7 +88949,7 @@
$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 +35880,10 @@
+@@ -83143,12 +35877,10 @@
if test x"$DEST" = xSHARED; then
@@ -88973,7 +88964,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_shadow_copy2"
-@@ -83165,16 +35894,16 @@
+@@ -83159,16 +35891,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SHADOW_COPY2_OBJ)"
@@ -88993,7 +88984,7 @@
$as_echo_n "checking how to build vfs_afsacl... " >&6; }
if test "$MODULE_vfs_afsacl"; then
DEST=$MODULE_vfs_afsacl
-@@ -83186,12 +35915,10 @@
+@@ -83180,12 +35912,10 @@
if test x"$DEST" = xSHARED; then
@@ -89008,7 +88999,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_afsacl"
-@@ -83202,16 +35929,16 @@
+@@ -83196,16 +35926,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AFSACL_OBJ)"
@@ -89028,7 +89019,7 @@
$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 +35950,10 @@
+@@ -83217,12 +35947,10 @@
if test x"$DEST" = xSHARED; then
@@ -89043,7 +89034,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_xattr_tdb"
-@@ -83239,16 +35964,16 @@
+@@ -83233,16 +35961,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_XATTR_TDB_OBJ)"
@@ -89063,7 +89054,7 @@
$as_echo_n "checking how to build vfs_posixacl... " >&6; }
if test "$MODULE_vfs_posixacl"; then
DEST=$MODULE_vfs_posixacl
-@@ -83260,12 +35985,10 @@
+@@ -83254,12 +35982,10 @@
if test x"$DEST" = xSHARED; then
@@ -89078,7 +89069,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_posixacl"
-@@ -83276,16 +35999,16 @@
+@@ -83270,16 +35996,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_POSIXACL_OBJ)"
@@ -89098,7 +89089,7 @@
$as_echo_n "checking how to build vfs_aixacl... " >&6; }
if test "$MODULE_vfs_aixacl"; then
DEST=$MODULE_vfs_aixacl
-@@ -83297,12 +36020,10 @@
+@@ -83291,12 +36017,10 @@
if test x"$DEST" = xSHARED; then
@@ -89113,7 +89104,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl"
-@@ -83313,16 +36034,16 @@
+@@ -83307,16 +36031,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL_OBJ)"
@@ -89133,7 +89124,7 @@
$as_echo_n "checking how to build vfs_aixacl2... " >&6; }
if test "$MODULE_vfs_aixacl2"; then
DEST=$MODULE_vfs_aixacl2
-@@ -83334,12 +36055,10 @@
+@@ -83328,12 +36052,10 @@
if test x"$DEST" = xSHARED; then
@@ -89148,7 +89139,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aixacl2"
-@@ -83350,16 +36069,16 @@
+@@ -83344,16 +36066,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIXACL2_OBJ)"
@@ -89168,7 +89159,7 @@
$as_echo_n "checking how to build vfs_solarisacl... " >&6; }
if test "$MODULE_vfs_solarisacl"; then
DEST=$MODULE_vfs_solarisacl
-@@ -83371,12 +36090,10 @@
+@@ -83365,12 +36087,10 @@
if test x"$DEST" = xSHARED; then
@@ -89183,7 +89174,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_solarisacl"
-@@ -83387,16 +36104,16 @@
+@@ -83381,16 +36101,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SOLARISACL_OBJ)"
@@ -89203,7 +89194,7 @@
$as_echo_n "checking how to build vfs_irixacl... " >&6; }
if test "$MODULE_vfs_irixacl"; then
DEST=$MODULE_vfs_irixacl
-@@ -83408,12 +36125,10 @@
+@@ -83402,12 +36122,10 @@
if test x"$DEST" = xSHARED; then
@@ -89218,7 +89209,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_irixacl"
-@@ -83424,16 +36139,16 @@
+@@ -83418,16 +36136,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_IRIXACL_OBJ)"
@@ -89238,7 +89229,7 @@
$as_echo_n "checking how to build vfs_hpuxacl... " >&6; }
if test "$MODULE_vfs_hpuxacl"; then
DEST=$MODULE_vfs_hpuxacl
-@@ -83445,12 +36160,10 @@
+@@ -83439,12 +36157,10 @@
if test x"$DEST" = xSHARED; then
@@ -89253,7 +89244,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_hpuxacl"
-@@ -83461,16 +36174,16 @@
+@@ -83455,16 +36171,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_HPUXACL_OBJ)"
@@ -89273,7 +89264,7 @@
$as_echo_n "checking how to build vfs_tru64acl... " >&6; }
if test "$MODULE_vfs_tru64acl"; then
DEST=$MODULE_vfs_tru64acl
-@@ -83482,12 +36195,10 @@
+@@ -83476,12 +36192,10 @@
if test x"$DEST" = xSHARED; then
@@ -89288,7 +89279,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tru64acl"
-@@ -83498,16 +36209,16 @@
+@@ -83492,16 +36206,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TRU64ACL_OBJ)"
@@ -89308,7 +89299,7 @@
$as_echo_n "checking how to build vfs_catia... " >&6; }
if test "$MODULE_vfs_catia"; then
DEST=$MODULE_vfs_catia
-@@ -83519,12 +36230,10 @@
+@@ -83513,12 +36227,10 @@
if test x"$DEST" = xSHARED; then
@@ -89323,7 +89314,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_catia"
-@@ -83535,16 +36244,16 @@
+@@ -83529,16 +36241,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CATIA_OBJ)"
@@ -89343,7 +89334,7 @@
$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 +36265,10 @@
+@@ -83550,12 +36262,10 @@
if test x"$DEST" = xSHARED; then
@@ -89358,7 +89349,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_xattr"
-@@ -83572,16 +36279,16 @@
+@@ -83566,16 +36276,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_XATTR_OBJ)"
@@ -89378,7 +89369,7 @@
$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 +36300,10 @@
+@@ -83587,12 +36297,10 @@
if test x"$DEST" = xSHARED; then
@@ -89393,7 +89384,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_streams_depot"
-@@ -83609,16 +36314,16 @@
+@@ -83603,16 +36311,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_STREAMS_DEPOT_OBJ)"
@@ -89413,7 +89404,7 @@
$as_echo_n "checking how to build vfs_cacheprime... " >&6; }
if test "$MODULE_vfs_cacheprime"; then
DEST=$MODULE_vfs_cacheprime
-@@ -83630,12 +36335,10 @@
+@@ -83624,12 +36332,10 @@
if test x"$DEST" = xSHARED; then
@@ -89428,7 +89419,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_cacheprime"
-@@ -83646,16 +36349,16 @@
+@@ -83640,16 +36346,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_CACHEPRIME_OBJ)"
@@ -89448,7 +89439,7 @@
$as_echo_n "checking how to build vfs_prealloc... " >&6; }
if test "$MODULE_vfs_prealloc"; then
DEST=$MODULE_vfs_prealloc
-@@ -83667,12 +36370,10 @@
+@@ -83661,12 +36367,10 @@
if test x"$DEST" = xSHARED; then
@@ -89463,7 +89454,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_prealloc"
-@@ -83683,16 +36384,16 @@
+@@ -83677,16 +36381,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREALLOC_OBJ)"
@@ -89483,7 +89474,7 @@
$as_echo_n "checking how to build vfs_commit... " >&6; }
if test "$MODULE_vfs_commit"; then
DEST=$MODULE_vfs_commit
-@@ -83704,12 +36405,10 @@
+@@ -83698,12 +36402,10 @@
if test x"$DEST" = xSHARED; then
@@ -89498,7 +89489,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_commit"
-@@ -83720,16 +36419,16 @@
+@@ -83714,16 +36416,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_COMMIT_OBJ)"
@@ -89518,7 +89509,7 @@
$as_echo_n "checking how to build vfs_gpfs... " >&6; }
if test "$MODULE_vfs_gpfs"; then
DEST=$MODULE_vfs_gpfs
-@@ -83741,12 +36440,10 @@
+@@ -83735,12 +36437,10 @@
if test x"$DEST" = xSHARED; then
@@ -89533,7 +89524,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_gpfs"
-@@ -83757,16 +36454,16 @@
+@@ -83751,16 +36451,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_GPFS_OBJ)"
@@ -89553,7 +89544,7 @@
$as_echo_n "checking how to build vfs_readahead... " >&6; }
if test "$MODULE_vfs_readahead"; then
DEST=$MODULE_vfs_readahead
-@@ -83778,12 +36475,10 @@
+@@ -83772,12 +36472,10 @@
if test x"$DEST" = xSHARED; then
@@ -89568,7 +89559,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_readahead"
-@@ -83794,16 +36489,16 @@
+@@ -83788,16 +36486,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_READAHEAD_OBJ)"
@@ -89588,7 +89579,7 @@
$as_echo_n "checking how to build vfs_tsmsm... " >&6; }
if test "$MODULE_vfs_tsmsm"; then
DEST=$MODULE_vfs_tsmsm
-@@ -83815,12 +36510,10 @@
+@@ -83809,12 +36507,10 @@
if test x"$DEST" = xSHARED; then
@@ -89603,7 +89594,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_tsmsm"
-@@ -83831,16 +36524,16 @@
+@@ -83825,16 +36521,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_TSMSM_OBJ)"
@@ -89623,7 +89614,7 @@
$as_echo_n "checking how to build vfs_fileid... " >&6; }
if test "$MODULE_vfs_fileid"; then
DEST=$MODULE_vfs_fileid
-@@ -83852,12 +36545,10 @@
+@@ -83846,12 +36542,10 @@
if test x"$DEST" = xSHARED; then
@@ -89638,7 +89629,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_fileid"
-@@ -83868,16 +36559,16 @@
+@@ -83862,16 +36556,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_FILEID_OBJ)"
@@ -89658,7 +89649,7 @@
$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 +36580,10 @@
+@@ -83883,12 +36577,10 @@
if test x"$DEST" = xSHARED; then
@@ -89673,7 +89664,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_aio_fork"
-@@ -83905,16 +36594,16 @@
+@@ -83899,16 +36591,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_AIO_FORK_OBJ)"
@@ -89693,7 +89684,7 @@
$as_echo_n "checking how to build vfs_preopen... " >&6; }
if test "$MODULE_vfs_preopen"; then
DEST=$MODULE_vfs_preopen
-@@ -83926,12 +36615,10 @@
+@@ -83920,12 +36612,10 @@
if test x"$DEST" = xSHARED; then
@@ -89708,7 +89699,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_preopen"
-@@ -83942,16 +36629,16 @@
+@@ -83936,16 +36626,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_PREOPEN_OBJ)"
@@ -89728,7 +89719,7 @@
$as_echo_n "checking how to build vfs_syncops... " >&6; }
if test "$MODULE_vfs_syncops"; then
DEST=$MODULE_vfs_syncops
-@@ -83963,12 +36650,10 @@
+@@ -83957,12 +36647,10 @@
if test x"$DEST" = xSHARED; then
@@ -89743,7 +89734,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_syncops"
-@@ -83979,16 +36664,16 @@
+@@ -83973,16 +36661,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SYNCOPS_OBJ)"
@@ -89763,7 +89754,7 @@
$as_echo_n "checking how to build vfs_zfsacl... " >&6; }
if test "$MODULE_vfs_zfsacl"; then
DEST=$MODULE_vfs_zfsacl
-@@ -84000,12 +36685,10 @@
+@@ -83994,12 +36682,10 @@
if test x"$DEST" = xSHARED; then
@@ -89778,7 +89769,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_zfsacl"
-@@ -84016,16 +36699,16 @@
+@@ -84010,16 +36696,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ZFSACL_OBJ)"
@@ -89798,7 +89789,7 @@
$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 +36720,10 @@
+@@ -84031,12 +36717,10 @@
if test x"$DEST" = xSHARED; then
@@ -89813,7 +89804,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_notify_fam"
-@@ -84053,16 +36734,16 @@
+@@ -84047,16 +36731,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_NOTIFY_FAM_OBJ)"
@@ -89833,7 +89824,7 @@
$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 +36755,10 @@
+@@ -84068,12 +36752,10 @@
if test x"$DEST" = xSHARED; then
@@ -89848,7 +89839,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_xattr"
-@@ -84090,16 +36769,16 @@
+@@ -84084,16 +36766,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_XATTR_OBJ)"
@@ -89868,7 +89859,7 @@
$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 +36790,10 @@
+@@ -84105,12 +36787,10 @@
if test x"$DEST" = xSHARED; then
@@ -89883,7 +89874,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_acl_tdb"
-@@ -84127,16 +36804,16 @@
+@@ -84121,16 +36801,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ACL_TDB_OBJ)"
@@ -89903,7 +89894,7 @@
$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 +36825,10 @@
+@@ -84142,12 +36822,10 @@
if test x"$DEST" = xSHARED; then
@@ -89918,7 +89909,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_smb_traffic_analyzer"
-@@ -84164,16 +36839,16 @@
+@@ -84158,16 +36836,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ)"
@@ -89938,7 +89929,7 @@
$as_echo_n "checking how to build vfs_onefs... " >&6; }
if test "$MODULE_vfs_onefs"; then
DEST=$MODULE_vfs_onefs
-@@ -84185,12 +36860,10 @@
+@@ -84179,12 +36857,10 @@
if test x"$DEST" = xSHARED; then
@@ -89953,7 +89944,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs"
-@@ -84201,16 +36874,16 @@
+@@ -84195,16 +36871,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS)"
@@ -89973,7 +89964,7 @@
$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 +36895,10 @@
+@@ -84216,12 +36892,10 @@
if test x"$DEST" = xSHARED; then
@@ -89988,7 +89979,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_onefs_shadow_copy"
-@@ -84238,16 +36909,16 @@
+@@ -84232,16 +36906,16 @@
VFS_STATIC="$VFS_STATIC \$(VFS_ONEFS_SHADOW_COPY)"
@@ -90008,7 +89999,7 @@
$as_echo_n "checking how to build vfs_dirsort... " >&6; }
if test "$MODULE_vfs_dirsort"; then
DEST=$MODULE_vfs_dirsort
-@@ -84259,12 +36930,10 @@
+@@ -84253,12 +36927,10 @@
if test x"$DEST" = xSHARED; then
@@ -90023,7 +90014,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules vfs_dirsort"
-@@ -84275,11 +36944,11 @@
+@@ -84269,11 +36941,11 @@
VFS_STATIC="$VFS_STATIC \$(VFS_DIRSORT_OBJ)"
@@ -90037,7 +90028,7 @@
$as_echo "not" >&6; }
fi
-@@ -84301,7 +36970,7 @@
+@@ -84295,7 +36967,7 @@
@@ -90046,7 +90037,7 @@
$as_echo_n "checking how to build perfcount_onefs... " >&6; }
if test "$MODULE_perfcount_onefs"; then
DEST=$MODULE_perfcount_onefs
-@@ -84313,12 +36982,10 @@
+@@ -84307,12 +36979,10 @@
if test x"$DEST" = xSHARED; then
@@ -90061,7 +90052,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_onefs"
-@@ -84329,16 +36996,16 @@
+@@ -84323,16 +36993,16 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_ONEFS)"
@@ -90081,7 +90072,7 @@
$as_echo_n "checking how to build perfcount_test... " >&6; }
if test "$MODULE_perfcount_test"; then
DEST=$MODULE_perfcount_test
-@@ -84350,12 +37017,10 @@
+@@ -84344,12 +37014,10 @@
if test x"$DEST" = xSHARED; then
@@ -90096,7 +90087,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules perfcount_test"
-@@ -84366,11 +37031,11 @@
+@@ -84360,11 +37028,11 @@
PERFCOUNT_STATIC="$PERFCOUNT_STATIC \$(PERFCOUNT_TEST)"
@@ -90110,7 +90101,7 @@
$as_echo "not" >&6; }
fi
-@@ -84391,7 +37056,7 @@
+@@ -84385,7 +37053,7 @@
@@ -90119,7 +90110,7 @@
$as_echo_n "checking how to build gpext_registry... " >&6; }
if test "$MODULE_gpext_registry"; then
DEST=$MODULE_gpext_registry
-@@ -84403,12 +37068,10 @@
+@@ -84397,12 +37065,10 @@
if test x"$DEST" = xSHARED; then
@@ -90134,7 +90125,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_registry"
-@@ -84419,16 +37082,16 @@
+@@ -84413,16 +37079,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/registry.o"
@@ -90154,7 +90145,7 @@
$as_echo_n "checking how to build gpext_scripts... " >&6; }
if test "$MODULE_gpext_scripts"; then
DEST=$MODULE_gpext_scripts
-@@ -84440,12 +37103,10 @@
+@@ -84434,12 +37100,10 @@
if test x"$DEST" = xSHARED; then
@@ -90169,7 +90160,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_scripts"
-@@ -84456,16 +37117,16 @@
+@@ -84450,16 +37114,16 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/scripts.o"
@@ -90189,7 +90180,7 @@
$as_echo_n "checking how to build gpext_security... " >&6; }
if test "$MODULE_gpext_security"; then
DEST=$MODULE_gpext_security
-@@ -84477,12 +37138,10 @@
+@@ -84471,12 +37135,10 @@
if test x"$DEST" = xSHARED; then
@@ -90204,7 +90195,7 @@
$as_echo "shared" >&6; }
string_shared_modules="$string_shared_modules gpext_security"
-@@ -84493,11 +37152,11 @@
+@@ -84487,11 +37149,11 @@
GPEXT_STATIC="$GPEXT_STATIC libgpo/gpext/security.o"
@@ -90218,7 +90209,7 @@
$as_echo "not" >&6; }
fi
-@@ -84533,18 +37192,16 @@
+@@ -84527,18 +37189,16 @@
#################################################
# If run from the build farm, enable NASTY hacks
#################################################
@@ -90241,7 +90232,7 @@
$as_echo "no" >&6; }
fi
-@@ -84561,11 +37218,11 @@
+@@ -84555,11 +37215,11 @@
rt_signal_lease_works=yes
rt_signal_aio_works=yes
@@ -90256,7 +90247,7 @@
$as_echo "cross" >&6; }
# cross compiling, I hope you know what you are doing
-@@ -84573,11 +37230,7 @@
+@@ -84567,11 +37227,7 @@
else
@@ -90269,7 +90260,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -84633,41 +37286,16 @@
+@@ -84627,41 +37283,16 @@
}
_ACEOF
@@ -90315,7 +90306,7 @@
/* end confdefs.h. */
int
-@@ -84678,61 +37306,31 @@
+@@ -84672,61 +37303,31 @@
return 0;
}
_ACEOF
@@ -90384,7 +90375,7 @@
$as_echo "no" >&6; }
case "$ac_status" in
1|11|101|111) rt_signal_lease_ok=no ;;
-@@ -84746,13 +37344,9 @@
+@@ -84740,13 +37341,9 @@
# no RT_SIGNAL bug, we are golden
@@ -90400,7 +90391,7 @@
/* end confdefs.h. */
int
-@@ -84763,65 +37357,39 @@
+@@ -84757,65 +37354,39 @@
return 0;
}
_ACEOF
@@ -90475,7 +90466,7 @@
enableval=$enable_merged_build; enable_merged_build=$enableval
else
enable_merged_build=auto
-@@ -84830,9 +37398,7 @@
+@@ -84824,9 +37395,7 @@
if test x"$enable_merged_build" = x"yes" -a \
x"$merged_build_possible" = x"no" ; then
@@ -90486,7 +90477,7 @@
fi
-@@ -84852,9 +37418,9 @@
+@@ -84846,9 +37415,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
@@ -90498,7 +90489,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -84867,14 +37433,14 @@
+@@ -84861,14 +37430,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90516,7 +90507,7 @@
IFS=$as_save_IFS
;;
-@@ -84882,17 +37448,17 @@
+@@ -84876,17 +37445,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -90537,7 +90528,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -84903,9 +37469,9 @@
+@@ -84897,9 +37466,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
@@ -90549,7 +90540,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84918,14 +37484,14 @@
+@@ -84912,14 +37481,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90567,7 +90558,7 @@
IFS=$as_save_IFS
;;
-@@ -84933,10 +37499,10 @@
+@@ -84927,10 +37496,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90580,7 +90571,7 @@
$as_echo "no" >&6; }
fi
-@@ -84947,9 +37513,9 @@
+@@ -84941,9 +37510,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
@@ -90592,7 +90583,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -84962,14 +37528,14 @@
+@@ -84956,14 +37525,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90610,7 +90601,7 @@
IFS=$as_save_IFS
;;
-@@ -84977,10 +37543,10 @@
+@@ -84971,10 +37540,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -90623,7 +90614,7 @@
$as_echo "no" >&6; }
fi
-@@ -84988,7 +37554,7 @@
+@@ -84982,7 +37551,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -90632,7 +90623,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -84998,11 +37564,7 @@
+@@ -84992,11 +37561,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90645,7 +90636,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85018,42 +37580,15 @@
+@@ -85012,42 +37577,15 @@
return 0;
}
_ACEOF
@@ -90691,7 +90682,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85065,11 +37600,7 @@
+@@ -85059,11 +37597,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90704,7 +90695,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85085,42 +37616,15 @@
+@@ -85079,42 +37613,15 @@
return 0;
}
_ACEOF
@@ -90750,7 +90741,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85135,11 +37639,7 @@
+@@ -85129,11 +37636,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -90763,7 +90754,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85155,42 +37655,15 @@
+@@ -85149,42 +37652,15 @@
return 0;
}
_ACEOF
@@ -90809,7 +90800,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85202,11 +37675,7 @@
+@@ -85196,11 +37672,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -90822,7 +90813,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85222,42 +37691,15 @@
+@@ -85216,42 +37688,15 @@
return 0;
}
_ACEOF
@@ -90868,7 +90859,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85287,11 +37729,7 @@
+@@ -85281,11 +37726,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -90881,7 +90872,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85307,64 +37745,37 @@
+@@ -85301,64 +37742,37 @@
return 0;
}
_ACEOF
@@ -90954,7 +90945,7 @@
$as_echo "$merged_build_possible" >&6; }
# Enable merged build automatically if possible, when in developer mode
-@@ -85417,9 +37828,9 @@
+@@ -85411,9 +37825,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
@@ -90966,7 +90957,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -85432,14 +37843,14 @@
+@@ -85426,14 +37840,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -90984,7 +90975,7 @@
IFS=$as_save_IFS
;;
-@@ -85447,17 +37858,17 @@
+@@ -85441,17 +37855,17 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -91005,7 +90996,7 @@
$as_echo "$as_me: WARNING: No python found" >&2;}
fi
-@@ -85468,9 +37879,9 @@
+@@ -85462,9 +37876,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
@@ -91017,7 +91008,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85483,14 +37894,14 @@
+@@ -85477,14 +37891,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -91035,7 +91026,7 @@
IFS=$as_save_IFS
;;
-@@ -85498,10 +37909,10 @@
+@@ -85492,10 +37906,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -91048,7 +91039,7 @@
$as_echo "no" >&6; }
fi
-@@ -85512,9 +37923,9 @@
+@@ -85506,9 +37920,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
@@ -91060,7 +91051,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON_CONFIG in
-@@ -85527,14 +37938,14 @@
+@@ -85521,14 +37935,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -91078,7 +91069,7 @@
IFS=$as_save_IFS
;;
-@@ -85542,10 +37953,10 @@
+@@ -85536,10 +37950,10 @@
fi
PYTHON_CONFIG=$ac_cv_path_PYTHON_CONFIG
if test -n "$PYTHON_CONFIG"; then
@@ -91091,7 +91082,7 @@
$as_echo "no" >&6; }
fi
-@@ -85553,7 +37964,7 @@
+@@ -85547,7 +37961,7 @@
fi
if test -z "$PYTHON_CONFIG"; then
@@ -91100,7 +91091,7 @@
$as_echo "$as_me: WARNING: No python-config found" >&2;}
else
-@@ -85563,11 +37974,7 @@
+@@ -85557,11 +37971,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -91113,7 +91104,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85583,42 +37990,15 @@
+@@ -85577,42 +37987,15 @@
return 0;
}
_ACEOF
@@ -91159,7 +91150,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85630,11 +38010,7 @@
+@@ -85624,11 +38007,7 @@
LIBS="$LIBS `$PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -91172,7 +91163,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85650,42 +38026,15 @@
+@@ -85644,42 +38023,15 @@
return 0;
}
_ACEOF
@@ -91218,7 +91209,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85700,11 +38049,7 @@
+@@ -85694,11 +38046,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --includes`"
@@ -91231,7 +91222,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85720,42 +38065,15 @@
+@@ -85714,42 +38062,15 @@
return 0;
}
_ACEOF
@@ -91277,7 +91268,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85767,11 +38085,7 @@
+@@ -85761,11 +38082,7 @@
LIBS="$LIBS `echo -n -L${base}/lib " "; $PYTHON_CONFIG --ldflags`"
CFLAGS="$CFLAGS `$PYTHON_CONFIG --cflags`"
@@ -91290,7 +91281,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85787,42 +38101,15 @@
+@@ -85781,42 +38098,15 @@
return 0;
}
_ACEOF
@@ -91336,7 +91327,7 @@
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
fi
-@@ -85852,11 +38139,7 @@
+@@ -85846,11 +38136,7 @@
LIBS="$LIBS $DISTUTILS_LDFLAGS"
CFLAGS="$CFLAGS $DISTUTILS_CFLAGS"
@@ -91349,7 +91340,7 @@
/* end confdefs.h. */
/* we have our own configure tests */
-@@ -85872,52 +38155,25 @@
+@@ -85866,52 +38152,25 @@
return 0;
}
_ACEOF
@@ -91407,7 +91398,7 @@
$as_echo "yes" >&6; }
-@@ -85945,20 +38201,18 @@
+@@ -85939,20 +38198,18 @@
else
@@ -91432,7 +91423,7 @@
$as_echo "$pythondir" >&6; }
-@@ -85981,545 +38235,125 @@
+@@ -85975,545 +38232,125 @@
@@ -92058,7 +92049,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86537,63 +38371,32 @@
+@@ -86531,63 +38368,32 @@
return 0;
}
_ACEOF
@@ -92133,7 +92124,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -86611,43 +38414,18 @@
+@@ -86605,43 +38411,18 @@
return 0;
}
_ACEOF
@@ -92183,7 +92174,7 @@
TERMLIBS="-lreadline $TERMLIBS"
EXTERNAL_READLINE=yes
break
-@@ -86661,11 +38439,11 @@
+@@ -86655,11 +38436,11 @@
;;
no)
@@ -92197,7 +92188,7 @@
$as_echo "yes" >&6; }
# Needed for AC_CHECK_HEADERS and AC_CHECK_LIB to look at
-@@ -86677,151 +38455,12 @@
+@@ -86671,151 +38452,12 @@
LDFLAGS="-L$with_readline/lib $LDFLAGS"
CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -92355,7 +92346,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -86830,151 +38469,12 @@
+@@ -86824,151 +38466,12 @@
done
@@ -92512,7 +92503,7 @@
_ACEOF
fi
-@@ -86982,168 +38482,26 @@
+@@ -86976,168 +38479,26 @@
done
@@ -92690,7 +92681,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87161,63 +38519,32 @@
+@@ -87155,63 +38516,32 @@
return 0;
}
_ACEOF
@@ -92765,7 +92756,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87235,43 +38562,18 @@
+@@ -87229,43 +38559,18 @@
return 0;
}
_ACEOF
@@ -92815,7 +92806,7 @@
TERMLDFLAGS="-L$with_readline/lib"
TERMCPPFLAGS="-I$with_readline/include"
LDFLAGS="-L$with_readline/lib $LDFLAGS"
-@@ -87291,7 +38593,7 @@
+@@ -87285,7 +38590,7 @@
;;
esac
else
@@ -92824,7 +92815,7 @@
$as_echo "no" >&6; }
fi
-@@ -87300,18 +38602,14 @@
+@@ -87294,18 +38599,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.
@@ -92846,7 +92837,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87329,134 +38627,45 @@
+@@ -87323,134 +38624,45 @@
return 0;
}
_ACEOF
@@ -92997,7 +92988,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -87469,65 +38678,36 @@
+@@ -87463,65 +38675,36 @@
int
main ()
{
@@ -93078,7 +93069,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -87582,7 +38762,7 @@
+@@ -87576,7 +38759,7 @@
###################################
"
@@ -93087,7 +93078,7 @@
$as_echo "no" >&6; }
fi
-@@ -87591,102 +38771,9 @@
+@@ -87585,102 +38768,9 @@
@@ -93192,7 +93183,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87695,102 +38782,9 @@
+@@ -87689,102 +38779,9 @@
fi
@@ -93297,7 +93288,7 @@
else
cat >>confdefs.h <<_ACEOF
-@@ -87800,151 +38794,12 @@
+@@ -87794,151 +38791,12 @@
fi
@@ -93453,7 +93444,7 @@
_ACEOF
else
-@@ -87954,30 +38809,6 @@
+@@ -87948,30 +38806,6 @@
done
@@ -93484,7 +93475,7 @@
for ac_header in \
crypt.h \
curses.h \
-@@ -88004,147 +38835,11 @@
+@@ -87998,147 +38832,11 @@
netinet6/in6.h \
libintl.h
@@ -93637,7 +93628,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -88154,42 +38849,6 @@
+@@ -88148,42 +38846,6 @@
done
@@ -93680,7 +93671,7 @@
for ac_func in \
atexit \
cgetent \
-@@ -88228,98 +38887,11 @@
+@@ -88222,98 +38884,11 @@
freehostent \
writev
@@ -93784,7 +93775,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -88330,17 +38902,13 @@
+@@ -88324,17 +38899,13 @@
@@ -93805,7 +93796,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -88353,140 +38921,25 @@
+@@ -88347,140 +38918,25 @@
return 0;
}
_ACEOF
@@ -93955,7 +93946,7 @@
_ACEOF
fi
-@@ -88502,11 +38955,11 @@
+@@ -88496,11 +38952,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -93969,7 +93960,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -88516,17 +38969,13 @@
+@@ -88510,17 +38966,13 @@
@@ -93990,7 +93981,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_BSWAP_H
#include <sys/bswap.h>
-@@ -88539,140 +38988,25 @@
+@@ -88533,140 +38985,25 @@
return 0;
}
_ACEOF
@@ -94145,7 +94136,7 @@
_ACEOF
fi
-@@ -88688,11 +39022,11 @@
+@@ -88682,11 +39019,11 @@
#define $ac_tr_func 1
_ACEOF
@@ -94159,7 +94150,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -88703,25 +39037,21 @@
+@@ -88697,25 +39034,21 @@
@@ -94189,7 +94180,7 @@
ac_cv_struct_winsize=yes; break
fi
rm -f conftest*
-@@ -88731,63 +39061,45 @@
+@@ -88725,63 +39058,45 @@
if test "$ac_cv_struct_winsize" = "yes"; then
@@ -94264,7 +94255,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-@@ -88800,35 +39112,14 @@
+@@ -88794,35 +39109,14 @@
return 0;
}
_ACEOF
@@ -94303,7 +94294,7 @@
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
-@@ -88838,9 +39129,7 @@
+@@ -88832,9 +39126,7 @@
if test "$ac_cv_type_signal" = "void" ; then
@@ -94314,7 +94305,7 @@
fi
-@@ -88871,18 +39160,14 @@
+@@ -88865,18 +39157,14 @@
@@ -94336,7 +94327,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -88899,44 +39184,15 @@
+@@ -88893,44 +39181,15 @@
return 0;
}
_ACEOF
@@ -94386,7 +94377,7 @@
/* end confdefs.h. */
extern int h_errno;
int foo(void) { return h_errno; }
-@@ -88948,44 +39204,19 @@
+@@ -88942,44 +39201,19 @@
return 0;
}
_ACEOF
@@ -94436,7 +94427,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -88993,85 +39224,26 @@
+@@ -88987,85 +39221,26 @@
#define HAVE_H_ERRNO 1
_ACEOF
@@ -94528,7 +94519,7 @@
-@@ -89092,17 +39264,12 @@
+@@ -89086,17 +39261,12 @@
@@ -94549,7 +94540,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89120,54 +39287,28 @@
+@@ -89114,54 +39284,28 @@
return 0;
}
_ACEOF
@@ -94611,7 +94602,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBUTIL 1
_ACEOF
-@@ -89184,7 +39325,6 @@
+@@ -89178,7 +39322,6 @@
fi
@@ -94619,7 +94610,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
OPENPTY_ENABLE = YES
"
-@@ -89204,23 +39344,17 @@
+@@ -89198,23 +39341,17 @@
@@ -94646,7 +94637,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -89238,54 +39372,28 @@
+@@ -89232,54 +39369,28 @@
return 0;
}
_ACEOF
@@ -94708,7 +94699,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBINTL 1
_ACEOF
-@@ -89302,7 +39410,6 @@
+@@ -89296,7 +39407,6 @@
fi
@@ -94716,7 +94707,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
INTL_ENABLE = YES
"
-@@ -89326,151 +39433,12 @@
+@@ -89320,151 +39430,12 @@
@@ -94872,7 +94863,7 @@
_ACEOF
fi
-@@ -89478,22 +39446,9 @@
+@@ -89472,22 +39443,9 @@
done
@@ -94897,7 +94888,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -89504,46 +39459,10 @@
+@@ -89498,46 +39456,10 @@
#include <arpa/nameser.h>
#endif
@@ -94947,7 +94938,7 @@
_ACEOF
fi
-@@ -89555,9 +39474,9 @@
+@@ -89549,9 +39471,9 @@
@@ -94959,7 +94950,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89572,11 +39491,7 @@
+@@ -89566,11 +39488,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -94972,7 +94963,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89601,38 +39516,11 @@
+@@ -89595,38 +39513,11 @@
return 0;
}
_ACEOF
@@ -95014,7 +95005,7 @@
done
eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
LIBS="$ac_save_LIBS"
-@@ -89644,102 +39532,12 @@
+@@ -89638,102 +39529,12 @@
eval "ac_res=\$ac_cv_funclib_res_search"
if false; then
@@ -95122,7 +95113,7 @@
_ACEOF
fi
-@@ -89759,13 +39557,13 @@
+@@ -89753,13 +39554,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95138,7 +95129,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -89779,7 +39577,7 @@
+@@ -89773,7 +39574,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95147,7 +95138,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -89794,9 +39592,9 @@
+@@ -89788,9 +39589,9 @@
@@ -95159,7 +95150,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -89811,11 +39609,7 @@
+@@ -89805,11 +39606,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95172,7 +95163,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -89840,38 +39634,11 @@
+@@ -89834,38 +39631,11 @@
return 0;
}
_ACEOF
@@ -95214,7 +95205,7 @@
done
eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
LIBS="$ac_save_LIBS"
-@@ -89883,102 +39650,12 @@
+@@ -89877,102 +39647,12 @@
eval "ac_res=\$ac_cv_funclib_res_nsearch"
if false; then
@@ -95322,7 +95313,7 @@
_ACEOF
fi
-@@ -89998,13 +39675,13 @@
+@@ -89992,13 +39672,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95338,7 +95329,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90018,7 +39695,7 @@
+@@ -90012,7 +39692,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95347,7 +95338,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90033,9 +39710,9 @@
+@@ -90027,9 +39707,9 @@
@@ -95359,7 +95350,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90050,11 +39727,7 @@
+@@ -90044,11 +39724,7 @@
*) ac_lib="-l$ac_lib" ;;
esac
LIBS=" $ac_lib $ac_save_LIBS"
@@ -95372,7 +95363,7 @@
/* end confdefs.h. */
#include <stdio.h>
-@@ -90079,38 +39752,11 @@
+@@ -90073,38 +39749,11 @@
return 0;
}
_ACEOF
@@ -95414,7 +95405,7 @@
done
eval "ac_cv_funclib_res_ndestroy=\${ac_cv_funclib_res_ndestroy-no}"
LIBS="$ac_save_LIBS"
-@@ -90122,102 +39768,12 @@
+@@ -90116,102 +39765,12 @@
eval "ac_res=\$ac_cv_funclib_res_ndestroy"
if false; then
@@ -95522,7 +95513,7 @@
_ACEOF
fi
-@@ -90237,13 +39793,13 @@
+@@ -90231,13 +39790,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95538,7 +95529,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90257,7 +39813,7 @@
+@@ -90251,7 +39810,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95547,7 +95538,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90272,9 +39828,9 @@
+@@ -90266,9 +39825,9 @@
@@ -95559,7 +95550,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90287,176 +39843,55 @@
+@@ -90281,176 +39840,55 @@
no) continue ;;
-l*) ;;
*) ac_lib="-l$ac_lib" ;;
@@ -95768,7 +95759,7 @@
_ACEOF
fi
-@@ -90476,13 +39911,13 @@
+@@ -90470,13 +39908,13 @@
#define $ac_tr_func 1
_ACEOF
@@ -95784,7 +95775,7 @@
$as_echo "no" >&6; }
;;
*)
-@@ -90496,7 +39931,7 @@
+@@ -90490,7 +39928,7 @@
#define $ac_tr_lib 1
_ACEOF
@@ -95793,7 +95784,7 @@
$as_echo "yes, in $ac_res" >&6; }
;;
esac
-@@ -90508,18 +39943,14 @@
+@@ -90502,18 +39940,14 @@
@@ -95815,7 +95806,7 @@
/* end confdefs.h. */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
-@@ -90543,44 +39974,15 @@
+@@ -90537,44 +39971,15 @@
return 0;
}
_ACEOF
@@ -95865,7 +95856,7 @@
/* end confdefs.h. */
extern int _res;
int foo(void) { return _res; }
-@@ -90592,44 +39994,19 @@
+@@ -90586,44 +39991,19 @@
return 0;
}
_ACEOF
@@ -95915,7 +95906,7 @@
$as_echo "$ac_foo" >&6; }
if test "$ac_foo" = yes; then
-@@ -90637,18 +40014,7 @@
+@@ -90631,18 +40011,7 @@
#define HAVE__RES 1
_ACEOF
@@ -95935,7 +95926,7 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-@@ -90661,64 +40027,17 @@
+@@ -90655,64 +40024,17 @@
#ifdef HAVE_RESOLV_H
#include <resolv.h>
#endif
@@ -96005,7 +95996,7 @@
fi
-@@ -90784,9 +40103,9 @@
+@@ -90778,9 +40100,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
@@ -96017,7 +96008,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -90797,24 +40116,24 @@
+@@ -90791,24 +40113,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -96047,7 +96038,7 @@
$as_echo "no" >&6; }
fi
-@@ -90843,20 +40162,20 @@
+@@ -90837,20 +40159,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -96075,7 +96066,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90865,19 +40184,17 @@
+@@ -90859,19 +40181,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -96099,7 +96090,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -90885,55 +40202,29 @@
+@@ -90879,55 +40199,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -96163,7 +96154,7 @@
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -90942,52 +40233,24 @@
+@@ -90936,52 +40230,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -96223,7 +96214,7 @@
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -90997,9 +40260,9 @@
+@@ -90991,9 +40257,9 @@
if test x"$LEX_BASENAME" = x"flex"; then
# "flex 2.5.33"
FLEX_VERSION=`$LEX --version | cut -d ' ' -f2`
@@ -96235,7 +96226,7 @@
$as_echo "$FLEX_VERSION" >&6; }
FLEX_MAJOR=`echo $FLEX_VERSION | cut -d '.' -f1`
FLEX_MINOR=`echo $FLEX_VERSION | cut -d '.' -f2`
-@@ -91012,9 +40275,9 @@
+@@ -91006,9 +40272,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
@@ -96247,7 +96238,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -91025,24 +40288,24 @@
+@@ -91019,24 +40285,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -96277,7 +96268,7 @@
$as_echo "no" >&6; }
fi
-@@ -91055,9 +40318,9 @@
+@@ -91049,9 +40315,9 @@
if test x"$YACC_BASENAME" = x"bison -y"; then
# bison (GNU Bison) 2.3
BISON_VERSION=`$YACC --version | head -1 | cut -d ' ' -f4`
@@ -96289,7 +96280,7 @@
$as_echo "$BISON_VERSION" >&6; }
BISON_MAJOR=`echo $BISON_VERSION | cut -d '.' -f1`
BISON_MINOR=`echo $BISON_VERSION | cut -d '.' -f2`
-@@ -91065,7 +40328,7 @@
+@@ -91059,7 +40325,7 @@
YACC_VERSION="bison-$BISON_MAJOR.$BISON_MINOR"
fi
@@ -96298,7 +96289,7 @@
$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 +40344,7 @@
+@@ -91075,7 +40341,7 @@
LEX=false
YACC=false
fi
@@ -96307,7 +96298,7 @@
$as_echo "$LEX_YACC" >&6; }
# Portions of heimdal kerberos are unpacked into source/heimdal
-@@ -91089,21 +40352,15 @@
+@@ -91083,21 +40349,15 @@
# if we ever get to using a host kerberos, we might add conditionals here
@@ -96332,7 +96323,7 @@
HAVE_GSSAPI=YES
-@@ -91195,9 +40452,7 @@
+@@ -91189,9 +40449,7 @@
VPATH="$VPATH:\$(HEIMDAL_VPATH)"
@@ -96343,7 +96334,7 @@
-@@ -91206,170 +40461,27 @@
+@@ -91200,170 +40458,27 @@
"
@@ -96521,7 +96512,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91387,46 +40499,15 @@
+@@ -91381,46 +40496,15 @@
return 0;
}
_ACEOF
@@ -96572,7 +96563,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -91444,65 +40525,32 @@
+@@ -91438,65 +40522,32 @@
return 0;
}
_ACEOF
@@ -96646,7 +96637,7 @@
/* 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 +40591,18 @@
+@@ -91537,43 +40588,18 @@
return 0;
}
_ACEOF
@@ -96696,7 +96687,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_BACKTRACE 1
_ACEOF
-@@ -91587,7 +40610,6 @@
+@@ -91581,7 +40607,6 @@
fi
@@ -96704,7 +96695,7 @@
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 +40641,12 @@
+@@ -91613,102 +40638,12 @@
@@ -96812,7 +96803,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -91723,102 +40655,12 @@
+@@ -91717,102 +40652,12 @@
done
@@ -96919,7 +96910,7 @@
_ACEOF
fi
-@@ -91827,221 +40669,33 @@
+@@ -91821,221 +40666,33 @@
#################################################
# these tests are taken from the GNU fileutils package
@@ -97164,7 +97155,7 @@
_ACEOF
fi
-@@ -92054,19 +40708,15 @@
+@@ -92048,19 +40705,15 @@
# Test for statvfs64.
if test $space = no; then
# SVR4
@@ -97188,7 +97179,7 @@
/* end confdefs.h. */
#if defined(HAVE_UNISTD_H)
-@@ -92080,51 +40730,22 @@
+@@ -92074,51 +40727,22 @@
exit (statvfs64 (".", &fsd));
}
_ACEOF
@@ -97246,7 +97237,7 @@
fi
fi
-@@ -92137,16 +40758,12 @@
+@@ -92131,16 +40755,12 @@
# is what it gets when this test fails.
if test $space = no; then
# SVR4
@@ -97266,7 +97257,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -92158,64 +40775,33 @@
+@@ -92152,64 +40772,33 @@
return 0;
}
_ACEOF
@@ -97340,7 +97331,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statvfs.h>
-@@ -92227,59 +40813,32 @@
+@@ -92221,59 +40810,32 @@
return 0;
}
_ACEOF
@@ -97408,7 +97399,7 @@
/* end confdefs.h. */
#include <sys/param.h>
-@@ -92292,71 +40851,38 @@
+@@ -92286,71 +40848,38 @@
exit (statfs (".", &fsd, sizeof (struct statfs)));
}
_ACEOF
@@ -97490,7 +97481,7 @@
/* end confdefs.h. */
#ifdef HAVE_SYS_PARAM_H
-@@ -92375,71 +40901,38 @@
+@@ -92369,71 +40898,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97572,7 +97563,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/statfs.h>
-@@ -92449,71 +40942,38 @@
+@@ -92443,71 +40939,38 @@
exit (statfs (".", &fsd, sizeof fsd, 0));
}
_ACEOF
@@ -97654,7 +97645,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92529,71 +40989,38 @@
+@@ -92523,71 +40986,38 @@
exit (statfs (".", &fsd));
}
_ACEOF
@@ -97736,7 +97727,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
-@@ -92613,201 +41040,33 @@
+@@ -92607,201 +41037,33 @@
exit (statfs (".", &fsd) != 1);
}
_ACEOF
@@ -97949,7 +97940,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -92816,19 +41075,15 @@
+@@ -92810,19 +41072,15 @@
done
@@ -97972,7 +97963,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92846,46 +41101,15 @@
+@@ -92840,46 +41098,15 @@
return 0;
}
_ACEOF
@@ -98023,7 +98014,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -92903,65 +41127,32 @@
+@@ -92897,65 +41124,32 @@
return 0;
}
_ACEOF
@@ -98097,7 +98088,7 @@
/* 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 +41193,24 @@
+@@ -92996,50 +41190,24 @@
return 0;
}
_ACEOF
@@ -98154,7 +98145,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
XATTR_LIBS = ${XATTR_LIBS}
XATTR_CFLAGS = ${XATTR_CFLAGS}
-@@ -93055,18 +41220,14 @@
+@@ -93049,18 +41217,14 @@
if test x"$ac_cv_func_ext_flistxattr" = x"yes"; then
@@ -98176,7 +98167,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -93089,48 +41250,23 @@
+@@ -93083,48 +41247,23 @@
return 0;
}
_ACEOF
@@ -98230,7 +98221,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -93142,20 +41278,16 @@
+@@ -93136,20 +41275,16 @@
fi
@@ -98255,7 +98246,7 @@
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/capability.h>
-@@ -93170,117 +41302,55 @@
+@@ -93164,117 +41299,55 @@
}
_ACEOF
@@ -98389,7 +98380,7 @@
fi
-@@ -93288,7 +41358,7 @@
+@@ -93282,7 +41355,7 @@
INCLUDED_POPT=auto
# Check whether --with-included-popt was given.
@@ -98398,7 +98389,7 @@
withval=$with_included_popt; INCLUDED_POPT=$withval
fi
-@@ -93297,169 +41367,26 @@
+@@ -93291,169 +41364,26 @@
if test x"$INCLUDED_POPT" != x"yes"; then
@@ -98576,7 +98567,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -93477,43 +41404,18 @@
+@@ -93471,43 +41401,18 @@
return 0;
}
_ACEOF
@@ -98626,7 +98617,7 @@
POPT_LIBS="-lpopt"
fi
-@@ -93525,9 +41427,9 @@
+@@ -93519,9 +41424,9 @@
fi
fi
@@ -98638,7 +98629,7 @@
$as_echo "$INCLUDED_POPT" >&6; }
if test x"$INCLUDED_POPT" != x"no"; then
poptdir=""
-@@ -93541,156 +41443,16 @@
+@@ -93535,156 +41440,16 @@
fi
done
if test x"$poptdir" = "x"; then
@@ -98802,7 +98793,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -93729,12 +41491,10 @@
+@@ -93723,12 +41488,10 @@
LOOK_DIRS="/usr /usr/local /sw"
# Check whether --with-libiconv was given.
@@ -98817,7 +98808,7 @@
else
if test "$withval" != "yes" ; then
-@@ -93746,65 +41506,36 @@
+@@ -93740,65 +41503,36 @@
LIBS=-liconv
@@ -98904,7 +98895,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93812,29 +41543,17 @@
+@@ -93806,29 +41540,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -98939,7 +98930,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -93847,33 +41566,10 @@
+@@ -93841,33 +41563,10 @@
}
_ACEOF
@@ -98976,7 +98967,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93881,28 +41577,17 @@
+@@ -93875,28 +41574,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99011,7 +99002,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -93915,33 +41600,10 @@
+@@ -93909,33 +41597,10 @@
}
_ACEOF
@@ -99048,7 +99039,7 @@
ICONV_FOUND=yes;
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -93949,31 +41611,22 @@
+@@ -93943,31 +41608,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99086,7 +99077,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -93986,17 +41639,13 @@
+@@ -93980,17 +41636,13 @@
if test x$ICONV_FOUND = xno; then
@@ -99108,7 +99099,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -94009,49 +41658,20 @@
+@@ -94003,49 +41655,20 @@
}
_ACEOF
@@ -99164,7 +99155,7 @@
fi
for i in $LOOK_DIRS ; do
-@@ -94068,24 +41688,20 @@
+@@ -94062,24 +41685,20 @@
LIBS=-liconv
@@ -99196,7 +99187,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -94098,33 +41714,10 @@
+@@ -94092,33 +41711,10 @@
}
_ACEOF
@@ -99233,7 +99224,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94132,27 +41725,17 @@
+@@ -94126,27 +41722,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99265,7 +99256,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -94165,33 +41748,10 @@
+@@ -94159,33 +41745,10 @@
}
_ACEOF
@@ -99302,7 +99293,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94199,26 +41759,17 @@
+@@ -94193,26 +41756,17 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99334,7 +99325,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <giconv.h>
-@@ -94231,33 +41782,10 @@
+@@ -94225,33 +41779,10 @@
}
_ACEOF
@@ -99371,7 +99362,7 @@
ICONV_FOUND=yes
ICONV_CPPFLAGS="$CPPFLAGS"
-@@ -94265,29 +41793,22 @@
+@@ -94259,29 +41790,22 @@
ICONV_LDFLAGS="$LDFLAGS"
else
@@ -99406,7 +99397,7 @@
CPPFLAGS="$save_CPPFLAGS"
LDFLAGS="$save_LDFLAGS"
LIBS="$save_LIBS"
-@@ -94295,7 +41816,7 @@
+@@ -94289,7 +41813,7 @@
done
if test x"$ICONV_FOUND" = x"no"; then
@@ -99415,7 +99406,7 @@
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 +41829,7 @@
+@@ -94302,9 +41826,7 @@
else
@@ -99426,7 +99417,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -94331,203 +41850,23 @@
+@@ -94325,203 +41847,23 @@
@@ -99638,7 +99629,7 @@
_ACEOF
fi
-@@ -94606,151 +41945,12 @@
+@@ -94600,151 +41942,12 @@
@@ -99794,7 +99785,7 @@
_ACEOF
fi
-@@ -94760,23 +41960,17 @@
+@@ -94754,23 +41957,17 @@
@@ -99821,7 +99812,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -94794,54 +41988,28 @@
+@@ -94788,54 +41985,28 @@
return 0;
}
_ACEOF
@@ -99883,7 +99874,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -94857,18 +42025,13 @@
+@@ -94851,18 +42022,13 @@
fi
@@ -99905,7 +99896,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -94886,40 +42049,19 @@
+@@ -94880,40 +42046,19 @@
return 0;
}
_ACEOF
@@ -99948,7 +99939,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -94978,9 +42120,9 @@
+@@ -94972,9 +42117,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
@@ -99960,7 +99951,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -94993,14 +42135,14 @@
+@@ -94987,14 +42132,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -99978,7 +99969,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95009,10 +42151,10 @@
+@@ -95003,10 +42148,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -99991,7 +99982,7 @@
$as_echo "no" >&6; }
fi
-@@ -95028,52 +42170,27 @@
+@@ -95022,52 +42167,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100051,7 +100042,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTALLOC_ENABLE = YES
-@@ -95081,22 +42198,16 @@
+@@ -95075,22 +42195,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTALLOC} = \"YES\";"
@@ -100078,7 +100069,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95111,7 +42222,7 @@
+@@ -95105,7 +42219,7 @@
ac_cv_LIBTALLOC_found=yes
else
@@ -100087,7 +100078,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'talloc >= $TALLOC_MIN_VERSION'
ac_cv_LIBTALLOC_found=no
-@@ -95141,9 +42252,9 @@
+@@ -95135,9 +42249,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
@@ -100099,7 +100090,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95156,14 +42267,14 @@
+@@ -95150,14 +42264,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100117,7 +100108,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95172,10 +42283,10 @@
+@@ -95166,10 +42280,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100130,7 +100121,7 @@
$as_echo "no" >&6; }
fi
-@@ -95191,52 +42302,27 @@
+@@ -95185,52 +42299,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100190,7 +100181,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTDB_ENABLE = YES
-@@ -95244,22 +42330,16 @@
+@@ -95238,22 +42327,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTDB} = \"YES\";"
@@ -100217,7 +100208,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95274,7 +42354,7 @@
+@@ -95268,7 +42351,7 @@
ac_cv_LIBTDB_found=yes
else
@@ -100226,7 +100217,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tdb >= $TDB_MIN_VERSION'
ac_cv_LIBTDB_found=no
-@@ -95299,9 +42379,7 @@
+@@ -95293,9 +42376,7 @@
fi
done
if test x"$tdbdir" = "x"; then
@@ -100237,7 +100228,7 @@
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 +42392,12 @@
+@@ -95308,104 +42389,12 @@
TDB_CFLAGS="-I$tdbdir/include"
@@ -100347,7 +100338,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -95419,151 +42405,12 @@
+@@ -95413,151 +42402,12 @@
fi
done
@@ -100504,7 +100495,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -95574,17 +42421,13 @@
+@@ -95568,17 +42418,13 @@
@@ -100525,7 +100516,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95595,56 +42438,29 @@
+@@ -95589,56 +42435,29 @@
return 0;
}
_ACEOF
@@ -100589,7 +100580,7 @@
/* end confdefs.h. */
#include <unistd.h>
int
-@@ -95655,41 +42471,18 @@
+@@ -95649,41 +42468,18 @@
return 0;
}
_ACEOF
@@ -100635,7 +100626,7 @@
fi
-@@ -95715,9 +42508,9 @@
+@@ -95709,9 +42505,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
@@ -100647,7 +100638,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -95730,14 +42523,14 @@
+@@ -95724,14 +42520,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -100665,7 +100656,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -95746,10 +42539,10 @@
+@@ -95740,10 +42536,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -100678,7 +100669,7 @@
$as_echo "no" >&6; }
fi
-@@ -95765,52 +42558,27 @@
+@@ -95759,52 +42555,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -100738,7 +100729,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBTEVENT_ENABLE = YES
-@@ -95818,22 +42586,16 @@
+@@ -95812,22 +42583,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBTEVENT} = \"YES\";"
@@ -100765,7 +100756,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -95848,7 +42610,7 @@
+@@ -95842,7 +42607,7 @@
ac_cv_LIBTEVENT_found=yes
else
@@ -100774,7 +100765,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'tevent = $TEVENT_REQUIRED_VERSION'
ac_cv_LIBTEVENT_found=no
-@@ -95877,9 +42639,7 @@
+@@ -95871,9 +42636,7 @@
fi
done
if test x"$teventdir" = "x"; then
@@ -100785,7 +100776,7 @@
fi
fi
-@@ -95897,253 +42657,24 @@
+@@ -95891,253 +42654,24 @@
TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o tevent_queue.o"
TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
@@ -101047,7 +101038,7 @@
_ACEOF
fi
-@@ -96152,9 +42683,7 @@
+@@ -96146,9 +42680,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"
@@ -101058,7 +101049,7 @@
fi
-@@ -96216,9 +42745,9 @@
+@@ -96210,9 +42742,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
@@ -101070,7 +101061,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96231,14 +42760,14 @@
+@@ -96225,14 +42757,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -101088,7 +101079,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96247,10 +42776,10 @@
+@@ -96241,10 +42773,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -101101,7 +101092,7 @@
$as_echo "no" >&6; }
fi
-@@ -96266,52 +42795,27 @@
+@@ -96260,52 +42792,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -101161,7 +101152,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
LIBLDB_ENABLE = YES
-@@ -96319,22 +42823,16 @@
+@@ -96313,22 +42820,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{LIBLDB} = \"YES\";"
@@ -101188,7 +101179,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96349,7 +42847,7 @@
+@@ -96343,7 +42844,7 @@
ac_cv_LIBLDB_found=yes
else
@@ -101197,7 +101188,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'ldb = $LDB_REQUIRED_VERSION'
ac_cv_LIBLDB_found=no
-@@ -96395,12 +42893,12 @@
+@@ -96389,12 +42890,12 @@
SQLITE3_LIBS=""
with_sqlite3_support=no
@@ -101212,7 +101203,7 @@
withval=$with_sqlite3; case "$withval" in
yes|no|auto)
with_sqlite3_support=$withval
-@@ -96409,157 +42907,18 @@
+@@ -96403,157 +42904,18 @@
fi
@@ -101376,7 +101367,7 @@
_ACEOF
fi
-@@ -96569,11 +42928,9 @@
+@@ -96563,11 +42925,9 @@
if test x"$ac_cv_header_sqlite3_h" != x"yes"; then
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101390,7 +101381,7 @@
$as_echo "$as_me: WARNING: sqlite3.h is needed for SQLITE3 support" >&2;}
fi
-@@ -96588,23 +42945,17 @@
+@@ -96582,23 +42942,17 @@
# now see if we can find the sqlite3 libs in standard paths
@@ -101417,7 +101408,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -96622,54 +42973,28 @@
+@@ -96616,54 +42970,28 @@
return 0;
}
_ACEOF
@@ -101479,7 +101470,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSQLITE3 1
_ACEOF
-@@ -96685,21 +43010,16 @@
+@@ -96679,21 +43007,16 @@
fi
@@ -101505,7 +101496,7 @@
$as_echo "yes" >&6; }
with_sqlite3_support=yes
-@@ -96711,11 +43031,9 @@
+@@ -96705,11 +43028,9 @@
else
if test x"$with_sqlite3_support" = x"yes"; then
@@ -101519,7 +101510,7 @@
$as_echo "$as_me: WARNING: libsqlite3 is needed for SQLITE3 support" >&2;}
fi
-@@ -96776,7 +43094,7 @@
+@@ -96770,7 +43091,7 @@
use_gnutls=auto
# Check whether --enable-gnutls was given.
@@ -101528,7 +101519,7 @@
enableval=$enable_gnutls; if test x$enable_gnutls = xno; then
use_gnutls=no
fi
-@@ -96790,9 +43108,9 @@
+@@ -96784,9 +43105,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
@@ -101540,7 +101531,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -96805,14 +43123,14 @@
+@@ -96799,14 +43120,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -101558,7 +101549,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -96821,10 +43139,10 @@
+@@ -96815,10 +43136,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -101571,7 +101562,7 @@
$as_echo "no" >&6; }
fi
-@@ -96840,52 +43158,27 @@
+@@ -96834,52 +43155,27 @@
else
SAMBA_PKG_CONFIG_MIN_VERSION="0.9.0"
if $PKG_CONFIG --atleast-pkgconfig-version $SAMBA_PKG_CONFIG_MIN_VERSION; then
@@ -101631,7 +101622,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GNUTLS_ENABLE = YES
-@@ -96893,22 +43186,16 @@
+@@ -96887,22 +43183,16 @@
SMB_INFO_ENABLES="$SMB_INFO_ENABLES
\$enabled{GNUTLS} = \"YES\";"
@@ -101658,7 +101649,7 @@
CFLAGS="$OLD_CFLAGS"
-@@ -96923,7 +43210,7 @@
+@@ -96917,7 +43207,7 @@
ac_cv_GNUTLS_found=yes
else
@@ -101667,7 +101658,7 @@
$as_echo "no" >&6; }
$PKG_CONFIG --errors-to-stdout --print-errors 'gnutls < 2.6.0'
ac_cv_GNUTLS_found=no
-@@ -96940,770 +43227,161 @@
+@@ -96934,770 +43224,161 @@
use_gnutls=no
fi
@@ -102532,7 +102523,7 @@
_ACEOF
fi
-@@ -97712,23 +43390,17 @@
+@@ -97706,23 +43387,17 @@
@@ -102559,7 +102550,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -97746,54 +43418,28 @@
+@@ -97740,54 +43415,28 @@
return 0;
}
_ACEOF
@@ -102621,7 +102612,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGCRYPT 1
_ACEOF
-@@ -97809,7 +43455,6 @@
+@@ -97803,7 +43452,6 @@
fi
@@ -102629,7 +102620,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
GCRYPT_LIBS = $GCRYPT_LIBS
GCRYPT_CFLAGS =
-@@ -97847,19 +43492,17 @@
+@@ -97841,19 +43489,17 @@
#################################################
# check for pthread support
@@ -102653,7 +102644,7 @@
fi
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -97877,12 +43520,12 @@
+@@ -97871,12 +43517,12 @@
;;
*)
@@ -102668,7 +102659,7 @@
$as_echo "no" >&6; }
fi
-@@ -97898,274 +43541,45 @@
+@@ -97892,274 +43538,45 @@
@@ -102956,7 +102947,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98183,54 +43597,28 @@
+@@ -98177,54 +43594,28 @@
return 0;
}
_ACEOF
@@ -103018,7 +103009,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBSETPROCTITLE 1
_ACEOF
-@@ -98246,15 +43634,14 @@
+@@ -98240,15 +43631,14 @@
fi
@@ -103036,7 +103027,7 @@
$as_echo "yes" >&6; }
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98264,22 +43651,20 @@
+@@ -98258,22 +43648,20 @@
\$enabled{SETPROCTITLE} = \"YES\";"
@@ -103063,7 +103054,7 @@
$as_echo "no" >&6; }
fi
-@@ -98297,17 +43682,13 @@
+@@ -98291,17 +43679,13 @@
@@ -103084,7 +103075,7 @@
/* end confdefs.h. */
#include <sys/types.h>
-@@ -98326,209 +43707,43 @@
+@@ -98320,209 +43704,43 @@
return 0;
}
_ACEOF
@@ -103305,7 +103296,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98546,46 +43761,15 @@
+@@ -98540,46 +43758,15 @@
return 0;
}
_ACEOF
@@ -103356,7 +103347,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -98603,65 +43787,32 @@
+@@ -98597,65 +43784,32 @@
return 0;
}
_ACEOF
@@ -103431,7 +103422,7 @@
/* 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 +43853,24 @@
+@@ -98696,50 +43850,24 @@
return 0;
}
_ACEOF
@@ -103488,7 +103479,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
BLKID_LIBS = ${BLKID_LIBS}
BLKID_CFLAGS = ${BLKID_CFLAGS}
-@@ -98756,9 +43881,7 @@
+@@ -98750,9 +43878,7 @@
if test x"$ac_cv_func_ext_blkid_get_cache" = x"yes"; then
@@ -103499,7 +103490,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
-@@ -98786,102 +43909,12 @@
+@@ -98780,102 +43906,12 @@
fi
@@ -103606,7 +103597,7 @@
_ACEOF
fi
-@@ -98891,151 +43924,12 @@
+@@ -98885,151 +43921,12 @@
###############################
# start SMB_EXT_LIB_PAM
# check for security/pam_appl.h and -lpam
@@ -103762,7 +103753,7 @@
_ACEOF
fi
-@@ -99044,23 +43938,17 @@
+@@ -99038,23 +43935,17 @@
@@ -103789,7 +103780,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -99078,54 +43966,28 @@
+@@ -99072,54 +43963,28 @@
return 0;
}
_ACEOF
@@ -103851,7 +103842,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPAM 1
_ACEOF
-@@ -99140,7 +44002,6 @@
+@@ -99134,7 +43999,6 @@
fi
@@ -103859,7 +103850,7 @@
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 +44027,17 @@
+@@ -99160,23 +44024,17 @@
# test for where we get crypt() from
@@ -103886,7 +103877,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -99200,54 +44055,28 @@
+@@ -99194,54 +44052,28 @@
return 0;
}
_ACEOF
@@ -103948,7 +103939,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
-@@ -99263,7 +44092,6 @@
+@@ -99257,7 +44089,6 @@
fi
@@ -103956,7 +103947,7 @@
MAKE_SETTINGS="$MAKE_SETTINGS
CRYPT_ENABLE = YES
"
-@@ -99280,102 +44108,12 @@
+@@ -99274,102 +44105,12 @@
@@ -104064,7 +104055,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -99384,151 +44122,12 @@
+@@ -99378,151 +44119,12 @@
done
@@ -104220,7 +104211,7 @@
_ACEOF
fi
-@@ -99537,330 +44136,18 @@
+@@ -99531,330 +44133,18 @@
@@ -104559,7 +104550,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -99868,70 +44155,125 @@
+@@ -99862,70 +44152,125 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -104731,7 +104722,7 @@
/* end confdefs.h. */
#include <asm/unistd.h>
int
-@@ -99942,41 +44284,18 @@
+@@ -99936,41 +44281,18 @@
return 0;
}
_ACEOF
@@ -104777,7 +104768,7 @@
fi
-@@ -100020,17 +44339,13 @@
+@@ -100014,17 +44336,13 @@
fi
@@ -104798,7 +104789,7 @@
/* end confdefs.h. */
#include <fcntl.h>
int
-@@ -100041,56 +44356,29 @@
+@@ -100035,56 +44353,29 @@
return 0;
}
_ACEOF
@@ -104862,7 +104853,7 @@
/* end confdefs.h. */
#include <signal.h>
int
-@@ -100101,41 +44389,18 @@
+@@ -100095,41 +44386,18 @@
return 0;
}
_ACEOF
@@ -104908,7 +104899,7 @@
fi
-@@ -100159,151 +44424,12 @@
+@@ -100153,151 +44421,12 @@
fi
@@ -105065,7 +105056,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -100617,151 +44743,12 @@
+@@ -100611,151 +44740,12 @@
@@ -105221,7 +105212,7 @@
_ACEOF
fi
-@@ -100771,23 +44758,17 @@
+@@ -100765,23 +44755,17 @@
@@ -105248,7 +105239,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -100805,54 +44786,28 @@
+@@ -100799,54 +44783,28 @@
return 0;
}
_ACEOF
@@ -105310,7 +105301,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
-@@ -100868,18 +44823,13 @@
+@@ -100862,18 +44820,13 @@
fi
@@ -105332,7 +105323,7 @@
/* end confdefs.h. */
#include <zlib.h>
-@@ -100897,40 +44847,19 @@
+@@ -100891,40 +44844,19 @@
return 0;
}
_ACEOF
@@ -105375,7 +105366,7 @@
$as_echo "$samba_cv_zlib_1_2_3" >&6; }
if test x"$ac_cv_header_zlib_h" = x"yes" -a \
-@@ -101044,87 +44973,54 @@
+@@ -101038,87 +44970,54 @@
#################################################
# Display summary of libraries detected
@@ -105479,7 +105470,7 @@
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 +45079,13 @@
+@@ -101177,13 +45076,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -105495,7 +105486,7 @@
esac ;;
esac
done
-@@ -101197,8 +45093,8 @@
+@@ -101191,8 +45090,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -105506,7 +105497,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -101221,11 +45117,11 @@
+@@ -101215,11 +45114,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" &&
@@ -105520,7 +105511,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -101245,8 +45141,8 @@
+@@ -101239,8 +45138,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.
@@ -105531,7 +105522,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -101270,9 +45166,10 @@
+@@ -101264,9 +45163,10 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -105544,7 +105535,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -101282,17 +45179,18 @@
+@@ -101276,17 +45176,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -105570,7 +105561,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -101300,23 +45198,15 @@
+@@ -101294,23 +45195,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -105599,7 +105590,7 @@
as_nl='
'
export as_nl
-@@ -101324,7 +45214,13 @@
+@@ -101318,7 +45211,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
@@ -105614,7 +105605,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -101335,7 +45231,7 @@
+@@ -101329,7 +45228,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -105623,7 +105614,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -101358,13 +45254,6 @@
+@@ -101352,13 +45251,6 @@
}
fi
@@ -105637,7 +105628,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -101374,15 +45263,15 @@
+@@ -101368,15 +45260,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -105656,7 +105647,7 @@
IFS=$as_save_IFS
;;
-@@ -101394,12 +45283,16 @@
+@@ -101388,12 +45280,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -105677,7 +105668,7 @@
done
PS1='$ '
PS2='> '
-@@ -101411,7 +45304,89 @@
+@@ -101405,7 +45301,89 @@
LANGUAGE=C
export LANGUAGE
@@ -105768,7 +105759,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -101425,8 +45400,12 @@
+@@ -101419,8 +45397,12 @@
as_basename=false
fi
@@ -105782,7 +105773,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -101446,76 +45425,25 @@
+@@ -101440,76 +45422,25 @@
}
s/.*/./; q'`
@@ -105870,7 +105861,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -101544,8 +45472,56 @@
+@@ -101538,8 +45469,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -105928,7 +105919,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -101564,10 +45540,10 @@
+@@ -101558,10 +45537,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -105941,7 +105932,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -101582,13 +45558,19 @@
+@@ -101576,13 +45555,19 @@
exec 6>&1
@@ -105963,7 +105954,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -101620,13 +45602,15 @@
+@@ -101614,13 +45599,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -105982,7 +105973,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -101645,16 +45629,17 @@
+@@ -101639,16 +45626,17 @@
Configuration commands:
$config_commands
@@ -106004,7 +105995,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -101689,6 +45674,8 @@
+@@ -101683,6 +45671,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -106013,7 +106004,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -101696,20 +45683,19 @@
+@@ -101690,20 +45680,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -106038,7 +106029,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -101717,11 +45703,10 @@
+@@ -101711,11 +45700,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -106053,7 +106044,7 @@
ac_need_defaults=false ;;
esac
-@@ -101814,9 +45799,7 @@
+@@ -101808,9 +45796,7 @@
"pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
"../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
@@ -106064,7 +106055,7 @@
esac
done
-@@ -101843,7 +45826,7 @@
+@@ -101837,7 +45823,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -106073,7 +106064,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -101854,11 +45837,7 @@
+@@ -101848,11 +45834,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -106086,7 +106077,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -101866,10 +45845,16 @@
+@@ -101860,10 +45842,16 @@
if test -n "$CONFIG_FILES"; then
@@ -106106,7 +106097,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -101883,24 +45868,18 @@
+@@ -101877,24 +45865,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -106134,7 +106125,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -101922,7 +45901,7 @@
+@@ -101916,7 +45898,7 @@
t delim
:nl
h
@@ -106143,7 +106134,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -101936,7 +45915,7 @@
+@@ -101930,7 +45912,7 @@
t nl
:delim
h
@@ -106152,7 +106143,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -101989,9 +45968,7 @@
+@@ -101983,9 +45965,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -106163,7 +106154,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -102032,9 +46009,7 @@
+@@ -102026,9 +46006,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -106174,7 +106165,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -102119,9 +46094,7 @@
+@@ -102113,9 +46091,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -106185,7 +106176,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -102134,9 +46107,7 @@
+@@ -102128,9 +46104,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -106196,7 +106187,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -102164,12 +46135,10 @@
+@@ -102158,12 +46132,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -106211,7 +106202,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -102180,7 +46149,7 @@
+@@ -102174,7 +46146,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -106220,7 +106211,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -102193,9 +46162,7 @@
+@@ -102187,9 +46159,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -106231,7 +106222,7 @@
esac
;;
esac
-@@ -102223,47 +46190,7 @@
+@@ -102217,47 +46187,7 @@
q
}
s/.*/./; q'`
@@ -106280,7 +106271,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -102315,7 +46242,6 @@
+@@ -102309,7 +46239,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=
@@ -106288,7 +106279,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -102325,12 +46251,11 @@
+@@ -102319,12 +46248,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -106303,7 +106294,7 @@
$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 +46265,7 @@
+@@ -102334,7 +46262,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -106312,7 +106303,7 @@
esac
_ACEOF
-@@ -102368,14 +46293,12 @@
+@@ -102362,14 +46290,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -106329,7 +106320,7 @@
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 +46308,7 @@
+@@ -102379,9 +46305,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -106340,7 +106331,7 @@
;;
:H)
#
-@@ -102398,29 +46319,23 @@
+@@ -102392,29 +46316,23 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -106375,7 +106366,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -102446,15 +46361,12 @@
+@@ -102440,15 +46358,12 @@
done # for ac_tag
@@ -106393,7 +106384,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -102475,10 +46387,10 @@
+@@ -102469,10 +46384,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.
@@ -106406,7 +106397,7 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-@@ -102489,8 +46401,8 @@
+@@ -102483,8 +46398,8 @@
# Print very concise instructions on building/use
if test "x$enable_dmalloc" = xyes
then
Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch 2010-02-25 22:04:31 UTC (rev 3324)
+++ trunk/samba/debian/patches/documentation.patch 2010-02-27 05:59:38 UTC (rev 3325)
@@ -6,7 +6,7 @@
===================================================================
--- samba.orig/docs/manpages/swat.8
+++ samba/docs/manpages/swat.8
-@@ -111,85 +111,6 @@
+@@ -261,85 +261,6 @@
.RS 4
Print a summary of command line options\&.
.RE
@@ -15,9 +15,9 @@
-Swat is included as binary package with most distributions\&. The package manager in this case takes care of the installation and configuration\&. This section is only for those who have compiled swat from scratch\&.
-.PP
-After you compile SWAT you need to run
--make install
+-\FCmake install \F[]
-to install the
--swat
+-\FCswat\F[]
-binary and the various help files and images\&. A default install would put these in:
-.sp
-.RS 4
@@ -56,122 +56,105 @@
-.SS "Inetd Installation"
-.PP
-You need to edit your
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf \F[]
-and
--/etc/services
+-\FC/etc/services\F[]
-to enable SWAT to be launched via
--inetd\&.
+-\FCinetd\F[]\&.
-.PP
-In
--/etc/services
+-\FC/etc/services\F[]
-you need to add a line like this:
-.PP
--swat 901/tcp
+-\FCswat 901/tcp\F[]
-.PP
-Note for NIS/YP and LDAP users \- you may need to rebuild the NIS service maps rather than alter your local
--/etc/services
+-\FC /etc/services\F[]
-file\&.
-.PP
-the choice of port number isn\'t really important except that it should be less than 1024 and not currently used (using a number above 1024 presents an obscure security hole depending on the implementation details of your
--inetd
+-\FCinetd\F[]
-daemon)\&.
-.PP
-In
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf\F[]
-you should add a line like this:
-.PP
--swat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat
+-\FCswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\F[]
-.PP
-Once you have edited
--/etc/services
+-\FC/etc/services\F[]
-and
--/etc/inetd\&.conf
+-\FC/etc/inetd\&.conf\F[]
-you need to send a HUP signal to inetd\&. To do this use
--kill \-1 PID
+-\FCkill \-1 PID \F[]
-where PID is the process ID of the inetd daemon\&.
.SH "LAUNCHING"
.PP
To launch SWAT just run your favorite web browser and point it at "http://localhost:901/"\&.
-@@ -207,14 +128,11 @@
- This file must contain a mapping of service name (e\&.g\&., swat) to service port (e\&.g\&., 901) and protocol type (e\&.g\&., tcp)\&.
- .RE
- .PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
- .RS 4
- This is the default location of the
- \fBsmb.conf\fR(5)
--server configuration file that swat edits\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
--and
--/etc/smb\&.conf\&. This file describes all the services the server is to make available to clients\&.
-+server configuration file that swat edits\&. This file describes all the services the server is to make available to clients\&.
- .RE
- .SH "WARNINGS"
- .PP
Index: samba/docs/manpages/nmbd.8
===================================================================
--- samba.orig/docs/manpages/nmbd.8
+++ samba/docs/manpages/nmbd.8
-@@ -115,10 +115,7 @@
+@@ -265,10 +265,7 @@
to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\&.
.sp
-The default path to this file is compiled into Samba as part of the build process\&. Common defaults are
--/usr/local/samba/lib/lmhosts,
--/usr/samba/lib/lmhosts
+-\FC/usr/local/samba/lib/lmhosts\F[],
+-\FC/usr/samba/lib/lmhosts\F[]
-or
+The default path to this file is
- /etc/samba/lmhosts\&. See the
+ \FC/etc/samba/lmhosts\F[]\&. See the
\fBlmhosts\fR(5)
man page for details on the contents of this file\&.
-@@ -187,14 +184,11 @@
- inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+@@ -337,14 +334,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
+-\FC/usr/samba/lib/smb\&.conf\F[]
-and
--/etc/samba/smb\&.conf\&.
+-\FC/etc/samba/smb\&.conf\F[]\&.
+server configuration file\&.
.sp
When run as a WINS server (see the
\m[blue]\fBwins support\fR\m[]
-@@ -238,10 +232,8 @@
+@@ -388,10 +382,8 @@
will accept SIGHUP, which will cause it to dump out its namelists into the file
- namelist\&.debug
+ \FCnamelist\&.debug \F[]
in the
--/usr/local/samba/var/locks
+-\FC/usr/local/samba/var/locks\F[]
-directory (or the
--var/locks
+-\FCvar/locks\F[]
-directory configured under wherever Samba was configured to install itself)\&. This will also cause
-+/var/run/samba
++\FC/war/run/samba\F[]
+directory\&. This will also cause
- nmbd
+ \FCnmbd\F[]
to dump out its server database in the
- log\&.nmb
+ \FClog\&.nmb\F[]
Index: samba/docs/manpages/smbd.8
===================================================================
--- samba.orig/docs/manpages/smbd.8
+++ samba/docs/manpages/smbd.8
-@@ -169,14 +169,11 @@
- inetd, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
+@@ -319,14 +319,11 @@
+ \FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
.PP
--/usr/local/samba/lib/smb\&.conf
-+/etc/samba/smb\&.conf
+-\FC/usr/local/samba/lib/smb\&.conf\F[]
++\FC/etc/samba/smb\&.conf\F[]
.RS 4
This is the default location of the
\fBsmb.conf\fR(5)
-server configuration file\&. Other common places that systems install this file are
--/usr/samba/lib/smb\&.conf
+-\FC/usr/samba/lib/smb\&.conf\F[]
-and
--/etc/samba/smb\&.conf\&.
+-\FC/etc/samba/smb\&.conf\F[]\&.
+server configuration file\&.
.sp
This file describes all the services the server is to make available to clients\&. See
@@ -180,16 +163,14 @@
===================================================================
--- samba.orig/docs/manpages/lmhosts.5
+++ samba/docs/manpages/lmhosts.5
-@@ -95,10 +95,8 @@
- file\&.
+@@ -258,9 +258,7 @@
.SH "FILES"
.PP
--lmhosts is loaded from the configuration directory\&. This is usually
--/etc/samba
+ lmhosts is loaded from the configuration directory\&. This is usually
+-\FC/etc/samba\F[]
-or
--/usr/local/samba/lib\&.
-+lmhosts is loaded from the configuration directory\&. This is
-+/etc/samba\&.
+-\FC/usr/local/samba/lib\F[]\&.
++\FC/etc/samba\F[]\&.
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
@@ -197,30 +178,30 @@
===================================================================
--- samba.orig/docs/manpages/ntlm_auth.1
+++ samba/docs/manpages/ntlm_auth.1
-@@ -43,7 +43,7 @@
+@@ -193,7 +193,7 @@
Some of these commands also require access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&. This should be done either by running this command as root or providing group access to the
-+/var/run/samba\&. This should be done either by running this command as root or providing group access to the
- winbindd_privileged
+-\FC$LOCKDIR\F[]\&. This should be done either by running this command as root or providing group access to the
++\FC/var/run/samba\F[]\&. This should be done either by running this command as root or providing group access to the
+ \FCwinbindd_privileged\F[]
directory\&. For security reasons, this directory should not be world\-accessable\&.
.SH "OPTIONS"
-@@ -69,7 +69,7 @@
+@@ -219,7 +219,7 @@
Requires access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&. The protocol used is described here:
-+/var/run/samba\&. The protocol used is described here:
+-\FC$LOCKDIR\F[]\&. The protocol used is described here:
++\FC/var/run/samba\F[]\&. The protocol used is described here:
http://devel\&.squid\-cache\&.org/ntlm/squid_helper_protocol\&.html\&. This protocol has been extended to allow the NTLMSSP Negotiate packet to be included as an argument to the
- YR
+ \FCYR\F[]
command\&. (Thus avoiding loss of information in the protocol exchange)\&.
-@@ -92,7 +92,7 @@
+@@ -242,7 +242,7 @@
Requires access to the directory
- winbindd_privileged
+ \FCwinbindd_privileged\F[]
in
--$LOCKDIR\&.
-+/var/run/samba\&.
+-\FC$LOCKDIR\F[]\&.
++\FC/var/run/samba\F[]\&.
.RE
.PP
gss\-spnego\-client
@@ -228,28 +209,28 @@
===================================================================
--- samba.orig/docs/manpages/tdbbackup.8
+++ samba/docs/manpages/tdbbackup.8
-@@ -77,7 +77,7 @@
+@@ -227,7 +227,7 @@
.\}
- secrets\&.tdb
+ \FCsecrets\&.tdb\F[]
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -90,7 +90,7 @@
+@@ -240,7 +240,7 @@
.\}
- passdb\&.tdb
+ \FCpassdb\&.tdb\F[]
-\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&.
+\- usual location is in the /var/lib/samba directory\&.
.RE
.sp
.RS 4
-@@ -103,7 +103,7 @@
+@@ -253,7 +253,7 @@
.\}
- *\&.tdb
+ \FC*\&.tdb\F[]
-located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&.
+located in the /var/lib/samba and /var/run/samba directories\&.
.SH "VERSION"
@@ -259,7 +240,7 @@
===================================================================
--- samba.orig/docs/manpages/winbindd.8
+++ samba/docs/manpages/winbindd.8
-@@ -549,16 +549,16 @@
+@@ -771,16 +771,16 @@
file are owned by root\&.
.RE
.PP
@@ -267,20 +248,20 @@
+/var/run/samba/winbindd_privileged/pipe
.RS 4
The UNIX pipe over which \'privileged\' clients communicate with the
- winbindd
+ \FCwinbindd\F[]
program\&. For security reasons, access to some winbindd functions \- like those needed by the
- ntlm_auth
+ \FCntlm_auth\F[]
-utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on $LOCKDIR/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
--$LOCKDIR/winbindd_privileged
-+utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba/winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
-+/var/run/samba/winbindd_privileged
+-\FC$LOCKDIR/winbindd_privileged\F[]
++utility \- is restricted\&. By default, only users in the \'root\' group will get this access, however the administrator may change the group permissions on /var/run/samba//winbindd_privileged to allow programs like \'squid\' to use ntlm_auth\&. Note that the winbind client will only attempt to connect to the winbindd daemon if both the
++\FC/var/run/samba/winbindd_privileged\F[]
directory and
--$LOCKDIR/winbindd_privileged/pipe
-+/var/run/samba/winbindd_privileged/pipe
+-\FC$LOCKDIR/winbindd_privileged/pipe\F[]
++\FC/var/run/samba/winbindd_privileged/pipe\F[]
file are owned by root\&.
.RE
.PP
-@@ -567,15 +567,12 @@
+@@ -789,15 +789,12 @@
Implementation of name service switch library\&.
.RE
.PP
@@ -290,7 +271,7 @@
-Storage for the Windows NT rid to UNIX user/group id mapping\&. The lock directory is specified when Samba is initially compiled using the
-\fI\-\-with\-lockdir\fR
-option\&. This directory is by default
--/usr/local/samba/var/locks\&.
+-\FC/usr/local/samba/var/locks \F[]\&.
+Storage for the Windows NT rid to UNIX user/group id mapping\&.
.RE
.PP
More information about the Pkg-samba-maint
mailing list