diff options
author | Luke Leighton <lkcl@samba.org> | 2000-03-13 20:21:58 +0000 |
---|---|---|
committer | Luke Leighton <lkcl@samba.org> | 2000-03-13 20:21:58 +0000 |
commit | 9080ff28095a21dbb2ba22b0ca015690281d79ac (patch) | |
tree | dc5c3d755e5e9ba7455e6feaea669092b288eba6 | |
parent | 7d0a3f41ca897eda3d5dde202690a19d1d108c59 (diff) | |
download | samba-9080ff28095a21dbb2ba22b0ca015690281d79ac.tar.gz samba-9080ff28095a21dbb2ba22b0ca015690281d79ac.tar.xz samba-9080ff28095a21dbb2ba22b0ca015690281d79ac.zip |
From Elrond@Wunder-Nett.org Tue Mar 14 06:07:16 2000
Date: Mon, 13 Mar 2000 18:26:00 +0100
From: Elrond <Elrond@Wunder-Nett.org>
To: Luke Kenneth Casson Leighton <lkcl@samba.org>
Subject: more cleanup
- removed most of the old --with-lib*-stuff, we're using
libtool for this
- srv_samr_passdb.c: Added some handle-names for debugging
(helped me somehow to track netlogond-probs)
- made a whole bunch of functions in display_srv.c and
display_sam.c
- Added a bunch of error-checking in lsarpcd, it looks like
it tries to check/change the trust-accoutn password as a
normal user (or even guest)
[lkcl: checks can't hurt: _lsa_open_secret is called, direct, not
client-side marshalling wrapper, lsa_open_secret, etc]
Elrond
-rwxr-xr-x | source/configure | 2767 | ||||
-rw-r--r-- | source/configure.in | 276 | ||||
-rw-r--r-- | source/include/config.h.in | 21 | ||||
-rw-r--r-- | source/include/lib_smb_proto.h | 213 | ||||
-rw-r--r-- | source/include/proto.h | 1419 | ||||
-rw-r--r-- | source/include/rpc_parse_proto.h | 77 | ||||
-rw-r--r-- | source/include/winbindd_proto.h | 631 | ||||
-rw-r--r-- | source/lib/util.c | 5 | ||||
-rw-r--r-- | source/lsarpcd/lsarpcd.c | 12 | ||||
-rw-r--r-- | source/lsarpcd/srv_lsa_samdb.c | 3 | ||||
-rw-r--r-- | source/rpc_parse/parse_net.c | 50 | ||||
-rw-r--r-- | source/rpcclient/display_sam.c | 23 | ||||
-rw-r--r-- | source/rpcclient/display_srv.c | 16 | ||||
-rw-r--r-- | source/samrd/srv_samr_passdb.c | 18 |
14 files changed, 2881 insertions, 2650 deletions
diff --git a/source/configure b/source/configure index fa11ee5ec68..f3d25b08798 100755 --- a/source/configure +++ b/source/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.14.1 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -28,27 +28,6 @@ ac_help="$ac_help --with-sam-pwdb={passdb,tdb,nt5ldap} which password-database to use (passdb)" ac_help="$ac_help - --with-libmsrpc Include libmsrpc support (default) - --without-libmsrpc Don't include libmsrpc support " -ac_help="$ac_help - --with-libubiqx Include SMB libubiqx support (default) - --without-libubiqx Don't include SMB libubiqx support " -ac_help="$ac_help - --with-libsamba Include SMB libsamba support (default) - --without-libsamba Don't include SMB libsamba support " -ac_help="$ac_help - --with-libnmb Include NMB libnmb support (default) - --without-libnmb Don't include NMB libnmb support " -ac_help="$ac_help - --with-libsurs Include SMB libsurs support (default) - --without-libsurs Don't include SMB libsurs support " -ac_help="$ac_help - --with-libsmbpw Include SMB libsmbpw support (default) - --without-libsmbpw Don't include SMB libsmbpw support " -ac_help="$ac_help - --with-libsmb Include SMB libsmb support (default) - --without-libsmb Don't include SMB libsmb support " -ac_help="$ac_help --with-smbwrapper Include SMB wrapper support --without-smbwrapper Don't include SMB wrapper support (default)" ac_help="$ac_help @@ -102,6 +81,8 @@ ac_help="$ac_help ac_help="$ac_help --with-quotas Include experimental disk-quota support --without-quotas Don't include experimental disk-quota support (default)" +ac_help="$ac_help + --with-privatedir=DIR Where to put smbpasswd ($ac_default_prefix/private)" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -424,7 +405,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" + echo "configure generated by autoconf version 2.14.1" exit 0 ;; -with-* | --with-*) @@ -584,7 +565,7 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - . $cache_file + test -f "$cache_file" && . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -626,26 +607,14 @@ fi - - - - - - - - - - - - # compile with optimisation and without debugging by default CFLAGS=${CFLAGS-"-O"} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:648: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +echo "configure:617: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -674,8 +643,8 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:678: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +echo "configure:647: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -721,12 +690,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32*) + *win32* | *WIN32* | *CYGWIN*) # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:729: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +echo "configure:698: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then @@ -756,8 +725,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:761: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:730: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -768,12 +737,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 772 "configure" +#line 741 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -798,14 +767,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:803: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:772: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:808: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then +echo "configure:777: checking whether we are using GNU C" >&5 +if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<EOF @@ -813,7 +782,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -832,8 +801,8 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:836: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +echo "configure:805: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -878,9 +847,9 @@ done if test -z "$ac_aux_dir"; then { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -894,9 +863,9 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:898: checking for a BSD compatible install" >&5 +echo "configure:867: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then +if eval "test \"\${ac_cv_path_install+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -914,6 +883,10 @@ else grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else ac_cv_path_install="$ac_dir/$ac_prog -c" break 2 @@ -942,17 +915,17 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:955: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then +echo "configure:928: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then @@ -981,6 +954,222 @@ test -n "$AWK" && break done +if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +echo "configure:960: checking whether $CC and cc understand -c and -o together" >&5 +else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +echo "configure:963: checking whether cc understands -c and -o together" >&5 +fi +set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'foo(){}' > conftest.c +# Make sure it works both with $CC and with simple cc. +# We do the test twice because some compilers refuse to overwrite an +# existing .o file with -o, though they will create one. +ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +if { (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' + if { (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : + else + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no + fi + fi + fi +else + eval ac_cv_prog_cc_${ac_cc}_c_o=no +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<\EOF +#define NO_MINUS_C_MINUS_O 1 +EOF + +fi + +if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then + BROKEN_CC= +else + BROKEN_CC=# +fi + + +echo $ac_n "checking that the C compiler understands volatile""... $ac_c" 1>&6 +echo "configure:1018: checking that the C compiler understands volatile" >&5 +if eval "test \"\${samba_cv_volatile+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <<EOF +#line 1024 "configure" +#include "confdefs.h" +#include <sys/types.h> +int main() { +volatile int i = 0 +; return 0; } +EOF +if { (eval echo configure:1031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + samba_cv_volatile=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + samba_cv_volatile=no +fi +rm -f conftest* +fi + +echo "$ac_t""$samba_cv_volatile" 1>&6 +if test x"$samba_cv_volatile" = x"yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_VOLATILE 1 +EOF + +fi + + + + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:1055: checking host system type" >&5 +if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then + +# Make sure we can run config.sub. + if $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } + fi + + ac_cv_host_alias=$host + case "$ac_cv_host_alias" in + NONE) + case $nonopt in + NONE) + if ac_cv_host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) ac_cv_host_alias=$nonopt ;; + esac ;; + esac + + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` + ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +else + echo $ac_n "(cached) $ac_c" 1>&6 +fi + +echo "$ac_t""$ac_cv_host" 1>&6 + +host=$ac_cv_host +host_alias=$ac_cv_host_alias +host_cpu=$ac_cv_host_cpu +host_vendor=$ac_cv_host_vendor +host_os=$ac_cv_host_os + + + + + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:1096: checking target system type" >&5 +if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then + +# Make sure we can run config.sub. + if $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } + fi + + ac_cv_target_alias=$target + case "$ac_cv_target_alias" in + NONE) + case $nonopt in + NONE) + ac_cv_target_alias=$host_alias ;; + + *) ac_cv_target_alias=$nonopt ;; + esac ;; + esac + + ac_cv_target=`$ac_config_sub $ac_cv_target_alias` + ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +else + echo $ac_n "(cached) $ac_c" 1>&6 +fi + +echo "$ac_t""$ac_cv_target" 1>&6 + +target=$ac_cv_target +target_alias=$ac_cv_target_alias +target_cpu=$ac_cv_target_cpu +target_vendor=$ac_cv_target_vendor +target_os=$ac_cv_target_os + + + + + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:1136: checking build system type" >&5 +if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then + +# Make sure we can run config.sub. + if $ac_config_sub sun4 >/dev/null 2>&1; then : + else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } + fi + + ac_cv_build_alias=$build + case "$ac_cv_build_alias" in + NONE) + case $nonopt in + NONE) + ac_cv_build_alias=$host_alias ;; + + *) ac_cv_build_alias=$nonopt ;; + esac ;; + esac + + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` + ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` + ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` + ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +else + echo $ac_n "(cached) $ac_c" 1>&6 +fi + +echo "$ac_t""$ac_cv_build" 1>&6 + +build=$ac_cv_build +build_alias=$ac_cv_build_alias +build_cpu=$ac_cv_build_cpu +build_vendor=$ac_cv_build_vendor +build_os=$ac_cv_build_os + + + + # Do some error checking and defaulting for the host and target type. # The inputs are: @@ -1002,69 +1191,6 @@ NONE---*---* | *---NONE---* | *---*---NONE) ;; *) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; esac - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } -fi - -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1013: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - -echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1034: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$target" 1>&6 - -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1052: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - test "$host_alias" != "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && @@ -1073,7 +1199,7 @@ test "$host_alias" != "$target_alias" && echo $ac_n "checking config.cache system type""... $ac_c" 1>&6 -echo "configure:1077: checking config.cache system type" >&5 +echo "configure:1203: checking config.cache system type" >&5 if { test x"${ac_cv_host_system_type+set}" = x"set" && test x"$ac_cv_host_system_type" != x"$host"; } || { test x"${ac_cv_build_system_type+set}" = x"set" && @@ -1103,8 +1229,8 @@ fi # Extract the first word of "autoconf", so it can be a program name with args. set dummy autoconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1107: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then +echo "configure:1233: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_path_AUTOCONF+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$AUTOCONF" in @@ -1140,8 +1266,8 @@ fi # Extract the first word of "autoheader", so it can be a program name with args. set dummy autoheader; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1144: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AUTOHEADER'+set}'`\" = set"; then +echo "configure:1270: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_path_AUTOHEADER+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else case "$AUTOHEADER" in @@ -1184,8 +1310,8 @@ case "$host_os" in # Try to work out if this is the native HPUX compiler that uses the -Ae flag. *hpux*) echo $ac_n "checking whether ${CC-cc} accepts -Ae""... $ac_c" 1>&6 -echo "configure:1188: checking whether ${CC-cc} accepts -Ae" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_Ae'+set}'`\" = set"; then +echo "configure:1314: checking whether ${CC-cc} accepts -Ae" >&5 +if eval "test \"\${ac_cv_prog_cc_Ae+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -1204,7 +1330,7 @@ echo "$ac_t""$ac_cv_prog_cc_Ae" 1>&6 fi ;; # -# AIX4.x is *so* broken. It doesn't even admit to having large +# AIX4.x doesn't even admit to having large # files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set. # *aix4*) @@ -1213,21 +1339,21 @@ echo "$ac_t""$ac_cv_prog_cc_Ae" 1>&6 esac echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1217: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then +echo "configure:1343: checking for inline" >&5 +if eval "test \"\${ac_cv_c_inline+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1224 "configure" +#line 1350 "configure" #include "confdefs.h" int main() { -} int $ac_kw foo() { +} $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1253,13 +1379,13 @@ EOF esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1257: checking how to run the C preprocessor" >&5 +echo "configure:1383: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then +if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get @@ -1268,13 +1394,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1272 "configure" +#line 1398 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1285,13 +1411,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1289 "configure" +#line 1415 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1302,13 +1428,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1306 "configure" +#line 1432 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1333,12 +1459,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1337: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +echo "configure:1463: checking for ANSI C header files" >&5 +if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1342 "configure" +#line 1468 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1346,7 +1472,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1363,7 +1489,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1367 "configure" +#line 1493 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1381,7 +1507,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1385 "configure" +#line 1511 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1402,7 +1528,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1406 "configure" +#line 1532 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1413,7 +1539,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1441,12 +1567,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1445: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then +echo "configure:1571: checking for $ac_hdr that defines DIR" >&5 +if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1450 "configure" +#line 1576 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1454,7 +1580,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1479,15 +1605,15 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1483: checking for opendir in -ldir" >&5 +echo "configure:1609: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1491 "configure" +#line 1617 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1498,7 +1624,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1520,15 +1646,15 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1524: checking for opendir in -lx" >&5 +echo "configure:1650: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1532 "configure" +#line 1658 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1539,7 +1665,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1562,12 +1688,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1566: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then +echo "configure:1692: checking whether time.h and sys/time.h may both be included" >&5 +if eval "test \"\${ac_cv_header_time+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1571 "configure" +#line 1697 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1576,7 +1702,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1597,12 +1723,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1601: checking for sys/wait.h that is POSIX.1 compatible" >&5 -if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then +echo "configure:1727: checking for sys/wait.h that is POSIX.1 compatible" >&5 +if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1606 "configure" +#line 1732 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -1618,7 +1744,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1638,21 +1764,21 @@ EOF fi -for ac_hdr in sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h +for ac_hdr in arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1646: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1772: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1651 "configure" +#line 1777 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1682,17 +1808,17 @@ for ac_hdr in sys/param.h ctype.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1686: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1812: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1691 "configure" +#line 1817 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1722,17 +1848,17 @@ for ac_hdr in unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1726: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1852: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1731 "configure" +#line 1857 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1762,17 +1888,17 @@ for ac_hdr in compat.h rpc/rpc.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ct do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1766: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1892: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1771 "configure" +#line 1897 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1802,17 +1928,17 @@ for ac_hdr in sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h sys/mman.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1806: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1932: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1811 "configure" +#line 1937 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1842,17 +1968,17 @@ for ac_hdr in sys/filio.h string.h strings.h stdlib.h sys/socket.h sys/un.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1846: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:1972: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1851 "configure" +#line 1977 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1882,17 +2008,17 @@ for ac_hdr in sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1886: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2012: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1891 "configure" +#line 2017 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1922,17 +2048,17 @@ for ac_hdr in sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1926: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2052: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1931 "configure" +#line 2057 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1958,21 +2084,22 @@ else fi done +# for ac_hdr in shadow.h netinet/tcp.h sys/security.h security/pam_appl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1966: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2093: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1971 "configure" +#line 2098 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2002,17 +2129,17 @@ for ac_hdr in stropts.h poll.h readline.h history.h readline/readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2006: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2133: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2011 "configure" +#line 2138 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2042,17 +2169,17 @@ for ac_hdr in readline/history.h sys/capability.h syscall.h sys/syscall.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2046: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2173: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2051 "configure" +#line 2178 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2078,21 +2205,103 @@ else fi done -for ac_hdr in sys/acl.h sys/cdefs.h glob.h mysql.h +for ac_hdr in sys/acl.h sys/cdefs.h glob.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2086: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo "configure:2213: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2091 "configure" +#line 2218 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +for ac_hdr in mysql.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2253: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2258 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF +#define $ac_tr_hdr 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + + +# For experimental utmp support +for ac_hdr in utmp.h utmpx.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:2295: checking for $ac_hdr" >&5 +if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 2300 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2120,15 +2329,15 @@ done echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2124: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then +echo "configure:2333: checking size of int" >&5 +if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_sizeof_int=cross else cat > conftest.$ac_ext <<EOF -#line 2132 "configure" +#line 2341 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2139,7 +2348,7 @@ main() exit(0); } EOF -if { (eval echo configure:2143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2159,15 +2368,15 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2163: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then +echo "configure:2372: checking size of long" >&5 +if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_sizeof_long=cross else cat > conftest.$ac_ext <<EOF -#line 2171 "configure" +#line 2380 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2178,7 +2387,7 @@ main() exit(0); } EOF -if { (eval echo configure:2182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2198,15 +2407,15 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2202: checking size of short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then +echo "configure:2411: checking size of short" >&5 +if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_sizeof_short=cross else cat > conftest.$ac_ext <<EOF -#line 2210 "configure" +#line 2419 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2217,7 +2426,7 @@ main() exit(0); } EOF -if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2238,18 +2447,18 @@ EOF echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2242: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then +echo "configure:2451: checking for working const" >&5 +if eval "test \"\${ac_cv_c_const+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2247 "configure" +#line 2456 "configure" #include "confdefs.h" int main() { /* Ultrix mips cc rejects this. */ -typedef int charset[2]; const charset x = {0,0}; +typedef int charset[2]; const charset x; /* SunOS 4.1.1 cc rejects this. */ char const *const *ccp; char **p; @@ -2292,7 +2501,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2313,21 +2522,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2317: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then +echo "configure:2526: checking for inline" >&5 +if eval "test \"\${ac_cv_c_inline+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 2324 "configure" +#line 2533 "configure" #include "confdefs.h" int main() { -} int $ac_kw foo() { +} $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:2331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2353,14 +2562,14 @@ EOF esac echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2357: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then +echo "configure:2566: checking whether byte ordering is bigendian" >&5 +if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2364 "configure" +#line 2573 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2371,11 +2580,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2379 "configure" +#line 2588 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2386,7 +2595,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2406,7 +2615,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2410 "configure" +#line 2619 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2419,7 +2628,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2443,14 +2652,14 @@ EOF fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:2447: checking whether char is unsigned" >&5 -if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then +echo "configure:2656: checking whether char is unsigned" >&5 +if eval "test \"\${ac_cv_c_char_unsigned+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <<EOF -#line 2454 "configure" +#line 2663 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -2472,7 +2681,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2476 "configure" +#line 2685 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -2482,7 +2691,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -2578,8 +2787,8 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2582: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then +echo "configure:2791: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then @@ -2617,7 +2826,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2621: checking for ld used by GCC" >&5 +echo "configure:2830: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -2641,12 +2850,12 @@ echo "configure:2621: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2645: checking for GNU ld" >&5 +echo "configure:2854: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2648: checking for non-GNU ld" >&5 +echo "configure:2857: checking for non-GNU ld" >&5 fi -if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then +if eval "test \"\${ac_cv_path_LD+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then @@ -2679,8 +2888,8 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2683: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then +echo "configure:2892: checking if the linker ($LD) is GNU ld" >&5 +if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -2695,8 +2904,8 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2699: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then +echo "configure:2908: checking for BSD-compatible nm" >&5 +if eval "test \"\${ac_cv_path_NM+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$NM"; then @@ -2731,8 +2940,8 @@ NM="$ac_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2735: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then +echo "configure:2944: checking whether ln -s works" >&5 +if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftestdata @@ -2780,8 +2989,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2784 "configure"' > conftest.$ac_ext - if { (eval echo configure:2785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2993 "configure"' > conftest.$ac_ext + if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -2802,19 +3011,19 @@ case "$lt_target" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2806: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then +echo "configure:3015: checking whether the C compiler needs -belf" >&5 +if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2811 "configure" +#line 3020 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2898,7 +3107,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ # Reload cache, that may have been modified by ltconfig if test -r "$cache_file"; then echo "loading cache $cache_file" - . $cache_file + test -f "$cache_file" && . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -2918,12 +3127,12 @@ exec 5>>./config.log echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2922: checking return type of signal handlers" >&5 -if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then +echo "configure:3131: checking return type of signal handlers" >&5 +if eval "test \"\${ac_cv_type_signal+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2927 "configure" +#line 3136 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2940,7 +3149,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2959,12 +3168,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2963: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then +echo "configure:3172: checking for uid_t in sys/types.h" >&5 +if eval "test \"\${ac_cv_type_uid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2968 "configure" +#line 3177 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -2993,12 +3202,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2997: checking for mode_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then +echo "configure:3206: checking for mode_t" >&5 +if eval "test \"\${ac_cv_type_mode_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3002 "configure" +#line 3211 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3009,29 +3218,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_mode_t=yes + eval "ac_cv_type_mode_t=yes" else rm -rf conftest* - ac_cv_type_mode_t=no + eval "ac_cv_type_mode_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -if test $ac_cv_type_mode_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'mode_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define mode_t int EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3030: checking for off_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then +echo "configure:3241: checking for off_t" >&5 +if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3035 "configure" +#line 3246 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3042,29 +3253,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_off_t=yes + eval "ac_cv_type_off_t=yes" else rm -rf conftest* - ac_cv_type_off_t=no + eval "ac_cv_type_off_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define off_t long EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3063: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then +echo "configure:3276: checking for size_t" >&5 +if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3068 "configure" +#line 3281 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3075,29 +3288,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_size_t=yes + eval "ac_cv_type_size_t=yes" else rm -rf conftest* - ac_cv_type_size_t=no + eval "ac_cv_type_size_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define size_t unsigned EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3096: checking for pid_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then +echo "configure:3311: checking for pid_t" >&5 +if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3101 "configure" +#line 3316 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3108,50 +3323,53 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_pid_t=yes + eval "ac_cv_type_pid_t=yes" else rm -rf conftest* - ac_cv_type_pid_t=no + eval "ac_cv_type_pid_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'pid_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define pid_t int EOF fi -echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:3129: checking for st_rdev in struct stat" >&5 -if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then +echo $ac_n "checking for member st_rdev in aggregate type struct stat""... $ac_c" 1>&6 +echo "configure:3346: checking for member st_rdev in aggregate type struct stat" >&5 +if eval "test \"\${ac_cv_c_struct_member_st_rdev+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3134 "configure" +#line 3351 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> int main() { -struct stat s; s.st_rdev; +struct stat foo; foo.st_rdev; ; return 0; } EOF -if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_struct_st_rdev=yes + ac_cv_c_struct_member_st_rdev=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_struct_st_rdev=no + ac_cv_c_struct_member_st_rdev=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6 -if test $ac_cv_struct_st_rdev = yes; then +echo "$ac_t""$ac_cv_c_struct_member_st_rdev" 1>&6 +st_rdev="$ac_cv_c_struct_member_st_rdev" +if test $ac_cv_c_struct_member_st_rdev = yes; then cat >> confdefs.h <<\EOF #define HAVE_ST_RDEV 1 EOF @@ -3159,12 +3377,12 @@ EOF fi echo $ac_n "checking for d_off in dirent""... $ac_c" 1>&6 -echo "configure:3163: checking for d_off in dirent" >&5 -if eval "test \"`echo '$''{'ac_cv_dirent_d_off'+set}'`\" = set"; then +echo "configure:3381: checking for d_off in dirent" >&5 +if eval "test \"\${ac_cv_dirent_d_off+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3168 "configure" +#line 3386 "configure" #include "confdefs.h" #include <unistd.h> @@ -3174,7 +3392,7 @@ int main() { struct dirent d; d.d_off; ; return 0; } EOF -if { (eval echo configure:3178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_dirent_d_off=yes else @@ -3195,12 +3413,12 @@ EOF fi echo $ac_n "checking for ino_t""... $ac_c" 1>&6 -echo "configure:3199: checking for ino_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then +echo "configure:3417: checking for ino_t" >&5 +if eval "test \"\${ac_cv_type_ino_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3204 "configure" +#line 3422 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3211,29 +3429,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])ino_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_ino_t=yes + eval "ac_cv_type_ino_t=yes" else rm -rf conftest* - ac_cv_type_ino_t=no + eval "ac_cv_type_ino_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_ino_t" 1>&6 -if test $ac_cv_type_ino_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'ino_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define ino_t unsigned EOF fi echo $ac_n "checking for loff_t""... $ac_c" 1>&6 -echo "configure:3232: checking for loff_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then +echo "configure:3452: checking for loff_t" >&5 +if eval "test \"\${ac_cv_type_loff_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3237 "configure" +#line 3457 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3244,29 +3464,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])loff_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_loff_t=yes + eval "ac_cv_type_loff_t=yes" else rm -rf conftest* - ac_cv_type_loff_t=no + eval "ac_cv_type_loff_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_loff_t" 1>&6 -if test $ac_cv_type_loff_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'loff_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define loff_t off_t EOF fi echo $ac_n "checking for offset_t""... $ac_c" 1>&6 -echo "configure:3265: checking for offset_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_offset_t'+set}'`\" = set"; then +echo "configure:3487: checking for offset_t" >&5 +if eval "test \"\${ac_cv_type_offset_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3270 "configure" +#line 3492 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3277,29 +3499,31 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])offset_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_offset_t=yes + eval "ac_cv_type_offset_t=yes" else rm -rf conftest* - ac_cv_type_offset_t=no + eval "ac_cv_type_offset_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_offset_t" 1>&6 -if test $ac_cv_type_offset_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'offset_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define offset_t loff_t EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3298: checking for ssize_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then +echo "configure:3522: checking for ssize_t" >&5 +if eval "test \"\${ac_cv_type_ssize_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3303 "configure" +#line 3527 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3310,38 +3534,125 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - ac_cv_type_ssize_t=yes + eval "ac_cv_type_ssize_t=yes" else rm -rf conftest* - ac_cv_type_ssize_t=no + eval "ac_cv_type_ssize_t=no" fi rm -f conftest* fi -echo "$ac_t""$ac_cv_type_ssize_t" 1>&6 -if test $ac_cv_type_ssize_t = no; then - cat >> confdefs.h <<\EOF +if eval "test \"`echo '$ac_cv_type_'ssize_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF #define ssize_t int EOF fi +echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 +echo "configure:3557: checking for wchar_t" >&5 +if eval "test \"\${ac_cv_type_wchar_t+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 3562 "configure" +#include "confdefs.h" +#include <sys/types.h> +#if STDC_HEADERS +#include <stdlib.h> +#include <stddef.h> +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])wchar_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + eval "ac_cv_type_wchar_t=yes" +else + rm -rf conftest* + eval "ac_cv_type_wchar_t=no" +fi +rm -f conftest* + +fi +if eval "test \"`echo '$ac_cv_type_'wchar_t`\" = yes"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 + cat >> confdefs.h <<EOF +#define wchar_t unsigned short +EOF + +fi + + +# we need libcups for CUPS support... +echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6 +echo "configure:3594: checking for httpConnect in -lcups" >&5 +ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'` +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lcups $LIBS" +cat > conftest.$ac_ext <<EOF +#line 3602 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char httpConnect(); + +int main() { +httpConnect() +; return 0; } +EOF +if { (eval echo configure:3613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo cups | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF + + LIBS="-lcups $LIBS" + +else + echo "$ac_t""no" 1>&6 +fi + + echo $ac_n "checking for errno in errno.h""... $ac_c" 1>&6 -echo "configure:3332: checking for errno in errno.h" >&5 -if eval "test \"`echo '$''{'samba_cv_errno'+set}'`\" = set"; then +echo "configure:3643: checking for errno in errno.h" >&5 +if eval "test \"\${samba_cv_errno+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3338 "configure" +#line 3649 "configure" #include "confdefs.h" #include <errno.h> int main() { int i = errno ; return 0; } EOF -if { (eval echo configure:3345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_errno=yes else @@ -3363,20 +3674,20 @@ fi # stupid glibc has the functions but no declaration. grrrr. echo $ac_n "checking for setresuid declaration""... $ac_c" 1>&6 -echo "configure:3367: checking for setresuid declaration" >&5 -if eval "test \"`echo '$''{'samba_cv_have_setresuid_decl'+set}'`\" = set"; then +echo "configure:3678: checking for setresuid declaration" >&5 +if eval "test \"\${samba_cv_have_setresuid_decl+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3373 "configure" +#line 3684 "configure" #include "confdefs.h" #include <unistd.h> int main() { int i = (int)setresuid ; return 0; } EOF -if { (eval echo configure:3380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_have_setresuid_decl=yes else @@ -3398,20 +3709,20 @@ fi # stupid glibc has the functions but no declaration. grrrr. echo $ac_n "checking for crypt declaration""... $ac_c" 1>&6 -echo "configure:3402: checking for crypt declaration" >&5 -if eval "test \"`echo '$''{'samba_cv_have_crypt_decl'+set}'`\" = set"; then +echo "configure:3713: checking for crypt declaration" >&5 +if eval "test \"\${samba_cv_have_crypt_decl+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3408 "configure" +#line 3719 "configure" #include "confdefs.h" #include <unistd.h> int main() { int i = (int)crypt ; return 0; } EOF -if { (eval echo configure:3415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_have_crypt_decl=yes else @@ -3434,8 +3745,8 @@ fi # and glibc has setresuid under linux but the function does # nothing until kernel 2.1.44! very dumb. echo $ac_n "checking for real setresuid""... $ac_c" 1>&6 -echo "configure:3438: checking for real setresuid" >&5 -if eval "test \"`echo '$''{'samba_cv_have_setresuid'+set}'`\" = set"; then +echo "configure:3749: checking for real setresuid" >&5 +if eval "test \"\${samba_cv_have_setresuid+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3443,12 +3754,12 @@ else samba_cv_have_setresuid=cross else cat > conftest.$ac_ext <<EOF -#line 3447 "configure" +#line 3758 "configure" #include "confdefs.h" #include <errno.h> main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);} EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_have_setresuid=yes else @@ -3471,15 +3782,15 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3475: checking for 8-bit clean memcmp" >&5 -if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then +echo "configure:3786: checking for 8-bit clean memcmp" >&5 +if eval "test \"\${ac_cv_func_memcmp_clean+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 3483 "configure" +#line 3794 "configure" #include "confdefs.h" main() @@ -3489,7 +3800,7 @@ main() } EOF -if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3512,12 +3823,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3516: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:3827: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3521 "configure" +#line 3832 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3526,6 +3837,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -3535,12 +3847,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:3544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3566,15 +3878,15 @@ done if test x"$ac_cv_func_crypt" = x"no"; then echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:3570: checking for crypt in -lcrypt" >&5 +echo "configure:3882: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 3578 "configure" +#line 3890 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3585,7 +3897,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3617,22 +3929,22 @@ fi # might need libdl for this to work if test "$ac_cv_header_security_pam_appl_h" = "yes"; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3621: checking for main in -ldl" >&5 +echo "configure:3933: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3629 "configure" +#line 3941 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3663,12 +3975,12 @@ fi for ac_func in pam_authenticate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3667: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:3979: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3672 "configure" +#line 3984 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3677,6 +3989,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -3686,12 +3999,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:3695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3717,15 +4030,15 @@ done if test x"$ac_cv_func_pam_authenticate" = x"no"; then echo $ac_n "checking for pam_authenticate in -lpam""... $ac_c" 1>&6 -echo "configure:3721: checking for pam_authenticate in -lpam" >&5 +echo "configure:4034: checking for pam_authenticate in -lpam" >&5 ac_lib_var=`echo pam'_'pam_authenticate | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lpam $LIBS" cat > conftest.$ac_ext <<EOF -#line 3729 "configure" +#line 4042 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3736,7 +4049,7 @@ int main() { pam_authenticate() ; return 0; } EOF -if { (eval echo configure:3740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3769,12 +4082,12 @@ if test "$ac_cv_header_readline_h" = "yes" || for ac_func in tputs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3773: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4086: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3778 "configure" +#line 4091 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3783,6 +4096,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -3792,12 +4106,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3822,15 +4136,15 @@ fi done echo $ac_n "checking for tputs in -lcurses""... $ac_c" 1>&6 -echo "configure:3826: checking for tputs in -lcurses" >&5 +echo "configure:4140: checking for tputs in -lcurses" >&5 ac_lib_var=`echo curses'_'tputs | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3834 "configure" +#line 4148 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3841,7 +4155,7 @@ int main() { tputs() ; return 0; } EOF -if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3862,15 +4176,15 @@ else fi echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:3866: checking for readline in -lreadline" >&5 +echo "configure:4180: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 3874 "configure" +#line 4188 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3881,7 +4195,7 @@ int main() { readline() ; return 0; } EOF -if { (eval echo configure:3885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3909,13 +4223,13 @@ else fi echo $ac_n "checking for filename_completion_function proto""... $ac_c" 1>&6 -echo "configure:3913: checking for filename_completion_function proto" >&5 -if eval "test \"`echo '$''{'samba_cv_have_fcf_proto'+set}'`\" = set"; then +echo "configure:4227: checking for filename_completion_function proto" >&5 +if eval "test \"\${samba_cv_have_fcf_proto+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3919 "configure" +#line 4233 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_READLINE_H @@ -3927,7 +4241,7 @@ int main() { filename_completion_function ; return 0; } EOF -if { (eval echo configure:3931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_have_fcf_proto=yes else @@ -3948,6 +4262,7 @@ EOF fi fi + # The following test taken from the cvs sources # If we can't find connect, try looking in -lsocket, -lnsl, and -linet. # The Irix 5 libc.so has connect and gethostbyname, but Irix 5 also has @@ -3957,12 +4272,12 @@ fi for ac_func in connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3961: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4276: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3966 "configure" +#line 4281 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3971,6 +4286,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -3980,12 +4296,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4013,15 +4329,15 @@ if test x"$ac_cv_func_connect" = x"no"; then case "$LIBS" in *-lnsl*) ;; *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6 -echo "configure:4017: checking for printf in -lnsl_s" >&5 +echo "configure:4333: checking for printf in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 4025 "configure" +#line 4341 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4032,7 +4348,7 @@ int main() { printf() ; return 0; } EOF -if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4063,15 +4379,15 @@ fi case "$LIBS" in *-lnsl*) ;; *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6 -echo "configure:4067: checking for printf in -lnsl" >&5 +echo "configure:4383: checking for printf in -lnsl" >&5 ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4075 "configure" +#line 4391 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4082,7 +4398,7 @@ int main() { printf() ; return 0; } EOF -if { (eval echo configure:4086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4113,15 +4429,15 @@ fi case "$LIBS" in *-lsocket*) ;; *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4117: checking for connect in -lsocket" >&5 +echo "configure:4433: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 4125 "configure" +#line 4441 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4132,7 +4448,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4163,15 +4479,15 @@ fi case "$LIBS" in *-linet*) ;; *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6 -echo "configure:4167: checking for connect in -linet" >&5 +echo "configure:4483: checking for connect in -linet" >&5 ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 4175 "configure" +#line 4491 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4182,7 +4498,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4221,16 +4537,78 @@ EOF fi fi +# Check if we have execl, if not we need to compile smbrun. +for ac_func in execl +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:4545: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 4550 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:4574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + +if test x"$ac_cv_func_execl" = x"no"; then + RUNPROG="bin/smbrun" +else + RUNPROG="" +fi for ac_func in waitpid getcwd strdup strtoul strerror chown chmod chroot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4229: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4607: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4234 "configure" +#line 4612 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4239,6 +4617,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4248,12 +4627,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4280,12 +4659,12 @@ done for ac_func in fstat strchr utime utimes getrlimit fsync execl bzero memset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4284: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4663: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4289 "configure" +#line 4668 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4294,6 +4673,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4303,12 +4683,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4335,12 +4715,12 @@ done for ac_func in memmove vsnprintf snprintf setsid glob strpbrk pipe crypt16 getauthuid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4339: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4719: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4344 "configure" +#line 4724 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4349,6 +4729,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4358,12 +4739,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4390,12 +4771,12 @@ done for ac_func in strftime sigprocmask sigblock sigaction innetgr setnetgrent getnetgrent endnetgrent do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4394: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4775: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4399 "configure" +#line 4780 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4404,6 +4785,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4413,12 +4795,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4445,12 +4827,12 @@ done for ac_func in initgroups select rdchk getgrnam pathconf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4449: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4831: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4454 "configure" +#line 4836 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4459,6 +4841,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4468,12 +4851,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4500,12 +4883,12 @@ done for ac_func in setuidx setgroups mktime rename ftruncate stat64 fstat64 lstat64 fopen64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4504: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4887: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4509 "configure" +#line 4892 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4514,6 +4897,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4523,12 +4907,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4555,12 +4939,12 @@ done for ac_func in atexit grantpt dup2 lseek64 ftruncate64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4559: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4943: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4564 "configure" +#line 4948 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4569,6 +4953,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4578,12 +4963,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4610,12 +4995,12 @@ done for ac_func in fseek64 ftell64 setluid yp_get_default_domain getpwanam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4614: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:4999: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4619 "configure" +#line 5004 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4624,6 +5009,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4633,12 +5019,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4665,12 +5051,12 @@ done for ac_func in srandom random srand rand setenv mmap64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4669: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5055: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4674 "configure" +#line 5060 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4679,6 +5065,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4688,12 +5075,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4721,12 +5108,12 @@ done for ac_func in syscall do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4725: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5112: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4730 "configure" +#line 5117 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4735,6 +5122,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4744,12 +5132,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4777,12 +5165,12 @@ done for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4781: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5169: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4786 "configure" +#line 5174 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4791,6 +5179,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4800,12 +5189,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4832,12 +5221,12 @@ done for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4836: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5225: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4841 "configure" +#line 5230 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4846,6 +5235,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4855,12 +5245,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4887,12 +5277,12 @@ done for ac_func in __getcwd _getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4891: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5281: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4896 "configure" +#line 5286 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4901,6 +5291,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4910,12 +5301,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4942,12 +5333,12 @@ done for ac_func in __xstat __fxstat __lxstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4946: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5337: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4951 "configure" +#line 5342 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4956,6 +5347,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -4965,12 +5357,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4997,12 +5389,12 @@ done for ac_func in _stat _lstat _fstat __stat __lstat __fstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5001: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5393: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5006 "configure" +#line 5398 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5011,6 +5403,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5020,12 +5413,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5052,12 +5445,12 @@ done for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5056: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5449: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5061 "configure" +#line 5454 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5066,6 +5459,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5075,12 +5469,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5107,12 +5501,12 @@ done for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5111: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5505: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5116 "configure" +#line 5510 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5121,6 +5515,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5130,12 +5525,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5162,12 +5557,12 @@ done for ac_func in getdents _getdents __getdents _lseek __lseek _read __read do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5166: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5561: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5171 "configure" +#line 5566 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5176,6 +5571,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5185,12 +5581,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5217,12 +5613,12 @@ done for ac_func in _write __write _fork __fork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5221: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5617: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5226 "configure" +#line 5622 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5231,6 +5627,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5240,12 +5637,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5272,12 +5669,12 @@ done for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5276: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5673: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5281 "configure" +#line 5678 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5286,6 +5683,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5295,12 +5693,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5327,12 +5725,12 @@ done for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5331: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5729: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5336 "configure" +#line 5734 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5341,6 +5739,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5350,12 +5749,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5382,12 +5781,12 @@ done for ac_func in pread _pread __pread pread64 _pread64 __pread64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5386: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5785: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5391 "configure" +#line 5790 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5396,6 +5795,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5405,12 +5805,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5437,12 +5837,12 @@ done for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5441: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5841: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5446 "configure" +#line 5846 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5451,6 +5851,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5460,12 +5861,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5492,12 +5893,12 @@ done for ac_func in open64 _open64 __open64 creat64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5496: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5897: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5501 "configure" +#line 5902 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5506,6 +5907,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5515,12 +5917,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5555,12 +5957,12 @@ case "$LIBS" in *-lsecurity*) for ac_func in putprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5559: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:5961: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5564 "configure" +#line 5966 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5569,6 +5971,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5578,12 +5981,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5608,15 +6011,15 @@ fi done ;; *) echo $ac_n "checking for putprpwnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:5612: checking for putprpwnam in -lsecurity" >&5 +echo "configure:6015: checking for putprpwnam in -lsecurity" >&5 ac_lib_var=`echo security'_'putprpwnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <<EOF -#line 5620 "configure" +#line 6023 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5627,7 +6030,7 @@ int main() { putprpwnam() ; return 0; } EOF -if { (eval echo configure:5631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5657,12 +6060,12 @@ fi for ac_func in putprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5661: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6064: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5666 "configure" +#line 6069 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5671,6 +6074,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5680,12 +6084,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5716,12 +6120,12 @@ case "$LIBS" in *-lsec*) for ac_func in putprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5720: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6124: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5725 "configure" +#line 6129 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5730,6 +6134,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5739,12 +6144,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5769,15 +6174,15 @@ fi done ;; *) echo $ac_n "checking for putprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:5773: checking for putprpwnam in -lsec" >&5 +echo "configure:6178: checking for putprpwnam in -lsec" >&5 ac_lib_var=`echo sec'_'putprpwnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <<EOF -#line 5781 "configure" +#line 6186 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5788,7 +6193,7 @@ int main() { putprpwnam() ; return 0; } EOF -if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5818,12 +6223,12 @@ fi for ac_func in putprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5822: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6227: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5827 "configure" +#line 6232 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5832,6 +6237,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5841,12 +6247,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5878,12 +6284,12 @@ case "$LIBS" in *-lsecurity*) for ac_func in set_auth_parameters do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5882: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6288: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5887 "configure" +#line 6293 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5892,6 +6298,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -5901,12 +6308,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5931,15 +6338,15 @@ fi done ;; *) echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6 -echo "configure:5935: checking for set_auth_parameters in -lsecurity" >&5 +echo "configure:6342: checking for set_auth_parameters in -lsecurity" >&5 ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <<EOF -#line 5943 "configure" +#line 6350 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5950,7 +6357,7 @@ int main() { set_auth_parameters() ; return 0; } EOF -if { (eval echo configure:5954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5980,12 +6387,12 @@ fi for ac_func in set_auth_parameters do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5984: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6391: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5989 "configure" +#line 6396 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5994,6 +6401,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6003,12 +6411,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6039,12 +6447,12 @@ case "$LIBS" in *-lsec*) for ac_func in set_auth_parameters do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6043: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6451: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6048 "configure" +#line 6456 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6053,6 +6461,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6062,12 +6471,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6092,15 +6501,15 @@ fi done ;; *) echo $ac_n "checking for set_auth_parameters in -lsec""... $ac_c" 1>&6 -echo "configure:6096: checking for set_auth_parameters in -lsec" >&5 +echo "configure:6505: checking for set_auth_parameters in -lsec" >&5 ac_lib_var=`echo sec'_'set_auth_parameters | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <<EOF -#line 6104 "configure" +#line 6513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6111,7 +6520,7 @@ int main() { set_auth_parameters() ; return 0; } EOF -if { (eval echo configure:6115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6141,12 +6550,12 @@ fi for ac_func in set_auth_parameters do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6145: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6554: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6150 "configure" +#line 6559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6155,6 +6564,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6164,12 +6574,177 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + + ;; + esac + + +# UnixWare 7.x has its getspnam in -lgen +case "$LIBS" in + *-lgen*) for ac_func in getspnam +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:6616: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 6621 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:6645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <<EOF +#define $ac_tr_func 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi +done + ;; + *) echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6 +echo "configure:6670: checking for getspnam in -lgen" >&5 +ac_lib_var=`echo gen'_'getspnam | sed 'y%./+-%__p_%'` +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lgen $LIBS" +cat > conftest.$ac_ext <<EOF +#line 6678 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getspnam(); + +int main() { +getspnam() +; return 0; } +EOF +if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo gen | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <<EOF +#define $ac_tr_lib 1 +EOF + + LIBS="-lgen $LIBS" + +else + echo "$ac_t""no" 1>&6 +fi + + for ac_func in getspnam +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:6719: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 6724 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include <assert.h> +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:6748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6201,12 +6776,12 @@ case "$LIBS" in *-lsecurity*) for ac_func in getspnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6205: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6780: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6210 "configure" +#line 6785 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6215,6 +6790,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6224,12 +6800,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6254,15 +6830,15 @@ fi done ;; *) echo $ac_n "checking for getspnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:6258: checking for getspnam in -lsecurity" >&5 +echo "configure:6834: checking for getspnam in -lsecurity" >&5 ac_lib_var=`echo security'_'getspnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <<EOF -#line 6266 "configure" +#line 6842 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6273,7 +6849,7 @@ int main() { getspnam() ; return 0; } EOF -if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6303,12 +6879,12 @@ fi for ac_func in getspnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6307: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6883: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6312 "configure" +#line 6888 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6317,6 +6893,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6326,12 +6903,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6362,12 +6939,12 @@ case "$LIBS" in *-lsec*) for ac_func in getspnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6366: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:6943: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6371 "configure" +#line 6948 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6376,6 +6953,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6385,12 +6963,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6415,15 +6993,15 @@ fi done ;; *) echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6 -echo "configure:6419: checking for getspnam in -lsec" >&5 +echo "configure:6997: checking for getspnam in -lsec" >&5 ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <<EOF -#line 6427 "configure" +#line 7005 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6434,7 +7012,7 @@ int main() { getspnam() ; return 0; } EOF -if { (eval echo configure:6438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6464,12 +7042,12 @@ fi for ac_func in getspnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6468: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7046: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6473 "configure" +#line 7051 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6478,6 +7056,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6487,12 +7066,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6524,12 +7103,12 @@ case "$LIBS" in *-lsecurity*) for ac_func in bigcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6528: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7107: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6533 "configure" +#line 7112 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6538,6 +7117,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6547,12 +7127,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6577,15 +7157,15 @@ fi done ;; *) echo $ac_n "checking for bigcrypt in -lsecurity""... $ac_c" 1>&6 -echo "configure:6581: checking for bigcrypt in -lsecurity" >&5 +echo "configure:7161: checking for bigcrypt in -lsecurity" >&5 ac_lib_var=`echo security'_'bigcrypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <<EOF -#line 6589 "configure" +#line 7169 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6596,7 +7176,7 @@ int main() { bigcrypt() ; return 0; } EOF -if { (eval echo configure:6600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6626,12 +7206,12 @@ fi for ac_func in bigcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6630: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7210: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6635 "configure" +#line 7215 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6640,6 +7220,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6649,12 +7230,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6685,12 +7266,12 @@ case "$LIBS" in *-lsec*) for ac_func in bigcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6689: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7270: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6694 "configure" +#line 7275 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6699,6 +7280,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6708,12 +7290,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6738,15 +7320,15 @@ fi done ;; *) echo $ac_n "checking for bigcrypt in -lsec""... $ac_c" 1>&6 -echo "configure:6742: checking for bigcrypt in -lsec" >&5 +echo "configure:7324: checking for bigcrypt in -lsec" >&5 ac_lib_var=`echo sec'_'bigcrypt | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <<EOF -#line 6750 "configure" +#line 7332 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6757,7 +7339,7 @@ int main() { bigcrypt() ; return 0; } EOF -if { (eval echo configure:6761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6787,12 +7369,12 @@ fi for ac_func in bigcrypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6791: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7373: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6796 "configure" +#line 7378 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6801,6 +7383,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6810,12 +7393,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6847,12 +7430,12 @@ case "$LIBS" in *-lsecurity*) for ac_func in getprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6851: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7434: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6856 "configure" +#line 7439 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6861,6 +7444,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6870,12 +7454,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6900,15 +7484,15 @@ fi done ;; *) echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6 -echo "configure:6904: checking for getprpwnam in -lsecurity" >&5 +echo "configure:7488: checking for getprpwnam in -lsecurity" >&5 ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsecurity $LIBS" cat > conftest.$ac_ext <<EOF -#line 6912 "configure" +#line 7496 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6919,7 +7503,7 @@ int main() { getprpwnam() ; return 0; } EOF -if { (eval echo configure:6923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6949,12 +7533,12 @@ fi for ac_func in getprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6953: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7537: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6958 "configure" +#line 7542 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6963,6 +7547,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -6972,12 +7557,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7008,12 +7593,12 @@ case "$LIBS" in *-lsec*) for ac_func in getprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7012: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7597: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7017 "configure" +#line 7602 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7022,6 +7607,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -7031,12 +7617,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:7040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7061,15 +7647,15 @@ fi done ;; *) echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6 -echo "configure:7065: checking for getprpwnam in -lsec" >&5 +echo "configure:7651: checking for getprpwnam in -lsec" >&5 ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsec $LIBS" cat > conftest.$ac_ext <<EOF -#line 7073 "configure" +#line 7659 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7080,7 +7666,7 @@ int main() { getprpwnam() ; return 0; } EOF -if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7110,12 +7696,12 @@ fi for ac_func in getprpwnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7114: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo "configure:7700: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7119 "configure" +#line 7705 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7124,6 +7710,7 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); +char (*f)(); int main() { @@ -7133,12 +7720,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -$ac_func(); +f = $ac_func; #endif ; return 0; } EOF -if { (eval echo configure:7142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7173,6 +7760,8 @@ done # these are the defaults, good for lots of systems HOST_OS="$host_os" LDSHFLAGS="-shared" +PICFLAG="" +SHLIBEXT="so" # and these are for particular systems case "$host_os" in @@ -7199,13 +7788,6 @@ EOF EOF ATTEMPT_WRAP32_BUILD=yes - ATTEMPT_LIBSMB32_BUILD=yes - ATTEMPT_LIBSURS32_BUILD=yes - ATTEMPT_LIBSMBPW32_BUILD=yes - ATTEMPT_LIBNMB32_BUILD=yes - ATTEMPT_LIBSAMBA32_BUILD=yes - ATTEMPT_LIBUBIQX32_BUILD=yes - ATTEMPT_LIBMSRPC32_BUILD=yes ;; *aix*) cat >> confdefs.h <<\EOF #define AIX 1 @@ -7214,7 +7796,8 @@ EOF *hpux*) cat >> confdefs.h <<\EOF #define HPUX 1 EOF -;; + + ;; *qnx*) cat >> confdefs.h <<\EOF #define QNX 1 EOF @@ -7234,8 +7817,8 @@ EOF *dgux*) # Extract the first word of "groff", so it can be a program name with args. set dummy groff; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7238: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_ROFF'+set}'`\" = set"; then +echo "configure:7821: checking for $ac_word" >&5 +if eval "test \"\${ac_cv_prog_ROFF+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$ROFF"; then @@ -7261,15 +7844,15 @@ else fi ;; *sysv4.2*) echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:7265: checking for strcasecmp in -lresolv" >&5 +echo "configure:7848: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 7273 "configure" +#line 7856 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7280,7 +7863,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:7284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7310,10 +7893,9 @@ fi esac # try to work out how to produce pic code with this compiler -PICFLAG="" echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6 -echo "configure:7316: checking whether ${CC-cc} accepts -fpic" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_fpic'+set}'`\" = set"; then +echo "configure:7898: checking whether ${CC-cc} accepts -fpic" >&5 +if eval "test \"\${ac_cv_prog_cc_fpic+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -7328,12 +7910,12 @@ fi echo "$ac_t""$ac_cv_prog_cc_fpic" 1>&6 if test $ac_cv_prog_cc_fpic = yes; then - PICFLAG="-fpic"; + PICFLAG="-fpic"; fi if test x$PICFLAG = x; then echo $ac_n "checking whether ${CC-cc} accepts -Kpic""... $ac_c" 1>&6 -echo "configure:7336: checking whether ${CC-cc} accepts -Kpic" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_Kpic'+set}'`\" = set"; then +echo "configure:7918: checking whether ${CC-cc} accepts -Kpic" >&5 +if eval "test \"\${ac_cv_prog_cc_Kpic+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -7349,12 +7931,12 @@ fi echo "$ac_t""$ac_cv_prog_cc_Kpic" 1>&6 if test $ac_cv_prog_cc_Kpic = yes; then PICFLAG="-Kpic"; - fi + fi fi if test x$PICFLAG = x; then echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6 -echo "configure:7357: checking whether ${CC-cc} accepts -KPIC" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_KPIC'+set}'`\" = set"; then +echo "configure:7939: checking whether ${CC-cc} accepts -KPIC" >&5 +if eval "test \"\${ac_cv_prog_cc_KPIC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c @@ -7370,14 +7952,14 @@ fi echo "$ac_t""$ac_cv_prog_cc_KPIC" 1>&6 if test $ac_cv_prog_cc_KPIC = yes; then PICFLAG="-KPIC"; - fi + fi fi ################ echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:7380: checking for long long" >&5 -if eval "test \"`echo '$''{'samba_cv_have_longlong'+set}'`\" = set"; then +echo "configure:7962: checking for long long" >&5 +if eval "test \"\${samba_cv_have_longlong+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7385,12 +7967,12 @@ if test "$cross_compiling" = yes; then samba_cv_have_longlong=cross else cat > conftest.$ac_ext <<EOF -#line 7389 "configure" +#line 7971 "configure" #include "confdefs.h" #include <stdio.h> main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); } EOF -if { (eval echo configure:7394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_have_longlong=yes else @@ -7413,8 +7995,8 @@ EOF fi echo $ac_n "checking for 64 bit off_t""... $ac_c" 1>&6 -echo "configure:7417: checking for 64 bit off_t" >&5 -if eval "test \"`echo '$''{'samba_cv_SIZEOF_OFF_T'+set}'`\" = set"; then +echo "configure:7999: checking for 64 bit off_t" >&5 +if eval "test \"\${samba_cv_SIZEOF_OFF_T+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7422,13 +8004,13 @@ if test "$cross_compiling" = yes; then samba_cv_SIZEOF_OFF_T=cross else cat > conftest.$ac_ext <<EOF -#line 7426 "configure" +#line 8008 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/stat.h> main() { exit((sizeof(off_t) == 8) ? 0 : 1); } EOF -if { (eval echo configure:7432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_SIZEOF_OFF_T=yes else @@ -7451,8 +8033,8 @@ EOF fi echo $ac_n "checking for off64_t""... $ac_c" 1>&6 -echo "configure:7455: checking for off64_t" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_OFF64_T'+set}'`\" = set"; then +echo "configure:8037: checking for off64_t" >&5 +if eval "test \"\${samba_cv_HAVE_OFF64_T+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7460,13 +8042,13 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_OFF64_T=cross else cat > conftest.$ac_ext <<EOF -#line 7464 "configure" +#line 8046 "configure" #include "confdefs.h" #include <stdio.h> #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); } EOF -if { (eval echo configure:7470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_OFF64_T=yes else @@ -7489,8 +8071,8 @@ EOF fi echo $ac_n "checking for 64 bit ino_t""... $ac_c" 1>&6 -echo "configure:7493: checking for 64 bit ino_t" >&5 -if eval "test \"`echo '$''{'samba_cv_SIZEOF_INO_T'+set}'`\" = set"; then +echo "configure:8075: checking for 64 bit ino_t" >&5 +if eval "test \"\${samba_cv_SIZEOF_INO_T+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7498,13 +8080,13 @@ if test "$cross_compiling" = yes; then samba_cv_SIZEOF_INO_T=cross else cat > conftest.$ac_ext <<EOF -#line 7502 "configure" +#line 8084 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/stat.h> main() { exit((sizeof(ino_t) == 8) ? 0 : 1); } EOF -if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_SIZEOF_INO_T=yes else @@ -7527,8 +8109,8 @@ EOF fi echo $ac_n "checking for ino64_t""... $ac_c" 1>&6 -echo "configure:7531: checking for ino64_t" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_INO64_T'+set}'`\" = set"; then +echo "configure:8113: checking for ino64_t" >&5 +if eval "test \"\${samba_cv_HAVE_INO64_T+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7536,13 +8118,13 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_INO64_T=cross else cat > conftest.$ac_ext <<EOF -#line 7540 "configure" +#line 8122 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/stat.h> main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } EOF -if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_INO64_T=yes else @@ -7565,8 +8147,8 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:7569: checking for union semun" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_UNION_SEMUN'+set}'`\" = set"; then +echo "configure:8151: checking for union semun" >&5 +if eval "test \"\${samba_cv_HAVE_UNION_SEMUN+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7574,7 +8156,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_UNION_SEMUN=cross else cat > conftest.$ac_ext <<EOF -#line 7578 "configure" +#line 8160 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7582,7 +8164,7 @@ else #include <sys/sem.h> main() { union semun ss; exit(0); } EOF -if { (eval echo configure:7586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_UNION_SEMUN=yes else @@ -7605,8 +8187,8 @@ EOF fi echo $ac_n "checking for unsigned char""... $ac_c" 1>&6 -echo "configure:7609: checking for unsigned char" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then +echo "configure:8191: checking for unsigned char" >&5 +if eval "test \"\${samba_cv_HAVE_UNSIGNED_CHAR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7614,12 +8196,12 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_UNSIGNED_CHAR=cross else cat > conftest.$ac_ext <<EOF -#line 7618 "configure" +#line 8200 "configure" #include "confdefs.h" #include <stdio.h> main() { char c; c=250; exit((c > 0)?0:1); } EOF -if { (eval echo configure:7623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_UNSIGNED_CHAR=yes else @@ -7642,13 +8224,13 @@ EOF fi echo $ac_n "checking for sin_len in sock""... $ac_c" 1>&6 -echo "configure:7646: checking for sin_len in sock" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_SOCK_SIN_LEN'+set}'`\" = set"; then +echo "configure:8228: checking for sin_len in sock" >&5 +if eval "test \"\${samba_cv_HAVE_SOCK_SIN_LEN+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7652 "configure" +#line 8234 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -7657,7 +8239,7 @@ int main() { struct sockaddr_in sock; sock.sin_len = sizeof(sock); ; return 0; } EOF -if { (eval echo configure:7661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_SOCK_SIN_LEN=yes else @@ -7678,13 +8260,13 @@ EOF fi echo $ac_n "checking whether seekdir returns void""... $ac_c" 1>&6 -echo "configure:7682: checking whether seekdir returns void" >&5 -if eval "test \"`echo '$''{'samba_cv_SEEKDIR_RETURNS_VOID'+set}'`\" = set"; then +echo "configure:8264: checking whether seekdir returns void" >&5 +if eval "test \"\${samba_cv_SEEKDIR_RETURNS_VOID+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7688 "configure" +#line 8270 "configure" #include "confdefs.h" #include <sys/types.h> #include <dirent.h> @@ -7693,7 +8275,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:7697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_SEEKDIR_RETURNS_VOID=yes else @@ -7714,20 +8296,20 @@ EOF fi echo $ac_n "checking for __FILE__ macro""... $ac_c" 1>&6 -echo "configure:7718: checking for __FILE__ macro" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_FILE_MACRO'+set}'`\" = set"; then +echo "configure:8300: checking for __FILE__ macro" >&5 +if eval "test \"\${samba_cv_HAVE_FILE_MACRO+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7724 "configure" +#line 8306 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("%s\n", __FILE__); ; return 0; } EOF -if { (eval echo configure:7731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_FILE_MACRO=yes else @@ -7748,20 +8330,20 @@ EOF fi echo $ac_n "checking for __FUNCTION__ macro""... $ac_c" 1>&6 -echo "configure:7752: checking for __FUNCTION__ macro" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_FUNCTION_MACRO'+set}'`\" = set"; then +echo "configure:8334: checking for __FUNCTION__ macro" >&5 +if eval "test \"\${samba_cv_HAVE_FUNCTION_MACRO+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7758 "configure" +#line 8340 "configure" #include "confdefs.h" #include <stdio.h> int main() { printf("%s\n", __FUNCTION__); ; return 0; } EOF -if { (eval echo configure:7765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_FUNCTION_MACRO=yes else @@ -7782,8 +8364,8 @@ EOF fi echo $ac_n "checking if gettimeofday takes tz argument""... $ac_c" 1>&6 -echo "configure:7786: checking if gettimeofday takes tz argument" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_GETTIMEOFDAY_TZ'+set}'`\" = set"; then +echo "configure:8368: checking if gettimeofday takes tz argument" >&5 +if eval "test \"\${samba_cv_HAVE_GETTIMEOFDAY_TZ+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7791,14 +8373,14 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_GETTIMEOFDAY_TZ=cross else cat > conftest.$ac_ext <<EOF -#line 7795 "configure" +#line 8377 "configure" #include "confdefs.h" #include <sys/time.h> #include <unistd.h> main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} EOF -if { (eval echo configure:7802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_GETTIMEOFDAY_TZ=yes else @@ -7822,8 +8404,8 @@ fi echo $ac_n "checking for broken readdir""... $ac_c" 1>&6 -echo "configure:7826: checking for broken readdir" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then +echo "configure:8408: checking for broken readdir" >&5 +if eval "test \"\${samba_cv_HAVE_BROKEN_READDIR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7831,7 +8413,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_BROKEN_READDIR=cross else cat > conftest.$ac_ext <<EOF -#line 7835 "configure" +#line 8417 "configure" #include "confdefs.h" #include <sys/types.h> #include <dirent.h> @@ -7839,7 +8421,7 @@ main() { struct dirent *di; DIR *d = opendir("."); di = readdir(d); if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 && di->d_name[0] == 0) exit(0); exit(1);} EOF -if { (eval echo configure:7843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_BROKEN_READDIR=yes else @@ -7862,13 +8444,13 @@ EOF fi echo $ac_n "checking for utimbuf""... $ac_c" 1>&6 -echo "configure:7866: checking for utimbuf" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_UTIMBUF'+set}'`\" = set"; then +echo "configure:8448: checking for utimbuf" >&5 +if eval "test \"\${samba_cv_HAVE_UTIMBUF+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7872 "configure" +#line 8454 "configure" #include "confdefs.h" #include <sys/types.h> #include <utime.h> @@ -7876,7 +8458,7 @@ int main() { struct utimbuf tbuf; tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf)); ; return 0; } EOF -if { (eval echo configure:7880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_UTIMBUF=yes else @@ -7897,13 +8479,13 @@ EOF fi echo $ac_n "checking for kernel oplock type definitions""... $ac_c" 1>&6 -echo "configure:7901: checking for kernel oplock type definitions" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS'+set}'`\" = set"; then +echo "configure:8483: checking for kernel oplock type definitions" >&5 +if eval "test \"\${samba_cv_HAVE_KERNEL_OPLOCKS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7907 "configure" +#line 8489 "configure" #include "confdefs.h" #include <sys/types.h> #include <fcntl.h> @@ -7911,7 +8493,7 @@ int main() { oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1; ; return 0; } EOF -if { (eval echo configure:7915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_KERNEL_OPLOCKS=yes else @@ -7932,8 +8514,8 @@ EOF fi echo $ac_n "checking for irix specific capabilities""... $ac_c" 1>&6 -echo "configure:7936: checking for irix specific capabilities" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES'+set}'`\" = set"; then +echo "configure:8518: checking for irix specific capabilities" >&5 +if eval "test \"\${samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7941,7 +8523,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross else cat > conftest.$ac_ext <<EOF -#line 7945 "configure" +#line 8527 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/capability.h> @@ -7956,7 +8538,7 @@ main() { } EOF -if { (eval echo configure:7960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes else @@ -7984,13 +8566,13 @@ fi # echo $ac_n "checking for int16 typedef included by rpc/rpc.h""... $ac_c" 1>&6 -echo "configure:7988: checking for int16 typedef included by rpc/rpc.h" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_INT16_FROM_RPC_RPC_H'+set}'`\" = set"; then +echo "configure:8570: checking for int16 typedef included by rpc/rpc.h" >&5 +if eval "test \"\${samba_cv_HAVE_INT16_FROM_RPC_RPC_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7994 "configure" +#line 8576 "configure" #include "confdefs.h" #include <sys/types.h> #if defined(HAVE_RPC_RPC_H) @@ -8000,7 +8582,7 @@ int main() { int16 testvar; ; return 0; } EOF -if { (eval echo configure:8004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes else @@ -8021,13 +8603,13 @@ EOF fi echo $ac_n "checking for uint16 typedef included by rpc/rpc.h""... $ac_c" 1>&6 -echo "configure:8025: checking for uint16 typedef included by rpc/rpc.h" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_UINT16_FROM_RPC_RPC_H'+set}'`\" = set"; then +echo "configure:8607: checking for uint16 typedef included by rpc/rpc.h" >&5 +if eval "test \"\${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8031 "configure" +#line 8613 "configure" #include "confdefs.h" #include <sys/types.h> #if defined(HAVE_RPC_RPC_H) @@ -8037,7 +8619,7 @@ int main() { uint16 testvar; ; return 0; } EOF -if { (eval echo configure:8041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes else @@ -8058,13 +8640,13 @@ EOF fi echo $ac_n "checking for int32 typedef included by rpc/rpc.h""... $ac_c" 1>&6 -echo "configure:8062: checking for int32 typedef included by rpc/rpc.h" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_INT32_FROM_RPC_RPC_H'+set}'`\" = set"; then +echo "configure:8644: checking for int32 typedef included by rpc/rpc.h" >&5 +if eval "test \"\${samba_cv_HAVE_INT32_FROM_RPC_RPC_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8068 "configure" +#line 8650 "configure" #include "confdefs.h" #include <sys/types.h> #if defined(HAVE_RPC_RPC_H) @@ -8074,7 +8656,7 @@ int main() { int32 testvar; ; return 0; } EOF -if { (eval echo configure:8078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes else @@ -8095,13 +8677,13 @@ EOF fi echo $ac_n "checking for uint32 typedef included by rpc/rpc.h""... $ac_c" 1>&6 -echo "configure:8099: checking for uint32 typedef included by rpc/rpc.h" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_UINT32_FROM_RPC_RPC_H'+set}'`\" = set"; then +echo "configure:8681: checking for uint32 typedef included by rpc/rpc.h" >&5 +if eval "test \"\${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8105 "configure" +#line 8687 "configure" #include "confdefs.h" #include <sys/types.h> #if defined(HAVE_RPC_RPC_H) @@ -8111,7 +8693,7 @@ int main() { uint32 testvar; ; return 0; } EOF -if { (eval echo configure:8115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes else @@ -8132,16 +8714,16 @@ EOF fi echo $ac_n "checking for test routines""... $ac_c" 1>&6 -echo "configure:8136: checking for test routines" >&5 +echo "configure:8718: checking for test routines" >&5 if test "$cross_compiling" = yes; then echo "configure: warning: cannot run when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 8141 "configure" +#line 8723 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/trivial.c" EOF -if { (eval echo configure:8145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 else @@ -8155,8 +8737,8 @@ fi echo $ac_n "checking for ftruncate extend""... $ac_c" 1>&6 -echo "configure:8159: checking for ftruncate extend" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_FTRUNCATE_EXTEND'+set}'`\" = set"; then +echo "configure:8741: checking for ftruncate extend" >&5 +if eval "test \"\${samba_cv_HAVE_FTRUNCATE_EXTEND+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8164,11 +8746,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_FTRUNCATE_EXTEND=cross else cat > conftest.$ac_ext <<EOF -#line 8168 "configure" +#line 8750 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/ftruncate.c" EOF -if { (eval echo configure:8172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_FTRUNCATE_EXTEND=yes else @@ -8191,8 +8773,8 @@ EOF fi echo $ac_n "checking for broken getgroups""... $ac_c" 1>&6 -echo "configure:8195: checking for broken getgroups" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_GETGROUPS'+set}'`\" = set"; then +echo "configure:8777: checking for broken getgroups" >&5 +if eval "test \"\${samba_cv_HAVE_BROKEN_GETGROUPS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8200,11 +8782,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_BROKEN_GETGROUPS=cross else cat > conftest.$ac_ext <<EOF -#line 8204 "configure" +#line 8786 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/getgroups.c" EOF -if { (eval echo configure:8208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_BROKEN_GETGROUPS=yes else @@ -8227,15 +8809,15 @@ EOF fi echo $ac_n "checking whether getpass should be replaced""... $ac_c" 1>&6 -echo "configure:8231: checking whether getpass should be replaced" >&5 -if eval "test \"`echo '$''{'samba_cv_REPLACE_GETPASS'+set}'`\" = set"; then +echo "configure:8813: checking whether getpass should be replaced" >&5 +if eval "test \"\${samba_cv_REPLACE_GETPASS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I${srcdir-.}/include -I${srcdir-.}/ubiqx" cat > conftest.$ac_ext <<EOF -#line 8239 "configure" +#line 8821 "configure" #include "confdefs.h" #define REPLACE_GETPASS 1 @@ -8248,7 +8830,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_REPLACE_GETPASS=yes else @@ -8271,8 +8853,8 @@ EOF fi echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6 -echo "configure:8275: checking for broken inet_ntoa" >&5 -if eval "test \"`echo '$''{'samba_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then +echo "configure:8857: checking for broken inet_ntoa" >&5 +if eval "test \"\${samba_cv_REPLACE_INET_NTOA+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8280,7 +8862,7 @@ if test "$cross_compiling" = yes; then samba_cv_REPLACE_INET_NTOA=cross else cat > conftest.$ac_ext <<EOF -#line 8284 "configure" +#line 8866 "configure" #include "confdefs.h" #include <stdio.h> @@ -8292,7 +8874,7 @@ if (strcmp(inet_ntoa(ip),"18.52.86.120") && strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } exit(1);} EOF -if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_REPLACE_INET_NTOA=yes else @@ -8315,8 +8897,8 @@ EOF fi echo $ac_n "checking for root""... $ac_c" 1>&6 -echo "configure:8319: checking for root" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_ROOT'+set}'`\" = set"; then +echo "configure:8901: checking for root" >&5 +if eval "test \"\${samba_cv_HAVE_ROOT+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8324,11 +8906,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_ROOT=cross else cat > conftest.$ac_ext <<EOF -#line 8328 "configure" +#line 8910 "configure" #include "confdefs.h" main() { exit(getuid() != 0); } EOF -if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_ROOT=yes else @@ -8354,8 +8936,8 @@ fi netmask=no; echo $ac_n "checking for netmask ifconf""... $ac_c" 1>&6 -echo "configure:8358: checking for netmask ifconf" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_NETMASK_IFCONF'+set}'`\" = set"; then +echo "configure:8940: checking for netmask ifconf" >&5 +if eval "test \"\${samba_cv_HAVE_NETMASK_IFCONF+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8363,14 +8945,14 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_NETMASK_IFCONF=cross else cat > conftest.$ac_ext <<EOF -#line 8367 "configure" +#line 8949 "configure" #include "confdefs.h" #define HAVE_NETMASK_IFCONF 1 #define AUTOCONF 1 #include "${srcdir-.}/lib/netmask.c" EOF -if { (eval echo configure:8374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_NETMASK_IFCONF=yes else @@ -8394,8 +8976,8 @@ fi if test $netmask = no; then echo $ac_n "checking for netmask ifreq""... $ac_c" 1>&6 -echo "configure:8398: checking for netmask ifreq" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_NETMASK_IFREQ'+set}'`\" = set"; then +echo "configure:8980: checking for netmask ifreq" >&5 +if eval "test \"\${samba_cv_HAVE_NETMASK_IFREQ+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8403,14 +8985,14 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_NETMASK_IFREQ=cross else cat > conftest.$ac_ext <<EOF -#line 8407 "configure" +#line 8989 "configure" #include "confdefs.h" #define HAVE_NETMASK_IFREQ 1 #define AUTOCONF 1 #include "${srcdir-.}/lib/netmask.c" EOF -if { (eval echo configure:8414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_NETMASK_IFREQ=yes else @@ -8435,8 +9017,8 @@ fi if test $netmask = no; then echo $ac_n "checking for netmask AIX""... $ac_c" 1>&6 -echo "configure:8439: checking for netmask AIX" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_NETMASK_AIX'+set}'`\" = set"; then +echo "configure:9021: checking for netmask AIX" >&5 +if eval "test \"\${samba_cv_HAVE_NETMASK_AIX+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8444,14 +9026,14 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_NETMASK_AIX=cross else cat > conftest.$ac_ext <<EOF -#line 8448 "configure" +#line 9030 "configure" #include "confdefs.h" #define HAVE_NETMASK_AIX 1 #define AUTOCONF 1 #include "${srcdir-.}/lib/netmask.c" EOF -if { (eval echo configure:8455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_NETMASK_AIX=yes else @@ -8475,8 +9057,8 @@ fi fi echo $ac_n "checking for trapdoor seteuid""... $ac_c" 1>&6 -echo "configure:8479: checking for trapdoor seteuid" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_TRAPDOOR_UID'+set}'`\" = set"; then +echo "configure:9061: checking for trapdoor seteuid" >&5 +if eval "test \"\${samba_cv_HAVE_TRAPDOOR_UID+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8484,11 +9066,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 8488 "configure" +#line 9070 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/trapdoor.c" EOF -if { (eval echo configure:8492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_TRAPDOOR_UID=no else @@ -8515,8 +9097,8 @@ fi seteuid=no; if test $seteuid = no; then echo $ac_n "checking for setresuid""... $ac_c" 1>&6 -echo "configure:8519: checking for setresuid" >&5 -if eval "test \"`echo '$''{'samba_cv_USE_SETRESUID'+set}'`\" = set"; then +echo "configure:9101: checking for setresuid" >&5 +if eval "test \"\${samba_cv_USE_SETRESUID+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8524,7 +9106,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETRESUID=cross else cat > conftest.$ac_ext <<EOF -#line 8528 "configure" +#line 9110 "configure" #include "confdefs.h" #define AUTOCONF_TEST 1 @@ -8532,7 +9114,7 @@ else #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" EOF -if { (eval echo configure:8536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETRESUID=yes else @@ -8558,8 +9140,8 @@ fi if test $seteuid = no; then echo $ac_n "checking for setreuid""... $ac_c" 1>&6 -echo "configure:8562: checking for setreuid" >&5 -if eval "test \"`echo '$''{'samba_cv_USE_SETREUID'+set}'`\" = set"; then +echo "configure:9144: checking for setreuid" >&5 +if eval "test \"\${samba_cv_USE_SETREUID+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8567,7 +9149,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETREUID=cross else cat > conftest.$ac_ext <<EOF -#line 8571 "configure" +#line 9153 "configure" #include "confdefs.h" #define AUTOCONF_TEST 1 @@ -8575,7 +9157,7 @@ else #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" EOF -if { (eval echo configure:8579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETREUID=yes else @@ -8600,8 +9182,8 @@ fi if test $seteuid = no; then echo $ac_n "checking for seteuid""... $ac_c" 1>&6 -echo "configure:8604: checking for seteuid" >&5 -if eval "test \"`echo '$''{'samba_cv_USE_SETEUID'+set}'`\" = set"; then +echo "configure:9186: checking for seteuid" >&5 +if eval "test \"\${samba_cv_USE_SETEUID+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8609,7 +9191,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETEUID=cross else cat > conftest.$ac_ext <<EOF -#line 8613 "configure" +#line 9195 "configure" #include "confdefs.h" #define AUTOCONF_TEST 1 @@ -8617,7 +9199,7 @@ else #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" EOF -if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETEUID=yes else @@ -8642,8 +9224,8 @@ fi if test $seteuid = no; then echo $ac_n "checking for setuidx""... $ac_c" 1>&6 -echo "configure:8646: checking for setuidx" >&5 -if eval "test \"`echo '$''{'samba_cv_USE_SETUIDX'+set}'`\" = set"; then +echo "configure:9228: checking for setuidx" >&5 +if eval "test \"\${samba_cv_USE_SETUIDX+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8651,7 +9233,7 @@ if test "$cross_compiling" = yes; then samba_cv_USE_SETUIDX=cross else cat > conftest.$ac_ext <<EOF -#line 8655 "configure" +#line 9237 "configure" #include "confdefs.h" #define AUTOCONF_TEST 1 @@ -8659,7 +9241,7 @@ else #include "confdefs.h" #include "${srcdir-.}/lib/util_sec.c" EOF -if { (eval echo configure:8663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_USE_SETUIDX=yes else @@ -8684,8 +9266,8 @@ fi echo $ac_n "checking for shared mmap""... $ac_c" 1>&6 -echo "configure:8688: checking for shared mmap" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_SHARED_MMAP'+set}'`\" = set"; then +echo "configure:9270: checking for shared mmap" >&5 +if eval "test \"\${samba_cv_HAVE_SHARED_MMAP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8693,11 +9275,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_SHARED_MMAP=cross else cat > conftest.$ac_ext <<EOF -#line 8697 "configure" +#line 9279 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/shared_mmap.c" EOF -if { (eval echo configure:8701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_SHARED_MMAP=yes else @@ -8724,8 +9306,8 @@ EOF fi echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6 -echo "configure:8728: checking for fcntl locking" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then +echo "configure:9310: checking for fcntl locking" >&5 +if eval "test \"\${samba_cv_HAVE_FCNTL_LOCK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8733,11 +9315,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_FCNTL_LOCK=cross else cat > conftest.$ac_ext <<EOF -#line 8737 "configure" +#line 9319 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/fcntl_lock.c" EOF -if { (eval echo configure:8741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_FCNTL_LOCK=yes else @@ -8760,8 +9342,8 @@ EOF fi echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6 -echo "configure:8764: checking for 64 bit fcntl locking" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then +echo "configure:9346: checking for 64 bit fcntl locking" >&5 +if eval "test \"\${samba_cv_HAVE_STRUCT_FLOCK64+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8769,7 +9351,7 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_STRUCT_FLOCK64=cross else cat > conftest.$ac_ext <<EOF -#line 8773 "configure" +#line 9355 "configure" #include "confdefs.h" #include <stdio.h> @@ -8790,7 +9372,7 @@ exit(1); #endif } EOF -if { (eval echo configure:8794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_STRUCT_FLOCK64=yes else @@ -8813,8 +9395,8 @@ EOF fi echo $ac_n "checking for sysv ipc""... $ac_c" 1>&6 -echo "configure:8817: checking for sysv ipc" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_SYSV_IPC'+set}'`\" = set"; then +echo "configure:9399: checking for sysv ipc" >&5 +if eval "test \"\${samba_cv_HAVE_SYSV_IPC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8822,11 +9404,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_SYSV_IPC=cross else cat > conftest.$ac_ext <<EOF -#line 8826 "configure" +#line 9408 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/sysv_ipc.c" EOF -if { (eval echo configure:8830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_SYSV_IPC=yes else @@ -8851,7 +9433,7 @@ fi ################################################# # decide for the default sam-password-database echo $ac_n "checking which sam password database to use""... $ac_c" 1>&6 -echo "configure:8855: checking which sam password database to use" >&5 +echo "configure:9437: checking which sam password database to use" >&5 # Check whether --with-sam_pwdb or --without-sam_pwdb was given. if test "${with_sam_pwdb+set}" = set; then withval="$with_sam_pwdb" @@ -8885,263 +9467,9 @@ echo "$ac_t""$sampwlibname" 1>&6 ################################################# -# check for libmsrpc support -echo $ac_n "checking whether to use libmsrpc""... $ac_c" 1>&6 -echo "configure:8891: checking whether to use libmsrpc" >&5 -# Check whether --with-libmsrpc or --without-libmsrpc was given. -if test "${with_libmsrpc+set}" = set; then - withval="$with_libmsrpc" - case "$withval" in - no) - echo "$ac_t""yes" 1>&6 - LIBMSRPC="bin/libmsrpc.so" - - if test x$ATTEMPT_LIBMSRPC32_BUILD = x; then - LIBMSRPC32="" - else - LIBMSRPC32=bin/libmsrpc.32.so - fi - -# Conditions under which libmsrpc should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libmsrpc - LIBMSRPC="" - LIBMSRPC32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - -################################################# -# check for libubiqx support -echo $ac_n "checking whether to use libubiqx""... $ac_c" 1>&6 -echo "configure:8927: checking whether to use libubiqx" >&5 -# Check whether --with-libubiqx or --without-libubiqx was given. -if test "${with_libubiqx+set}" = set; then - withval="$with_libubiqx" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBUBIQX="bin/libubiqx.so" - - if test x$ATTEMPT_LIBUBIQX32_BUILD = x; then - LIBUBIQX32="" - else - LIBUBIQX32=bin/libubiqx.32.so - fi - -# Conditions under which libubiqx should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libubiqx - LIBUBIQX="" - LIBUBIQX32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - -################################################# -# check for libsamba support -echo $ac_n "checking whether to use libsamba""... $ac_c" 1>&6 -echo "configure:8963: checking whether to use libsamba" >&5 -# Check whether --with-libsamba or --without-libsamba was given. -if test "${with_libsamba+set}" = set; then - withval="$with_libsamba" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBSAMBA="bin/libsamba.so" - - if test x$ATTEMPT_LIBSAMBA32_BUILD = x; then - LIBSAMBA32="" - else - LIBSAMBA32=bin/libsamba.32.so - fi - -# Conditions under which libsamba should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsamba - LIBSAMBA="" - LIBSAMBA32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - -################################################# -# check for libnmb support -echo $ac_n "checking whether to use libnmb""... $ac_c" 1>&6 -echo "configure:8999: checking whether to use libnmb" >&5 -# Check whether --with-libnmb or --without-libnmb was given. -if test "${with_libnmb+set}" = set; then - withval="$with_libnmb" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBNMB="bin/libnmb.so" - - if test x$ATTEMPT_LIBNMB32_BUILD = x; then - LIBNMB32="" - else - LIBNMB32=bin/libnmb.32.so - fi - -# Conditions under which libnmb should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libnmb - LIBNMB="" - LIBNMB32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - -################################################# -# check for libsurs support -echo $ac_n "checking whether to use libsurs""... $ac_c" 1>&6 -echo "configure:9035: checking whether to use libsurs" >&5 -# Check whether --with-libsurs or --without-libsurs was given. -if test "${with_libsurs+set}" = set; then - withval="$with_libsurs" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBSURS="bin/libsurs.so" - - if test x$ATTEMPT_LIBSURS32_BUILD = x; then - LIBSURS32="" - else - LIBSURS32=bin/libsurs.32.so - fi - -# Conditions under which libsurs should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsurs - LIBSURS="" - LIBSURS32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - -################################################# -# check for libsmbpw support -echo $ac_n "checking whether to use libsmbpw""... $ac_c" 1>&6 -echo "configure:9071: checking whether to use libsmbpw" >&5 -# Check whether --with-libsmbpw or --without-libsmbpw was given. -if test "${with_libsmbpw+set}" = set; then - withval="$with_libsmbpw" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBSMBPW="bin/libsmbpw.so" - - if test x$ATTEMPT_LIBSMBPW32_BUILD = x; then - LIBSMBPW32="" - else - LIBSMBPW32=bin/libsmbpw.32.so - fi - -# Conditions under which libsmbpw should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsmbpw - LIBSMBPW="" - LIBSMBPW32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - - -################################################# -# check for libsmb support -echo $ac_n "checking whether to use libsmb""... $ac_c" 1>&6 -echo "configure:9108: checking whether to use libsmb" >&5 -# Check whether --with-libsmb or --without-libsmb was given. -if test "${with_libsmb+set}" = set; then - withval="$with_libsmb" - case "$withval" in - yes) - echo "$ac_t""yes" 1>&6 - LIBSMB="bin/libsmb.so" - - if test x$ATTEMPT_LIBSMB32_BUILD = x; then - LIBSMB32="" - else - LIBSMB32=bin/libsmb.32.so - fi - -# Conditions under which libsmb should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsmb - LIBSMB="" - LIBSMB32="" - fi - ;; - *) - echo "$ac_t""no" 1>&6 - ;; - esac -else - echo "$ac_t""yes" 1>&6 - -fi - - - -################################################# # check for smbwrapper support echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6 -echo "configure:9145: checking whether to use smbwrapper" >&5 +echo "configure:9473: checking whether to use smbwrapper" >&5 # Check whether --with-smbwrapper or --without-smbwrapper was given. if test "${with_smbwrapper+set}" = set; then withval="$with_smbwrapper" @@ -9185,7 +9513,7 @@ fi ################################################# # check for the AFS filesystem echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6 -echo "configure:9189: checking whether to use AFS" >&5 +echo "configure:9517: checking whether to use AFS" >&5 # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" @@ -9211,7 +9539,7 @@ fi ################################################# # check for the DFS auth system echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6 -echo "configure:9215: checking whether to use DFS auth" >&5 +echo "configure:9543: checking whether to use DFS auth" >&5 # Check whether --with-dfs or --without-dfs was given. if test "${with_dfs+set}" = set; then withval="$with_dfs" @@ -9236,7 +9564,7 @@ fi ################################################# # check for Kerberos IV auth system echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6 -echo "configure:9240: checking whether to use Kerberos IV" >&5 +echo "configure:9568: checking whether to use Kerberos IV" >&5 # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" @@ -9246,15 +9574,15 @@ if test "${with_krb4+set}" = set; then EOF echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:9250: checking for dn_expand in -lresolv" >&5 +echo "configure:9578: checking for dn_expand in -lresolv" >&5 ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 9258 "configure" +#line 9586 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9265,7 +9593,7 @@ int main() { dn_expand() ; return 0; } EOF -if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9304,7 +9632,7 @@ fi ################################################# # check for automount support echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6 -echo "configure:9308: checking whether to use AUTOMOUNT" >&5 +echo "configure:9636: checking whether to use AUTOMOUNT" >&5 # Check whether --with-automount or --without-automount was given. if test "${with_automount+set}" = set; then withval="$with_automount" @@ -9329,7 +9657,7 @@ fi ################################################# # check for smbmount support echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6 -echo "configure:9333: checking whether to use SMBMOUNT" >&5 +echo "configure:9661: checking whether to use SMBMOUNT" >&5 # Check whether --with-smbmount or --without-smbmount was given. if test "${with_smbmount+set}" = set; then withval="$with_smbmount" @@ -9357,7 +9685,7 @@ fi ################################################# # check to use a tdb surs database echo $ac_n "checking whether to use SURS tdb database""... $ac_c" 1>&6 -echo "configure:9361: checking whether to use SURS tdb database" >&5 +echo "configure:9689: checking whether to use SURS tdb database" >&5 # Check whether --with-surstdb or --without-surstdb was given. if test "${with_surstdb+set}" = set; then withval="$with_surstdb" @@ -9379,10 +9707,11 @@ else fi + ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:9386: checking whether to use LDAP password database" >&5 +echo "configure:9715: checking whether to use LDAP password database" >&5 # Check whether --with-ldap or --without-ldap was given. if test "${with_ldap+set}" = set; then withval="$with_ldap" @@ -9408,7 +9737,7 @@ fi ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:9412: checking whether to use LDAP password database" >&5 +echo "configure:9741: checking whether to use LDAP password database" >&5 # Check whether --with-nt5ldap or --without-nt5ldap was given. if test "${with_nt5ldap+set}" = set; then withval="$with_nt5ldap" @@ -9434,7 +9763,7 @@ fi ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:9438: checking whether to use LDAP password database" >&5 +echo "configure:9767: checking whether to use LDAP password database" >&5 # Check whether --with-nt5ldap or --without-nt5ldap was given. if test "${with_nt5ldap+set}" = set; then withval="$with_nt5ldap" @@ -9460,7 +9789,7 @@ fi ################################################# # check for a NISPLUS password database echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6 -echo "configure:9464: checking whether to use NISPLUS password database" >&5 +echo "configure:9793: checking whether to use NISPLUS password database" >&5 # Check whether --with-nisplus or --without-nisplus was given. if test "${with_nisplus+set}" = set; then withval="$with_nisplus" @@ -9485,7 +9814,7 @@ fi ################################################# # check for a NISPLUS_HOME support echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6 -echo "configure:9489: checking whether to use NISPLUS_HOME" >&5 +echo "configure:9818: checking whether to use NISPLUS_HOME" >&5 # Check whether --with-nisplus-home or --without-nisplus-home was given. if test "${with_nisplus_home+set}" = set; then withval="$with_nisplus_home" @@ -9510,7 +9839,7 @@ fi ################################################# # check for the secure socket layer echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 -echo "configure:9514: checking whether to use SSL" >&5 +echo "configure:9843: checking whether to use SSL" >&5 # Check whether --with-ssl or --without-ssl was given. if test "${with_ssl+set}" = set; then withval="$with_ssl" @@ -9535,7 +9864,7 @@ fi ################################################# # check for experimental mmap support echo $ac_n "checking whether to use MMAP""... $ac_c" 1>&6 -echo "configure:9539: checking whether to use MMAP" >&5 +echo "configure:9868: checking whether to use MMAP" >&5 # Check whether --with-mmap or --without-mmap was given. if test "${with_mmap+set}" = set; then withval="$with_mmap" @@ -9560,7 +9889,7 @@ fi ################################################# # check for syslog logging echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 -echo "configure:9564: checking whether to use syslog logging" >&5 +echo "configure:9893: checking whether to use syslog logging" >&5 # Check whether --with-syslog or --without-syslog was given. if test "${with_syslog+set}" = set; then withval="$with_syslog" @@ -9585,7 +9914,7 @@ fi ################################################# # check for a shared memory profiling support echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6 -echo "configure:9589: checking whether to use profiling" >&5 +echo "configure:9918: checking whether to use profiling" >&5 # Check whether --with-profile or --without-profile was given. if test "${with_profile+set}" = set; then withval="$with_profile" @@ -9611,7 +9940,7 @@ fi ################################################# # check for experimental netatalk resource fork support echo $ac_n "checking whether to support netatalk""... $ac_c" 1>&6 -echo "configure:9615: checking whether to support netatalk" >&5 +echo "configure:9944: checking whether to support netatalk" >&5 # Check whether --with-netatalk or --without-netatalk was given. if test "${with_netatalk+set}" = set; then withval="$with_netatalk" @@ -9638,7 +9967,7 @@ fi QUOTAOBJS=noquotas.o echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6 -echo "configure:9642: checking whether to support disk-quotas" >&5 +echo "configure:9971: checking whether to support disk-quotas" >&5 # Check whether --with-quotas or --without-quotas was given. if test "${with_quotas+set}" = set; then withval="$with_quotas" @@ -9659,35 +9988,75 @@ fi ################################################# +# check for experimental utmp accounting + +################################################# +# check for MS Dfs support + +################################################# +# set private directory location +# Check whether --with-privatedir or --without-privatedir was given. +if test "${with_privatedir+set}" = set; then + withval="$with_privatedir" + case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + echo "configure: warning: --with-privatedir called without argument - will use default" 1>&2 + privatedir='${prefix}/private' + ;; + * ) + privatedir="$withval" + ;; + esac + +else + privatedir='${prefix}/private' + + +fi + + +################################################# +# set lock directory location + +################################################# +# set SWAT directory location + +################################################# # these tests are taken from the GNU fileutils package echo "checking how to get filesystem space usage" 1>&6 -echo "configure:9665: checking how to get filesystem space usage" >&5 +echo "configure:10031: checking how to get filesystem space usage" >&5 space=no # Test for statvfs64. if test $space = no; then # SVR4 echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6 -echo "configure:9672: checking statvfs64 function (SVR4)" >&5 -if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then +echo "configure:10038: checking statvfs64 function (SVR4)" >&5 +if eval "test \"\${fu_cv_sys_stat_statvfs64+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statvfs64=cross else cat > conftest.$ac_ext <<EOF -#line 9680 "configure" +#line 10046 "configure" #include "confdefs.h" +#if defined(HAVE_UNISTD_H) +#include <unistd.h> +#endif #include <sys/types.h> #include <sys/statvfs.h> main () { struct statvfs64 fsd; - exit (statfs64 (".", &fsd)); + exit (statvfs64 (".", &fsd)); } EOF -if { (eval echo configure:9691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statvfs64=yes else @@ -9720,12 +10089,12 @@ fi if test $space = no; then # SVR4 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 -echo "configure:9724: checking statvfs function (SVR4)" >&5 -if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then +echo "configure:10093: checking statvfs function (SVR4)" >&5 +if eval "test \"\${fu_cv_sys_stat_statvfs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9729 "configure" +#line 10098 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statvfs.h> @@ -9733,7 +10102,7 @@ int main() { struct statvfs fsd; statvfs (0, &fsd); ; return 0; } EOF -if { (eval echo configure:9737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_stat_statvfs=yes else @@ -9758,15 +10127,15 @@ fi if test $space = no; then # DEC Alpha running OSF/1 echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 -echo "configure:9762: checking for 3-argument statfs function (DEC OSF/1)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then +echo "configure:10131: checking for 3-argument statfs function (DEC OSF/1)" >&5 + if eval "test \"\${fu_cv_sys_stat_statfs3_osf1+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext <<EOF -#line 9770 "configure" +#line 10139 "configure" #include "confdefs.h" #include <sys/param.h> @@ -9779,7 +10148,7 @@ else exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:9783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs3_osf1=yes else @@ -9806,15 +10175,15 @@ fi if test $space = no; then # AIX echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 -echo "configure:9810: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then +echo "configure:10179: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 + if eval "test \"\${fu_cv_sys_stat_statfs2_bsize+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <<EOF -#line 9818 "configure" +#line 10187 "configure" #include "confdefs.h" #ifdef HAVE_SYS_PARAM_H @@ -9833,7 +10202,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:9837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_bsize=yes else @@ -9860,15 +10229,15 @@ fi if test $space = no; then # SVR3 echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 -echo "configure:9864: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then +echo "configure:10233: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 + if eval "test \"\${fu_cv_sys_stat_statfs4+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext <<EOF -#line 9872 "configure" +#line 10241 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statfs.h> @@ -9878,7 +10247,7 @@ else exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:9882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs4=yes else @@ -9905,15 +10274,15 @@ fi if test $space = no; then # 4.4BSD and NetBSD echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 -echo "configure:9909: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then +echo "configure:10278: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 + if eval "test \"\${fu_cv_sys_stat_statfs2_fsize+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext <<EOF -#line 9917 "configure" +#line 10286 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -9929,7 +10298,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:9933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_fsize=yes else @@ -9956,15 +10325,15 @@ fi if test $space = no; then # Ultrix echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 -echo "configure:9960: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 - if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then +echo "configure:10329: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 + if eval "test \"\${fu_cv_sys_stat_fs_data+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext <<EOF -#line 9968 "configure" +#line 10337 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -9984,7 +10353,7 @@ else exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:9988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_fs_data=yes else @@ -10013,11 +10382,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 10017 "configure" +#line 10386 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:10021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else @@ -10123,7 +10492,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" + echo "$CONFIG_STATUS generated by autoconf version 2.14.1" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -10166,31 +10535,20 @@ s%@includedir@%$includedir%g s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g +s%@RUNPROG@%$RUNPROG%g s%@MPROGS@%$MPROGS%g s%@LDSHFLAGS@%$LDSHFLAGS%g s%@HOST_OS@%$HOST_OS%g -s%@LIBMSRPC@%$LIBMSRPC%g -s%@LIBMSRPC32@%$LIBMSRPC32%g -s%@LIBNMB@%$LIBNMB%g -s%@LIBNMB32@%$LIBNMB32%g -s%@LIBSMB@%$LIBSMB%g -s%@LIBSURS@%$LIBSURS%g -s%@LIBSMBPW@%$LIBSMBPW%g -s%@LIBSMB32@%$LIBSMB32%g -s%@LIBSURS32@%$LIBSURS32%g -s%@LIBSMBPW32@%$LIBSMBPW32%g -s%@LIBUBIQX@%$LIBUBIQX%g -s%@LIBUBIQX32@%$LIBUBIQX32%g -s%@LIBSAMBA@%$LIBSAMBA%g -s%@LIBSAMBA32@%$LIBSAMBA32%g s%@WRAP@%$WRAP%g s%@WRAP32@%$WRAP32%g s%@PICFLAG@%$PICFLAG%g +s%@SHLIBEXT@%$SHLIBEXT%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@AWK@%$AWK%g +s%@BROKEN_CC@%$BROKEN_CC%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g @@ -10218,6 +10576,7 @@ s%@LIBOBJS@%$LIBOBJS%g s%@ROFF@%$ROFF%g s%@SAM_PWDB_LIB@%$SAM_PWDB_LIB%g s%@QUOTAOBJS@%$QUOTAOBJS%g +s%@privatedir@%$privatedir%g s%@builddir@%$builddir%g CEOF @@ -10436,5 +10795,5 @@ exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 diff --git a/source/configure.in b/source/configure.in index 52e19e48e00..7d49e0570d1 100644 --- a/source/configure.in +++ b/source/configure.in @@ -10,20 +10,6 @@ AC_SUBST(RUNPROG) AC_SUBST(MPROGS) AC_SUBST(LDSHFLAGS) AC_SUBST(HOST_OS) -AC_SUBST(LIBMSRPC) -AC_SUBST(LIBMSRPC32) -AC_SUBST(LIBNMB) -AC_SUBST(LIBNMB32) -AC_SUBST(LIBSMB) -AC_SUBST(LIBSURS) -AC_SUBST(LIBSMBPW) -AC_SUBST(LIBSMB32) -AC_SUBST(LIBSURS32) -AC_SUBST(LIBSMBPW32) -AC_SUBST(LIBUBIQX) -AC_SUBST(LIBUBIQX32) -AC_SUBST(LIBSAMBA) -AC_SUBST(LIBSAMBA32) AC_SUBST(WRAP) AC_SUBST(WRAP32) AC_SUBST(PICFLAG) @@ -73,7 +59,7 @@ case "$host_os" in fi ;; # -# AIX4.x is *so* broken. It doesn't even admit to having large +# AIX4.x doesn't even admit to having large # files *at all* unless the -D_LARGE_FILE or -D_LARGE_FILE_API flags are set. # *aix4*) @@ -86,7 +72,7 @@ AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h) +AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h) AC_CHECK_HEADERS(sys/param.h ctype.h ) AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/route.h net/if.h) AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h sys/param.h ctype.h ) @@ -328,16 +314,10 @@ case "$host_os" in ;; *irix*) AC_DEFINE(IRIX) ATTEMPT_WRAP32_BUILD=yes - ATTEMPT_LIBSMB32_BUILD=yes - ATTEMPT_LIBSURS32_BUILD=yes - ATTEMPT_LIBSMBPW32_BUILD=yes - ATTEMPT_LIBNMB32_BUILD=yes - ATTEMPT_LIBSAMBA32_BUILD=yes - ATTEMPT_LIBUBIQX32_BUILD=yes - ATTEMPT_LIBMSRPC32_BUILD=yes ;; *aix*) AC_DEFINE(AIX);; - *hpux*) AC_DEFINE(HPUX);; + *hpux*) AC_DEFINE(HPUX) + ;; *qnx*) AC_DEFINE(QNX);; *osf*) AC_DEFINE(OSF1);; *sco*) AC_DEFINE(SCO);; @@ -355,13 +335,13 @@ if test x$PICFLAG = x; then AC_PROG_CC_FLAG(Kpic) if test $ac_cv_prog_cc_Kpic = yes; then PICFLAG="-Kpic"; - fi + fi fi if test x$PICFLAG = x; then AC_PROG_CC_FLAG(KPIC) if test $ac_cv_prog_cc_KPIC = yes; then PICFLAG="-KPIC"; - fi + fi fi ################ @@ -806,232 +786,6 @@ AC_SUBST(SAM_PWDB_LIB) ################################################# -# check for libmsrpc support -AC_MSG_CHECKING(whether to use libmsrpc) -AC_ARG_WITH(libmsrpc, -[ --with-libmsrpc Include libmsrpc support (default) - --without-libmsrpc Don't include libmsrpc support ], -[ case "$withval" in - no) - AC_MSG_RESULT(yes) - LIBMSRPC="bin/libmsrpc.so" - - if test x$ATTEMPT_LIBMSRPC32_BUILD = x; then - LIBMSRPC32="" - else - LIBMSRPC32=bin/libmsrpc.32.so - fi - -# Conditions under which libmsrpc should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libmsrpc - LIBMSRPC="" - LIBMSRPC32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - -################################################# -# check for libubiqx support -AC_MSG_CHECKING(whether to use libubiqx) -AC_ARG_WITH(libubiqx, -[ --with-libubiqx Include SMB libubiqx support (default) - --without-libubiqx Don't include SMB libubiqx support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBUBIQX="bin/libubiqx.so" - - if test x$ATTEMPT_LIBUBIQX32_BUILD = x; then - LIBUBIQX32="" - else - LIBUBIQX32=bin/libubiqx.32.so - fi - -# Conditions under which libubiqx should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libubiqx - LIBUBIQX="" - LIBUBIQX32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - -################################################# -# check for libsamba support -AC_MSG_CHECKING(whether to use libsamba) -AC_ARG_WITH(libsamba, -[ --with-libsamba Include SMB libsamba support (default) - --without-libsamba Don't include SMB libsamba support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBSAMBA="bin/libsamba.so" - - if test x$ATTEMPT_LIBSAMBA32_BUILD = x; then - LIBSAMBA32="" - else - LIBSAMBA32=bin/libsamba.32.so - fi - -# Conditions under which libsamba should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsamba - LIBSAMBA="" - LIBSAMBA32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - -################################################# -# check for libnmb support -AC_MSG_CHECKING(whether to use libnmb) -AC_ARG_WITH(libnmb, -[ --with-libnmb Include NMB libnmb support (default) - --without-libnmb Don't include NMB libnmb support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBNMB="bin/libnmb.so" - - if test x$ATTEMPT_LIBNMB32_BUILD = x; then - LIBNMB32="" - else - LIBNMB32=bin/libnmb.32.so - fi - -# Conditions under which libnmb should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libnmb - LIBNMB="" - LIBNMB32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - -################################################# -# check for libsurs support -AC_MSG_CHECKING(whether to use libsurs) -AC_ARG_WITH(libsurs, -[ --with-libsurs Include SMB libsurs support (default) - --without-libsurs Don't include SMB libsurs support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBSURS="bin/libsurs.so" - - if test x$ATTEMPT_LIBSURS32_BUILD = x; then - LIBSURS32="" - else - LIBSURS32=bin/libsurs.32.so - fi - -# Conditions under which libsurs should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsurs - LIBSURS="" - LIBSURS32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - -################################################# -# check for libsmbpw support -AC_MSG_CHECKING(whether to use libsmbpw) -AC_ARG_WITH(libsmbpw, -[ --with-libsmbpw Include SMB libsmbpw support (default) - --without-libsmbpw Don't include SMB libsmbpw support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBSMBPW="bin/libsmbpw.so" - - if test x$ATTEMPT_LIBSMBPW32_BUILD = x; then - LIBSMBPW32="" - else - LIBSMBPW32=bin/libsmbpw.32.so - fi - -# Conditions under which libsmbpw should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsmbpw - LIBSMBPW="" - LIBSMBPW32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - - -################################################# -# check for libsmb support -AC_MSG_CHECKING(whether to use libsmb) -AC_ARG_WITH(libsmb, -[ --with-libsmb Include SMB libsmb support (default) - --without-libsmb Don't include SMB libsmb support ], -[ case "$withval" in - yes) - AC_MSG_RESULT(yes) - LIBSMB="bin/libsmb.so" - - if test x$ATTEMPT_LIBSMB32_BUILD = x; then - LIBSMB32="" - else - LIBSMB32=bin/libsmb.32.so - fi - -# Conditions under which libsmb should not be built. - - if test x$PICFLAG = x; then - echo No support for PIC code - disabling libsmb - LIBSMB="" - LIBSMB32="" - fi - ;; - *) - AC_MSG_RESULT(no) - ;; - esac ], - AC_MSG_RESULT(yes) -) - - -################################################# # check for smbwrapper support AC_MSG_CHECKING(whether to use smbwrapper) AC_ARG_WITH(smbwrapper, @@ -1391,6 +1145,24 @@ AC_SUBST(QUOTAOBJS) ################################################# # set private directory location +AC_ARG_WITH(privatedir, +[ --with-privatedir=DIR Where to put smbpasswd ($ac_default_prefix/private)], +[ case "$withval" in + yes|no) + # + # Just in case anybody calls it without argument + # + AC_MSG_WARN([--with-privatedir called without argument - will use default]) + privatedir='${prefix}/private' + ;; + * ) + privatedir="$withval" + ;; + esac + AC_SUBST(privatedir)], + [privatedir='${prefix}/private' + AC_SUBST(privatedir)] +) ################################################# # set lock directory location diff --git a/source/include/config.h.in b/source/include/config.h.in index 17aaa709083..0bddf76a6ab 100644 --- a/source/include/config.h.in +++ b/source/include/config.h.in @@ -33,6 +33,9 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef mode_t +/* Define if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Define to `long' if <sys/types.h> doesn't define. */ #undef off_t @@ -71,6 +74,7 @@ #undef loff_t #undef offset_t #undef aclent_t +#undef wchar_t #undef HAVE_CONNECT #undef HAVE_SHORT_INO_T #undef WITH_SMBWRAPPER @@ -157,6 +161,8 @@ #undef WITH_NT5LDAP +#undef HAVE_VOLATILE + /* The number of bytes in a int. */ #undef SIZEOF_INT @@ -625,6 +631,9 @@ /* Define if you have the yp_get_default_domain function. */ #undef HAVE_YP_GET_DEFAULT_DOMAIN +/* Define if you have the <arpa/inet.h> header file. */ +#undef HAVE_ARPA_INET_H + /* Define if you have the <compat.h> header file. */ #undef HAVE_COMPAT_H @@ -808,9 +817,21 @@ /* Define if you have the <utime.h> header file. */ #undef HAVE_UTIME_H +/* Define if you have the <utmp.h> header file. */ +#undef HAVE_UTMP_H + +/* Define if you have the <utmpx.h> header file. */ +#undef HAVE_UTMPX_H + +/* Define if you have the cups library (-lcups). */ +#undef HAVE_LIBCUPS + /* Define if you have the dl library (-ldl). */ #undef HAVE_LIBDL +/* Define if you have the gen library (-lgen). */ +#undef HAVE_LIBGEN + /* Define if you have the inet library (-linet). */ #undef HAVE_LIBINET diff --git a/source/include/lib_smb_proto.h b/source/include/lib_smb_proto.h index dc440bde120..ed94d1e16f3 100644 --- a/source/include/lib_smb_proto.h +++ b/source/include/lib_smb_proto.h @@ -23,74 +23,6 @@ void MD5Update(struct MD5Context *ctx, uchar const *buf, unsigned len); void MD5Final(uchar digest[16], struct MD5Context *ctx); void MD5Transform(uint32 buf[4], const uchar inext[64]); -/*The following definitions come from lib/util_hnd.c */ - -struct policy_cache *get_global_hnd_cache(void); -struct policy_cache *init_policy_cache(int num_pol_hnds); -void free_policy_cache(struct policy_cache *cache); -BOOL policy_hnd_set_name(struct policy_cache *cache, - POLICY_HND *hnd, const char *name); -const char *policy_hnd_get_name(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL dup_policy_hnd(struct policy_cache *cache, - POLICY_HND *hnd, - const POLICY_HND *from); -BOOL register_policy_hnd(struct policy_cache *cache, - const vuser_key *key, - POLICY_HND *hnd, - uint32 access_mask); -BOOL open_policy_hnd(struct policy_cache *cache, - const vuser_key *key, - POLICY_HND *hnd, - uint32 access_mask); -BOOL open_policy_hnd_link(struct policy_cache *cache, - const POLICY_HND *parent_hnd, - POLICY_HND *hnd, - uint32 access_mask); -int find_policy_by_hnd(struct policy_cache *cache, const POLICY_HND *hnd); -BOOL set_policy_state(struct policy_cache *cache, POLICY_HND *hnd, - void(*fn)(void*), void *dev); -void *get_policy_state_info(struct policy_cache *cache, const POLICY_HND *hnd); -BOOL policy_hnd_set_state_type(struct policy_cache *cache, - POLICY_HND *hnd, int type); -int policy_hnd_get_state_type(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL policy_hnd_check_state_type(struct policy_cache *cache, - const POLICY_HND *hnd, int type); -BOOL close_policy_hnd(struct policy_cache *cache, POLICY_HND *hnd); -BOOL policy_link_key(struct policy_cache *cache, const POLICY_HND *hnd, - POLICY_HND *to); -const vuser_key *get_policy_vuser_key(struct policy_cache *cache, - const POLICY_HND *hnd); -BOOL pol_get_usr_sesskey(struct policy_cache *cache, const POLICY_HND *hnd, - uchar usr_sess_key[16]); - -/*The following definitions come from lib/vuser.c */ - -BOOL is_valid_user_struct(const vuser_key * key); -user_struct *get_valid_user_struct(const vuser_key * key); -void invalidate_vuid(vuser_key * key); -BOOL validated_username(vuser_key * key, char *name, size_t len); -uint16 create_vuid(pid_t pid, - uid_t uid, gid_t gid, - int n_groups, gid_t * groups, - const char *unix_name, - const char *requested_name, - const char *real_name, - BOOL guest, const NET_USER_INFO_3 * info3); -uint16 register_vuid(pid_t pid, uid_t uid, gid_t gid, - const char *unix_name, - const char *requested_name, - BOOL guest, const NET_USER_INFO_3 * info3); -BOOL check_vuser_ok(struct uid_cache *cache, user_struct * vuser, int snum); - -/*The following definitions come from lib/vuser_db.c */ - -BOOL tdb_delete_vuid( const vuser_key *uk); -BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); -BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); -BOOL vuid_init_db(void); - /*The following definitions come from libsmb/clientgen.c */ int cli_set_port(struct cli_state *cli, int port); @@ -308,6 +240,74 @@ BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); char *smb_errstr(char *inbuf); +/*The following definitions come from lib/util_hnd.c */ + +struct policy_cache *get_global_hnd_cache(void); +struct policy_cache *init_policy_cache(int num_pol_hnds); +void free_policy_cache(struct policy_cache *cache); +BOOL policy_hnd_set_name(struct policy_cache *cache, + POLICY_HND *hnd, const char *name); +const char *policy_hnd_get_name(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL dup_policy_hnd(struct policy_cache *cache, + POLICY_HND *hnd, + const POLICY_HND *from); +BOOL register_policy_hnd(struct policy_cache *cache, + const vuser_key *key, + POLICY_HND *hnd, + uint32 access_mask); +BOOL open_policy_hnd(struct policy_cache *cache, + const vuser_key *key, + POLICY_HND *hnd, + uint32 access_mask); +BOOL open_policy_hnd_link(struct policy_cache *cache, + const POLICY_HND *parent_hnd, + POLICY_HND *hnd, + uint32 access_mask); +int find_policy_by_hnd(struct policy_cache *cache, const POLICY_HND *hnd); +BOOL set_policy_state(struct policy_cache *cache, POLICY_HND *hnd, + void(*fn)(void*), void *dev); +void *get_policy_state_info(struct policy_cache *cache, const POLICY_HND *hnd); +BOOL policy_hnd_set_state_type(struct policy_cache *cache, + POLICY_HND *hnd, int type); +int policy_hnd_get_state_type(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL policy_hnd_check_state_type(struct policy_cache *cache, + const POLICY_HND *hnd, int type); +BOOL close_policy_hnd(struct policy_cache *cache, POLICY_HND *hnd); +BOOL policy_link_key(struct policy_cache *cache, const POLICY_HND *hnd, + POLICY_HND *to); +const vuser_key *get_policy_vuser_key(struct policy_cache *cache, + const POLICY_HND *hnd); +BOOL pol_get_usr_sesskey(struct policy_cache *cache, const POLICY_HND *hnd, + uchar usr_sess_key[16]); + +/*The following definitions come from lib/vuser.c */ + +BOOL is_valid_user_struct(const vuser_key * key); +user_struct *get_valid_user_struct(const vuser_key * key); +void invalidate_vuid(vuser_key * key); +BOOL validated_username(vuser_key * key, char *name, size_t len); +uint16 create_vuid(pid_t pid, + uid_t uid, gid_t gid, + int n_groups, gid_t * groups, + const char *unix_name, + const char *requested_name, + const char *real_name, + BOOL guest, const NET_USER_INFO_3 * info3); +uint16 register_vuid(pid_t pid, uid_t uid, gid_t gid, + const char *unix_name, + const char *requested_name, + BOOL guest, const NET_USER_INFO_3 * info3); +BOOL check_vuser_ok(struct uid_cache *cache, user_struct * vuser, int snum); + +/*The following definitions come from lib/vuser_db.c */ + +BOOL tdb_delete_vuid( const vuser_key *uk); +BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); +BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); +BOOL vuid_init_db(void); + /*The following definitions come from rpc_parse/parse_creds.c */ BOOL make_creds_unix(CREDS_UNIX *r_u, const char* user_name, @@ -344,83 +344,6 @@ BOOL create_user_creds( prs_struct *ps, const vuser_key *key, const struct user_creds *usr); -/*The following definitions come from rpc_parse/parse_misc.c */ - -BOOL smb_io_bigint(char *desc, BIGINT *bigint, prs_struct *ps, int depth); -BOOL smb_io_time(char *desc, NTTIME *nttime, prs_struct *ps, int depth); -BOOL smb_io_lookup_level(char *desc, LOOKUP_LEVEL *level, prs_struct *ps, int depth); -uint32 get_enum_hnd(ENUM_HND *enh); -BOOL make_enum_hnd(ENUM_HND *enh, uint32 hnd); -BOOL smb_io_enum_hnd(char *desc, ENUM_HND *hnd, prs_struct *ps, int depth); -BOOL smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth); -BOOL make_dom_sid2(DOM_SID2 *sid2, const DOM_SID *sid); -BOOL smb_io_dom_sid2(char *desc, DOM_SID2 *sid, prs_struct *ps, int depth); -BOOL make_str_hdr(STRHDR *hdr, int max_len, int len, uint32 buffer); -BOOL smb_io_strhdr(char *desc, STRHDR *hdr, prs_struct *ps, int depth); -BOOL make_strhdr2(STRHDR2 *hdr, uint32 max_len, uint32 len, uint32 buffer); -BOOL smb_io_strhdr2(char *desc, STRHDR2 *hdr, prs_struct *ps, int depth); -BOOL make_uni_hdr(UNIHDR *hdr, int len); -BOOL make_unihdr_from_unistr2(UNIHDR *hdr, const UNISTR2 *str); -BOOL smb_io_unihdr(char *desc, UNIHDR *hdr, prs_struct *ps, int depth); -BOOL make_buf_hdr(BUFHDR *hdr, int max_len, int len); -BOOL smb_io_hdrbuf_pre(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, uint32 *offset); -BOOL smb_io_hdrbuf_post(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, - uint32 ptr_hdrbuf, uint32 max_len, uint32 len); -BOOL smb_io_hdrbuf(char *desc, BUFHDR *hdr, prs_struct *ps, int depth); -BOOL make_bufhdr2(BUFHDR2 *hdr, uint32 info_level, uint32 length, uint32 buffer); -BOOL smb_io_bufhdr2(char *desc, BUFHDR2 *hdr, prs_struct *ps, int depth); -BOOL make_uni_hdr2(UNIHDR2 *hdr, int len); -BOOL make_unihdr2_from_unistr2(UNIHDR2 *hdr, const UNISTR2 *str); -BOOL smb_io_unihdr2(char *desc, UNIHDR2 *hdr2, prs_struct *ps, int depth); -BOOL make_unistr(UNISTR *str, char *buf); -BOOL smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth); -BOOL make_buffer3_uint32(BUFFER3 *str, uint32 val); -BOOL make_buffer3_str(BUFFER3 *str, const char *buf, int len); -BOOL make_buffer3_hex(BUFFER3 *str, char *buf); -BOOL make_buffer3_bytes(BUFFER3 *str, uint8 *buf, int len); -BOOL smb_io_buffer3(char *desc, BUFFER3 *buf3, prs_struct *ps, int depth); -BOOL make_buffer4_str(BUFFER4 *str, const char *buf, int len); -BOOL smb_io_buffer4(char *desc, BUFFER4 *buf4, uint32 buffer, prs_struct *ps, int depth); -BOOL init_buffer5(BUFFER5 **str); -BOOL clear_buffer5(BUFFER5 **str); -BOOL make_buffer5(BUFFER5 *str, char *buf, int len); -BOOL smb_io_buffer5(char *desc, BUFFER5 *buf5, prs_struct *ps, int depth); -BOOL make_buffer2_multi(BUFFER2 *str, char *const* const buf, uint32 num); -BOOL make_buffer2(BUFFER2 *str, const char *buf, int len); -BOOL smb_io_buffer2(char *desc, BUFFER2 *buf2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_buf_unistr2(UNISTR2 *str, uint32 *ptr, const char *buf); -BOOL make_string2(STRING2 *str, const char *buf, int len); -BOOL make_buf_string2(STRING2 *str, uint32 *ptr, const char *buf); -BOOL smb_io_string2(char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_unistr2(UNISTR2 *str, const char *buf, int len); -BOOL smb_io_unistr2(char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx); -BOOL smb_io_dom_rid2(char *desc, DOM_RID2 *rid2, prs_struct *ps, int depth); -BOOL make_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type); -BOOL smb_io_dom_rid3(char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth); -BOOL make_log_info(DOM_LOG_INFO *log, - const char *logon_srv, const char *acct_name, - uint16 sec_chan, const char *comp_name); -BOOL smb_io_log_info(char *desc, DOM_LOG_INFO *log, prs_struct *ps, int depth); -BOOL smb_io_chal(char *desc, DOM_CHAL *chal, prs_struct *ps, int depth); -BOOL smb_io_cred(char *desc, DOM_CRED *cred, prs_struct *ps, int depth); -BOOL make_clnt_info2(DOM_CLNT_INFO2 *clnt, - const char *logon_srv, const char *comp_name, - DOM_CRED *clnt_cred); -BOOL smb_io_clnt_info2(char *desc, DOM_CLNT_INFO2 *clnt, prs_struct *ps, int depth); -BOOL make_clnt_info(DOM_CLNT_INFO *clnt, - const char *logon_srv, const char *acct_name, - uint16 sec_chan, const char *comp_name, - DOM_CRED *cred); -BOOL smb_io_clnt_info(char *desc, DOM_CLNT_INFO *clnt, prs_struct *ps, int depth); -BOOL make_owf_info(OWF_INFO *hash, const uint8 data[16]); -BOOL smb_io_owf_info(char *desc, OWF_INFO *hash, prs_struct *ps, int depth); -BOOL smb_io_gid(char *desc, DOM_GID *gid, prs_struct *ps, int depth); -BOOL smb_io_pol_hnd(char *desc, POLICY_HND *pol, prs_struct *ps, int depth); -BOOL smb_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); -BOOL smb_io_dom_query_5(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); -BOOL smb_io_unistr3(char *desc, UNISTR3 *name, prs_struct *ps, int depth); - /*The following definitions come from rpc_parse/parse_net.c */ BOOL make_q_logon_ctrl2(NET_Q_LOGON_CTRL2 * q_l, diff --git a/source/include/proto.h b/source/include/proto.h index cc7e975f4e0..ed8f37fe030 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -388,10 +388,269 @@ void CatchChildLeaveStatus(void); int vslprintf(char *str, int n, char *format, va_list ap); +/*The following definitions come from libsmb/clientgen.c */ + +int cli_set_port(struct cli_state *cli, int port); +char *cli_errstr(struct cli_state *cli); +void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); +BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); +void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); +BOOL cli_send_trans(struct cli_state *cli, int trans, + char *name, int pipe_name_len, + int fid, int flags, + uint16 *setup, int lsetup, int msetup, + char *param, int lparam, int mparam, + char *data, int ldata, int mdata); +BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, + uint16 *setup, uint32 setup_count, uint32 max_setup_count, + char *params, uint32 param_count, uint32 max_param_count, + char *data, uint32 data_count, uint32 max_data_count, + char **rparam, uint32 *rparam_count, + char **rdata, uint32 *rdata_count); +BOOL cli_api(struct cli_state *cli, + char *param, int prcnt, int mprcnt, + char *data, int drcnt, int mdrcnt, + char **rparam, int *rprcnt, + char **rdata, int *rdrcnt); +BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); +BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); +BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, + void (*fn)(const char *, uint32, const char *)); +BOOL cli_session_setup_x(struct cli_state *cli, + char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_session_setup(struct cli_state *cli, + char *myhostname, char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_ulogoff(struct cli_state *cli); +BOOL cli_send_tconX(struct cli_state *cli, + char *share, char *dev, char *pass, int passlen); +BOOL cli_tdis(struct cli_state *cli); +BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); +BOOL cli_unlink(struct cli_state *cli, char *fname); +BOOL cli_mkdir(struct cli_state *cli, char *dname); +BOOL cli_rmdir(struct cli_state *cli, char *dname); +int cli_nt_create(struct cli_state *cli, const char *fname); +int cli_open(struct cli_state *cli, const char *fname, + int flags, int share_mode); +BOOL cli_close(struct cli_state *cli, int fnum); +BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); +size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); +ssize_t cli_write(struct cli_state *cli, + int fnum, uint16 write_mode, + char *buf, off_t offset, size_t size, size_t bytes_left); +BOOL cli_getattrE(struct cli_state *cli, int fd, + uint16 *attr, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time); +BOOL cli_getatr(struct cli_state *cli, char *fname, + uint16 *attr, size_t *size, time_t *t); +BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); +BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + size_t *size, uint16 *mode); +BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, size_t *size, uint16 *mode, + SMB_INO_T *ino); +BOOL cli_qfileinfo(struct cli_state *cli, int fnum, + uint16 *mode, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, SMB_INO_T *ino); +int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, + void (*fn)(file_info *, const char *)); +BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, + const char *old_password); +BOOL cli_negprot(struct cli_state *cli); +BOOL cli_session_request(struct cli_state *cli, + struct nmb_name *calling, struct nmb_name *called); +BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); +void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); +struct cli_state *cli_initialise(struct cli_state *cli); +void cli_close_socket(struct cli_state *cli); +void cli_shutdown(struct cli_state *cli); +int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); +void cli_sockopt(struct cli_state *cli, char *options); +uint16 cli_setpid(struct cli_state *cli, uint16 pid); +BOOL cli_reestablish_connection(struct cli_state *cli); +BOOL cli_establish_connection(struct cli_state *cli, + const char *dest_host, struct in_addr *dest_ip, + struct nmb_name *calling, struct nmb_name *called, + char *service, char *service_type, + BOOL do_shutdown, BOOL do_tcon); +BOOL cli_connect_auth(struct cli_state *cli, + const char* desthost, + struct in_addr *dest_ip, + const struct ntuser_creds *usr); +BOOL cli_connect_servers_auth(struct cli_state *cli, + char *p, + const struct ntuser_creds *usr); +BOOL cli_connect_serverlist(struct cli_state *cli, char *p); +int cli_printjob_del(struct cli_state *cli, int job); +int cli_print_queue(struct cli_state *cli, + void (*fn)(struct print_job_info *)); +BOOL cli_chkpath(struct cli_state *cli, char *path); +BOOL cli_message_start(struct cli_state *cli, char *host, char *username, + int *grp); +BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); +BOOL cli_message_end(struct cli_state *cli, int grp); +BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); +BOOL get_any_dc_name(const char *domain, char *srv_name); + +/*The following definitions come from libsmb/credentials.c */ + +char *credstr(const uchar *cred); +void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, + uchar session_key[8]); +void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, + DOM_CHAL *cred); +int cred_assert(const DOM_CHAL *cred, uchar session_key[8], + DOM_CHAL *stored_cred, UTIME timestamp); +BOOL clnt_deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); +BOOL deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, + const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); + +/*The following definitions come from libsmb/namequery.c */ + +BOOL name_status(int fd,char *name,int name_type,BOOL recurse, + struct in_addr to_ip,char *master,char *rname, + void (*fn)(struct packet_struct *)); +struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse, + struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *)); +FILE *startlmhosts(char *fname); +BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); +void endlmhosts(FILE *fp); +BOOL is_ip_address(const char *name); +BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); +BOOL resolve_srv_name(const char* srv_name, fstring dest_host, + struct in_addr *ip); +BOOL find_master_ip(char *group, struct in_addr *master_ip); + +/*The following definitions come from libsmb/nmblib.c */ + +void debug_nmb_packet(struct packet_struct *p); +char *nmb_namestr(struct nmb_name *n); +void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); +struct packet_struct *copy_packet(struct packet_struct *packet); +void free_packet(struct packet_struct *packet); +struct packet_struct *read_packet(int fd,enum packet_type packet_type); +void make_nmb_name( struct nmb_name *n, const char *name, int type, const char *this_scope ); +BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); +BOOL send_packet(struct packet_struct *p); +struct packet_struct *receive_packet(int fd,enum packet_type type,int t); +void sort_query_replies(char *data, int n, struct in_addr ip); +BOOL read_nmb_sock(int c, struct nmb_state *con); +int get_nmb_sock(void); +char *dns_to_netbios_name(char *dns_name); +int name_mangle( char *In, char *Out, char name_type ); +int name_extract(char *buf,int ofs,char *name); +int name_len(char *s1); + +/*The following definitions come from libsmb/nterr.c */ + +BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); +const char *get_nt_error_msg(uint32 nt_code); + +/*The following definitions come from libsmb/passchange.c */ + +BOOL remote_password_change(const char *remote_machine, const char *user_name, + const char *old_passwd, const char *new_passwd, + char *err_str, size_t err_str_len); + +/*The following definitions come from libsmb/pwd_cache.c */ + +void pwd_init(struct pwd_info *pwd); +BOOL pwd_is_nullpwd(const struct pwd_info *pwd); +void pwd_obfuscate_key(struct pwd_info *pwd, uint32 int_key, char *str_key); +BOOL pwd_compare(const struct pwd_info *_pwd1, const struct pwd_info *_pwd2); +void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); +void pwd_set_nullpwd(struct pwd_info *pwd); +void pwd_set_cleartext(struct pwd_info *pwd, char *clr); +void pwd_get_cleartext(struct pwd_info *pwd, char *clr); +void pwd_set_lm_nt_16(struct pwd_info *pwd, + const uchar lm_pwd[16], + const uchar nt_pwd[16]); +void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); +void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], + const char *user, const char *server, const char *domain, + uchar sess_key[16]); +void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], + uchar sess_key[16]); +void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], + uchar *nt_owf, size_t *nt_owf_len); + /*The following definitions come from lib/smbrun.c */ int smbrun(char *cmd,char *outfile,BOOL shared); +/*The following definitions come from libsmb/smbdes.c */ + +void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); +void E_P16(uchar *p14,uchar *p16); +void E_P24(const uchar *p21, const uchar *c8, uchar *p24); +void D_P16(const uchar *p14, const uchar *in, uchar *out); +void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); +void cred_hash1(uchar *out, const uchar *in, const uchar *key); +void cred_hash2(uchar *out,uchar *in,uchar *key); +void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); +void SamOEMhash( uchar *data, const uchar *key, int val); +void sam_pwd_hash(uint32 rid, const uchar *in, uchar *out, int forw); + +/*The following definitions come from libsmb/smbencrypt.c */ + +void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void E_md4hash(uchar * pwrd, uchar * p16); +void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); +void lm_owf_gen(const char *pwd, uchar p16[16]); +void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); +void nt_owf_gen(const char *pwd, uchar nt_p16[16]); +void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); +void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); +void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); +void SMBOWFencrypt_ntv2(const uchar kr[16], + const uchar * srv_chal, int srv_chal_len, + const uchar * cli_chal, int cli_chal_len, + char resp_buf[16]); +void SMBsesskeygen_ntv2(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBsesskeygen_ntv1(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBgenclientchals(char *lm_cli_chal, + char *nt_cli_chal, int *nt_cli_chal_len, + const char *srv, const char *dom); +void ntv2_owf_gen(const uchar owf[16], + const char *user_n, const char *domain_n, uchar kr_buf[16]); +void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, + uchar p24[24]); +BOOL make_oem_passwd_hash(uchar data[516], + const char *pwrd, int new_pw_len, + const uchar old_pw_hash[16], BOOL unicode); +BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +void create_ntlmssp_resp(struct pwd_info *pwd, + char *domain, char *user_name, char *my_name, + uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); +BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, + int new_pwrd_size, uint32 * new_pw_len); +BOOL encode_pw_buffer(char buffer[516], const char *new_pass, + int new_pw_len, BOOL nt_pass_set); + +/*The following definitions come from libsmb/smberr.c */ + +char *smb_err_msg(uint8 class, uint32 num); +BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); +BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); +char *smb_errstr(char *inbuf); + /*The following definitions come from lib/snprintf.c */ @@ -401,11 +660,6 @@ void become_root(BOOL save_dir); void unbecome_root(BOOL restore_dir); const vuser_key *get_sec_ctx(void); -/*The following definitions come from lib/surs.c */ - -BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); -BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); - /*The following definitions come from lib/sursalgdomonly.c */ BOOL surs_algdomonly_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, @@ -420,6 +674,11 @@ BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID * sid, uint32 type, BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type, DOM_SID * sid, BOOL create); +/*The following definitions come from lib/surs.c */ + +BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); +BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); + /*The following definitions come from lib/surstdb.c */ BOOL surs_tdb_sam_sid_to_unixid(DOM_SID * sid, uint32 type, uint32 * id, @@ -492,6 +751,25 @@ const struct passwd *Get_Pwnam(char *user,BOOL allow_change); BOOL user_ok(char *user,int snum); BOOL user_in_list(char *user,char *list); +/*The following definitions come from lib/util_array.c */ + +void free_void_array(uint32 num_entries, void **entries, + void(free_item)(void*)); +void* add_copy_to_array(uint32 *len, void ***array, const void *item, + void*(item_dup)(const void*), BOOL alloc_anyway); +void* add_item_to_array(uint32 *len, void ***array, void *item); +void free_use_info_array(uint32 num_entries, struct use_info **entries); +struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, + const struct use_info *name); +void free_char_array(uint32 num_entries, char **entries); +char* add_chars_to_array(uint32 *len, char ***array, const char *name); +void free_uint32_array(uint32 num_entries, uint32 **entries); +uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); +void free_unistr_array(uint32 num_entries, UNISTR2 **entries); +UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); +void free_sid_array(uint32 num_entries, DOM_SID **entries); +DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); + /*The following definitions come from lib/util.c */ BOOL init_myworkgroup(void); @@ -599,25 +877,6 @@ char *passdb_path(char *name); char *lock_path(char *name); const char *get_sid_name_use_str(uint32 sid_name_use); -/*The following definitions come from lib/util_array.c */ - -void free_void_array(uint32 num_entries, void **entries, - void(free_item)(void*)); -void* add_copy_to_array(uint32 *len, void ***array, const void *item, - void*(item_dup)(const void*), BOOL alloc_anyway); -void* add_item_to_array(uint32 *len, void ***array, void *item); -void free_use_info_array(uint32 num_entries, struct use_info **entries); -struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, - const struct use_info *name); -void free_char_array(uint32 num_entries, char **entries); -char* add_chars_to_array(uint32 *len, char ***array, const char *name); -void free_uint32_array(uint32 num_entries, uint32 **entries); -uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); -void free_unistr_array(uint32 num_entries, UNISTR2 **entries); -UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); -void free_sid_array(uint32 num_entries, DOM_SID **entries); -DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); - /*The following definitions come from lib/util_file.c */ BOOL do_file_lock(int fd, int waitsecs, int type); @@ -851,265 +1110,6 @@ BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); BOOL vuid_init_db(void); -/*The following definitions come from libsmb/clientgen.c */ - -int cli_set_port(struct cli_state *cli, int port); -char *cli_errstr(struct cli_state *cli); -void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); -BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); -void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); -BOOL cli_send_trans(struct cli_state *cli, int trans, - char *name, int pipe_name_len, - int fid, int flags, - uint16 *setup, int lsetup, int msetup, - char *param, int lparam, int mparam, - char *data, int ldata, int mdata); -BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, - uint16 *setup, uint32 setup_count, uint32 max_setup_count, - char *params, uint32 param_count, uint32 max_param_count, - char *data, uint32 data_count, uint32 max_data_count, - char **rparam, uint32 *rparam_count, - char **rdata, uint32 *rdata_count); -BOOL cli_api(struct cli_state *cli, - char *param, int prcnt, int mprcnt, - char *data, int drcnt, int mdrcnt, - char **rparam, int *rprcnt, - char **rdata, int *rdrcnt); -BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); -BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); -BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, - void (*fn)(const char *, uint32, const char *)); -BOOL cli_session_setup_x(struct cli_state *cli, - char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_session_setup(struct cli_state *cli, - char *myhostname, char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_ulogoff(struct cli_state *cli); -BOOL cli_send_tconX(struct cli_state *cli, - char *share, char *dev, char *pass, int passlen); -BOOL cli_tdis(struct cli_state *cli); -BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); -BOOL cli_unlink(struct cli_state *cli, char *fname); -BOOL cli_mkdir(struct cli_state *cli, char *dname); -BOOL cli_rmdir(struct cli_state *cli, char *dname); -int cli_nt_create(struct cli_state *cli, const char *fname); -int cli_open(struct cli_state *cli, const char *fname, - int flags, int share_mode); -BOOL cli_close(struct cli_state *cli, int fnum); -BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); -size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); -ssize_t cli_write(struct cli_state *cli, - int fnum, uint16 write_mode, - char *buf, off_t offset, size_t size, size_t bytes_left); -BOOL cli_getattrE(struct cli_state *cli, int fd, - uint16 *attr, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time); -BOOL cli_getatr(struct cli_state *cli, char *fname, - uint16 *attr, size_t *size, time_t *t); -BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); -BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - size_t *size, uint16 *mode); -BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, size_t *size, uint16 *mode, - SMB_INO_T *ino); -BOOL cli_qfileinfo(struct cli_state *cli, int fnum, - uint16 *mode, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, SMB_INO_T *ino); -int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(file_info *, const char *)); -BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, - const char *old_password); -BOOL cli_negprot(struct cli_state *cli); -BOOL cli_session_request(struct cli_state *cli, - struct nmb_name *calling, struct nmb_name *called); -BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); -void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); -struct cli_state *cli_initialise(struct cli_state *cli); -void cli_close_socket(struct cli_state *cli); -void cli_shutdown(struct cli_state *cli); -int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); -void cli_sockopt(struct cli_state *cli, char *options); -uint16 cli_setpid(struct cli_state *cli, uint16 pid); -BOOL cli_reestablish_connection(struct cli_state *cli); -BOOL cli_establish_connection(struct cli_state *cli, - const char *dest_host, struct in_addr *dest_ip, - struct nmb_name *calling, struct nmb_name *called, - char *service, char *service_type, - BOOL do_shutdown, BOOL do_tcon); -BOOL cli_connect_auth(struct cli_state *cli, - const char* desthost, - struct in_addr *dest_ip, - const struct ntuser_creds *usr); -BOOL cli_connect_servers_auth(struct cli_state *cli, - char *p, - const struct ntuser_creds *usr); -BOOL cli_connect_serverlist(struct cli_state *cli, char *p); -int cli_printjob_del(struct cli_state *cli, int job); -int cli_print_queue(struct cli_state *cli, - void (*fn)(struct print_job_info *)); -BOOL cli_chkpath(struct cli_state *cli, char *path); -BOOL cli_message_start(struct cli_state *cli, char *host, char *username, - int *grp); -BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); -BOOL cli_message_end(struct cli_state *cli, int grp); -BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); -BOOL get_any_dc_name(const char *domain, char *srv_name); - -/*The following definitions come from libsmb/credentials.c */ - -char *credstr(const uchar *cred); -void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, - uchar session_key[8]); -void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, - DOM_CHAL *cred); -int cred_assert(const DOM_CHAL *cred, uchar session_key[8], - DOM_CHAL *stored_cred, UTIME timestamp); -BOOL clnt_deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); -BOOL deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, - const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); - -/*The following definitions come from libsmb/namequery.c */ - -BOOL name_status(int fd,char *name,int name_type,BOOL recurse, - struct in_addr to_ip,char *master,char *rname, - void (*fn)(struct packet_struct *)); -struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse, - struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *)); -FILE *startlmhosts(char *fname); -BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); -void endlmhosts(FILE *fp); -BOOL is_ip_address(const char *name); -BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); -BOOL resolve_srv_name(const char* srv_name, fstring dest_host, - struct in_addr *ip); -BOOL find_master_ip(char *group, struct in_addr *master_ip); - -/*The following definitions come from libsmb/nmblib.c */ - -void debug_nmb_packet(struct packet_struct *p); -char *nmb_namestr(struct nmb_name *n); -void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); -struct packet_struct *copy_packet(struct packet_struct *packet); -void free_packet(struct packet_struct *packet); -struct packet_struct *read_packet(int fd,enum packet_type packet_type); -void make_nmb_name( struct nmb_name *n, const char *name, int type, const char *this_scope ); -BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); -BOOL send_packet(struct packet_struct *p); -struct packet_struct *receive_packet(int fd,enum packet_type type,int t); -void sort_query_replies(char *data, int n, struct in_addr ip); -BOOL read_nmb_sock(int c, struct nmb_state *con); -int get_nmb_sock(void); -char *dns_to_netbios_name(char *dns_name); -int name_mangle( char *In, char *Out, char name_type ); -int name_extract(char *buf,int ofs,char *name); -int name_len(char *s1); - -/*The following definitions come from libsmb/nterr.c */ - -BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); -const char *get_nt_error_msg(uint32 nt_code); - -/*The following definitions come from libsmb/passchange.c */ - -BOOL remote_password_change(const char *remote_machine, const char *user_name, - const char *old_passwd, const char *new_passwd, - char *err_str, size_t err_str_len); - -/*The following definitions come from libsmb/pwd_cache.c */ - -void pwd_init(struct pwd_info *pwd); -BOOL pwd_is_nullpwd(const struct pwd_info *pwd); -void pwd_obfuscate_key(struct pwd_info *pwd, uint32 int_key, char *str_key); -BOOL pwd_compare(const struct pwd_info *_pwd1, const struct pwd_info *_pwd2); -void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); -void pwd_set_nullpwd(struct pwd_info *pwd); -void pwd_set_cleartext(struct pwd_info *pwd, char *clr); -void pwd_get_cleartext(struct pwd_info *pwd, char *clr); -void pwd_set_lm_nt_16(struct pwd_info *pwd, - const uchar lm_pwd[16], - const uchar nt_pwd[16]); -void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); -void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); -void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], - const char *user, const char *server, const char *domain, - uchar sess_key[16]); -void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], - uchar sess_key[16]); -void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], - uchar *nt_owf, size_t *nt_owf_len); - -/*The following definitions come from libsmb/smbdes.c */ - -void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); -void E_P16(uchar *p14,uchar *p16); -void E_P24(const uchar *p21, const uchar *c8, uchar *p24); -void D_P16(const uchar *p14, const uchar *in, uchar *out); -void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); -void cred_hash1(uchar *out, const uchar *in, const uchar *key); -void cred_hash2(uchar *out,uchar *in,uchar *key); -void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); -void SamOEMhash( uchar *data, const uchar *key, int val); -void sam_pwd_hash(uint32 rid, const uchar *in, uchar *out, int forw); - -/*The following definitions come from libsmb/smbencrypt.c */ - -void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void E_md4hash(uchar * pwrd, uchar * p16); -void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); -void lm_owf_gen(const char *pwd, uchar p16[16]); -void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); -void nt_owf_gen(const char *pwd, uchar nt_p16[16]); -void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); -void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); -void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); -void SMBOWFencrypt_ntv2(const uchar kr[16], - const uchar * srv_chal, int srv_chal_len, - const uchar * cli_chal, int cli_chal_len, - char resp_buf[16]); -void SMBsesskeygen_ntv2(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBsesskeygen_ntv1(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBgenclientchals(char *lm_cli_chal, - char *nt_cli_chal, int *nt_cli_chal_len, - const char *srv, const char *dom); -void ntv2_owf_gen(const uchar owf[16], - const char *user_n, const char *domain_n, uchar kr_buf[16]); -void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, - uchar p24[24]); -BOOL make_oem_passwd_hash(uchar data[516], - const char *pwrd, int new_pw_len, - const uchar old_pw_hash[16], BOOL unicode); -BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -void create_ntlmssp_resp(struct pwd_info *pwd, - char *domain, char *user_name, char *my_name, - uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); -BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, - int new_pwrd_size, uint32 * new_pw_len); -BOOL encode_pw_buffer(char buffer[516], const char *new_pass, - int new_pw_len, BOOL nt_pass_set); - -/*The following definitions come from libsmb/smberr.c */ - -char *smb_err_msg(uint8 class, uint32 num); -BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); -BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); -char *smb_errstr(char *inbuf); - /*The following definitions come from locking/locking.c */ BOOL is_locked(files_struct *fsp,connection_struct *conn, @@ -1262,9 +1262,6 @@ BOOL queue_dns_query(struct packet_struct *p,struct nmb_name *question, struct name_record **n); void kill_async_dns_child(void); -/*The following definitions come from nmbd/nmbd.c */ - - /*The following definitions come from nmbd/nmbd_become_dmb.c */ void add_domain_names(time_t t); @@ -1295,6 +1292,9 @@ void announce_and_sync_with_domain_master_browser( struct subnet_record *subrec, void collect_all_workgroup_names_from_wins_server(time_t t); void sync_all_dmbs(time_t t); +/*The following definitions come from nmbd/nmbd.c */ + + /*The following definitions come from nmbd/nmbd_elections.c */ void check_master_browser_exists(time_t t); @@ -2054,11 +2054,6 @@ void init_devicemode(NT_DEVICEMODE *nt_devmode); BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname); void pcap_printer_fn(void (*fn)(char *, char *)); -/*The following definitions come from printing/print_svid.c */ - -void sysv_printer_fn(void (*fn)(char *, char *)); -int sysv_printername_ok(char *name); - /*The following definitions come from printing/printing.c */ void lpq_reset(int snum); @@ -2077,6 +2072,11 @@ uint32 status_printqueue(connection_struct *conn,const vuser_key *key, int snum,int status); void load_printers(void); +/*The following definitions come from printing/print_svid.c */ + +void sysv_printer_fn(void (*fn)(char *, char *)); +int sysv_printername_ok(char *name); + /*The following definitions come from profile/profile.c */ BOOL profile_setup(BOOL rdonly); @@ -2547,6 +2547,283 @@ void cli_use_wait_keyboard(void); BOOL wks_query_info( char *srv_name, uint32 switch_value, WKS_INFO_100 *wks100); +/*The following definitions come from rpcclient/cmdat.c */ + + +/*The following definitions come from rpcclient/cmdat_cmds.c */ + +void add_at_commands(void); + +/*The following definitions come from rpcclient/cmd_atsvc.c */ + +void cmd_at(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_brs.c */ + +void cmd_brs_query_info(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_eventlog.c */ + +void cmd_eventlog(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_lsarpc.c */ + +void cmd_lsa_enum_trust_dom(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_info(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_lookup_names(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_lookup_sids(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_set_secret(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_create_secret(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_secret_secobj(struct client_info *info, int argc, char *argv[]); +void cmd_lsa_query_secret(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_netlogon.c */ + +void cmd_netlogon_login_test(struct client_info *info, int argc, char *argv[]); +void cmd_netlogon_domain_test(struct client_info *info, int argc, + char *argv[]); +void cmd_sam_sync(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_reg.c */ + +void split_server_keyname(char *srv_name, char *key, const char* arg); +BOOL msrpc_reg_enum_key(const char* srv_name, const char* full_keyname, + REG_FN(reg_fn), + REG_KEY_FN(reg_key_fn), + REG_VAL_FN(reg_val_fn)); +void cmd_reg_enum(struct client_info *info, int argc, char *argv[]); +void cmd_reg_query_info(struct client_info *info, int argc, char *argv[]); +void cmd_reg_query_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_create_val(struct client_info *info, int argc, char *argv[]); +void cmd_reg_delete_val(struct client_info *info, int argc, char *argv[]); +void cmd_reg_delete_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_create_key(struct client_info *info, int argc, char *argv[]); +void cmd_reg_test_key_sec(struct client_info *info, int argc, char *argv[]); +void cmd_reg_get_key_sec(struct client_info *info, int argc, char *argv[]); +void cmd_reg_shutdown(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_samr.c */ + +void cmd_sam_ntchange_pwd(struct client_info *info, int argc, char *argv[]); +void cmd_sam_test(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_domain(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_names(struct client_info *info, int argc, char *argv[]); +void cmd_sam_lookup_rids(struct client_info *info, int argc, char *argv[]); +void cmd_sam_del_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_alias(struct client_info *info, int argc, char *argv[]); +void cmd_sam_add_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_trusting(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_alias(struct client_info *info, int argc, char *argv[]); +void cmd_sam_del_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_delete_dom_group(struct client_info *info, int argc, char *argv[]); +void cmd_sam_add_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_create_dom_group(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_users(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_groupmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_group(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_sec_obj(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_user(struct client_info *info, int argc, char *argv[]); +void cmd_sam_set_userinfo2(struct client_info *info, int argc, char *argv[]); +void cmd_sam_set_userinfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_dispinfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_dominfo(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_aliasmem(struct client_info *info, int argc, char *argv[]); +void cmd_sam_query_alias(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_aliases(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_groups(struct client_info *info, int argc, char *argv[]); +void cmd_sam_enum_domains(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_spoolss.c */ + +BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, uint32 level, PRINTER_INFO_CTR ctr); +void cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[]); +void cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_spoolss_enum_jobs( const char* printer_name, + const char* station, const char* user_name, + uint32 level, + void ***ctr, JOB_INFO_FN(fn)); +void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, const char* station, const char* user_name ); +void cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_srvsvc.c */ + +BOOL net_srv_get_info(struct client_info *info, + uint32 info_level, + SRV_INFO_CTR *ctr); +void cmd_srv_query_info(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_srv_enum_tprt( const char* dest_srv, + uint32 info_level, + SRV_TPRT_INFO_CTR *ctr, + TPRT_INFO_FN(tprt_fn)); +void cmd_srv_enum_tprt(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_conn(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_shares(struct client_info *info, int argc, char *argv[]); +void cmd_srv_share_get_info(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_sess(struct client_info *info, int argc, char *argv[]); +void cmd_srv_enum_files(struct client_info *info, int argc, char *argv[]); +void cmd_time(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_svcctl.c */ + +void svc_display_query_svc_cfg(const QUERY_SERVICE_CONFIG *cfg); +BOOL svc_query_service( POLICY_HND *pol_scm, + const char *svc_name, + SVC_QUERY_FN(svc_query_fn)); +void cmd_svc_info(struct client_info *info, int argc, char *argv[]); +BOOL msrpc_svc_enum(const char* srv_name, + ENUM_SRVC_STATUS **svcs, + uint32 *num_svcs, + SVC_INFO_FN(info_fn), + SVC_QUERY_FN(query_fn)); +void cmd_svc_enum(struct client_info *info, int argc, char *argv[]); +void cmd_svc_stop(struct client_info *info, int argc, char *argv[]); +void cmd_svc_start(struct client_info *info, int argc, char *argv[]); +void cmd_svc_set(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/cmd_wkssvc.c */ + +void cmd_wks_query_info(struct client_info *info, int argc, char *argv[]); + +/*The following definitions come from rpcclient/display_at.c */ + +void display_at_enum_info(FILE *out_hnd, enum action_type action, + uint32 num_jobs, const AT_ENUM_INFO *const jobs, + char *const *const commands); +void display_at_job_info(FILE *out_hnd, enum action_type action, + AT_JOB_INFO *const job, fstring command); + +/*The following definitions come from rpcclient/display_event.c */ + +void display_eventlog_eventrecord(FILE *out_hnd, enum action_type action, EVENTLOGRECORD *const ev); + +/*The following definitions come from rpcclient/display_reg.c */ + +char *get_reg_val_type_str(uint32 type); +void display_reg_value_info(FILE *out_hnd, enum action_type action, + const char *val_name, + uint32 val_type, const BUFFER2 *value); +void display_reg_key_info(FILE *out_hnd, enum action_type action, + const char *key_name, time_t key_mod_time); + +/*The following definitions come from rpcclient/display_sam.c */ + +void display_alias_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, char *const *const sid_mem, + uint32 *const type); +void display_alias_rid_info(FILE *out_hnd, enum action_type action, + DOM_SID *const sid, + uint32 num_rids, uint32 *const rid); +void display_group_members(FILE *out_hnd, enum action_type action, + uint32 num_mem, char *const *const name, uint32 *const type); +void display_group_info_ctr(FILE *out_hnd, enum action_type action, + GROUP_INFO_CTR *const ctr); +void display_group_rid_info(FILE *out_hnd, enum action_type action, + uint32 num_gids, DOM_GID *const gid); +void display_alias_name_info(FILE *out_hnd, enum action_type action, + uint32 num_aliases, fstring *const alias_name, const uint32 *const num_als_usrs); +void display_alias_info_ctr(FILE *out_hnd, enum action_type action, + ALIAS_INFO_CTR *const ctr); +void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *const usr); +void display_sam_unk_ctr(FILE *out_hnd, enum action_type action, + uint32 switch_value, SAM_UNK_CTR *const ctr); +void display_sam_disp_info_ctr(FILE *out_hnd, enum action_type action, + uint16 level, uint32 count, + SAM_DISPINFO_CTR *const ctr); + +/*The following definitions come from rpcclient/display_sec.c */ + +void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *const sec); + +/*The following definitions come from rpcclient/display_spool.c */ + +void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level, + uint32 count, PRINTER_INFO_CTR ctr); +void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 idx, + uint32 valuelen, uint16 *value, uint32 rvaluelen, + uint32 type, + uint32 datalen, uint8 *data, uint32 rdatalen); +void display_job_info_2(FILE *out_hnd, enum action_type action, + JOB_INFO_2 *const i2); +void display_job_info_1(FILE *out_hnd, enum action_type action, + JOB_INFO_1 *const i1); +void display_job_info_2_ctr(FILE *out_hnd, enum action_type action, + uint32 count, JOB_INFO_2 *const *const ctr); +void display_job_info_1_ctr(FILE *out_hnd, enum action_type action, + uint32 count, JOB_INFO_1 *const *const ctr); +void display_job_info_ctr(FILE *out_hnd, enum action_type action, + uint32 level, uint32 count, + void *const *const ctr); + +/*The following definitions come from rpcclient/display_srv.c */ + +char *get_file_oplock_str(uint32 op_type); +void display_srv_info_ctr(FILE *out_hnd, enum action_type action, + const SRV_INFO_CTR *ctr); +void display_srv_conn_info_ctr(FILE *out_hnd, enum action_type action, + SRV_CONN_INFO_CTR *const ctr); +void display_tprt_info_0(FILE *out_hnd, enum action_type action, + TPRT_INFO_0 *const info0, TPRT_INFO_0_STR *const str0); +void display_srv_tprt_info_0_ctr(FILE *out_hnd, enum action_type action, + const SRV_TPRT_INFO_0 *const ctr); +void display_srv_tprt_info_ctr(FILE *out_hnd, enum action_type action, + const SRV_TPRT_INFO_CTR *const ctr); +void display_srv_share_info_ctr(FILE *out_hnd, enum action_type action, + SRV_SHARE_INFO_CTR *const ctr); +void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action, + SRV_FILE_INFO_CTR *const ctr); +void display_srv_sess_info_0_ctr(FILE *out_hnd, enum action_type action, + SRV_SESS_INFO_0 *const ctr); +void display_srv_sess_info_1_ctr(FILE *out_hnd, enum action_type action, + SRV_SESS_INFO_1 *const ctr); +void display_srv_sess_info_ctr(FILE *out_hnd, enum action_type action, + SRV_SESS_INFO_CTR *const ctr); +void display_server(FILE *out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment); +void display_share(FILE *out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment); +void display_share2(FILE *out_hnd, enum action_type action, + char *const sname, uint32 type, char *const comment, + uint32 perms, uint32 max_uses, uint32 num_uses, + char *const path, char *const password); +void display_name(FILE *out_hnd, enum action_type action, + char *const sname); + +/*The following definitions come from rpcclient/display_svc.c */ + +char *get_svc_start_type_str(uint32 type); +void display_query_svc_cfg(FILE *out_hnd, enum action_type action, + const QUERY_SERVICE_CONFIG *const cfg); +void display_svc_info(FILE *out_hnd, enum action_type action, + const ENUM_SRVC_STATUS *const svc); + +/*The following definitions come from rpcclient/display_sync.c */ + +void display_sam_sync_ctr(FILE *out_hnd, enum action_type action, + SAM_DELTA_HDR *const delta, + SAM_DELTA_CTR *const ctr); +void display_sam_sync(FILE *out_hnd, enum action_type action, + SAM_DELTA_HDR *const deltas, + SAM_DELTA_CTR *const ctr, + uint32 num); + +/*The following definitions come from rpcclient/eventlog.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/eventlog_cmds.c */ + +void add_evt_commands(void); + +/*The following definitions come from rpcclient/lsa.c */ + + +/*The following definitions come from rpcclient/lsa_cmds.c */ + +void add_lsa_commands(void); + /*The following definitions come from rpc_client/msrpc_lsarpc.c */ uint32 lookup_lsa_names(const char *srv_name, @@ -2802,6 +3079,51 @@ BOOL ncalrpc_l_use_del(const char *pipe_name, void ncalrpc_l_use_enum(uint32 * num_cons, struct use_info ***use); void ncalrpc_use_wait_keyboard(void); +/*The following definitions come from rpcclient/net.c */ + + +/*The following definitions come from rpcclient/net_cmds.c */ + +void add_net_commands(void); + +/*The following definitions come from rpcclient/netlogon_cmds.c */ + +void add_ntl_commands(void); + +/*The following definitions come from rpcclient/regedit.c */ + + +/*The following definitions come from rpcclient/regedit_cmds.c */ + +void add_reg_commands(void); + +/*The following definitions come from rpcclient/rpcclient.c */ + + +/*The following definitions come from rpcclient/samedit.c */ + + +/*The following definitions come from rpcclient/samedit_cmds.c */ + +void add_sam_commands(void); + +/*The following definitions come from rpcclient/spoolss.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/spoolss_cmds.c */ + +void add_spl_commands(void); + +/*The following definitions come from rpcclient/svcctrl.c */ + +int main(int argc, char *argv[]); + +/*The following definitions come from rpcclient/svcctrl_cmds.c */ + +char *complete_svcenum(char *text, int state); +void add_svc_commands(void); + /*The following definitions come from rpc_parse/parse_creds.c */ BOOL make_creds_unix(CREDS_UNIX *r_u, const char* user_name, @@ -3408,359 +3730,14 @@ BOOL api_svcctl_rpc(rpcsrv_struct *p); BOOL api_wkssvc_rpc(rpcsrv_struct *p); -/*The following definitions come from rpcclient/cmd_atsvc.c */ - -void cmd_at(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_brs.c */ - -void cmd_brs_query_info(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_eventlog.c */ - -void cmd_eventlog(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_lsarpc.c */ - -void cmd_lsa_enum_trust_dom(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_info(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_lookup_names(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_lookup_sids(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_set_secret(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_create_secret(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_secret_secobj(struct client_info *info, int argc, char *argv[]); -void cmd_lsa_query_secret(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_netlogon.c */ - -void cmd_netlogon_login_test(struct client_info *info, int argc, char *argv[]); -void cmd_netlogon_domain_test(struct client_info *info, int argc, - char *argv[]); -void cmd_sam_sync(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_reg.c */ - -void split_server_keyname(char *srv_name, char *key, const char* arg); -BOOL msrpc_reg_enum_key(const char* srv_name, const char* full_keyname, - REG_FN(reg_fn), - REG_KEY_FN(reg_key_fn), - REG_VAL_FN(reg_val_fn)); -void cmd_reg_enum(struct client_info *info, int argc, char *argv[]); -void cmd_reg_query_info(struct client_info *info, int argc, char *argv[]); -void cmd_reg_query_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_create_val(struct client_info *info, int argc, char *argv[]); -void cmd_reg_delete_val(struct client_info *info, int argc, char *argv[]); -void cmd_reg_delete_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_create_key(struct client_info *info, int argc, char *argv[]); -void cmd_reg_test_key_sec(struct client_info *info, int argc, char *argv[]); -void cmd_reg_get_key_sec(struct client_info *info, int argc, char *argv[]); -void cmd_reg_shutdown(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_samr.c */ - -void cmd_sam_ntchange_pwd(struct client_info *info, int argc, char *argv[]); -void cmd_sam_test(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_domain(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_names(struct client_info *info, int argc, char *argv[]); -void cmd_sam_lookup_rids(struct client_info *info, int argc, char *argv[]); -void cmd_sam_del_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_alias(struct client_info *info, int argc, char *argv[]); -void cmd_sam_add_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_trusting(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_alias(struct client_info *info, int argc, char *argv[]); -void cmd_sam_del_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_delete_dom_group(struct client_info *info, int argc, char *argv[]); -void cmd_sam_add_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_create_dom_group(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_users(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_groupmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_group(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_sec_obj(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_user(struct client_info *info, int argc, char *argv[]); -void cmd_sam_set_userinfo2(struct client_info *info, int argc, char *argv[]); -void cmd_sam_set_userinfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_dispinfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_dominfo(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_aliasmem(struct client_info *info, int argc, char *argv[]); -void cmd_sam_query_alias(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_aliases(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_groups(struct client_info *info, int argc, char *argv[]); -void cmd_sam_enum_domains(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_spoolss.c */ - -BOOL msrpc_spoolss_enum_printers(char* srv_name, uint32 flags, uint32 level, PRINTER_INFO_CTR ctr); -void cmd_spoolss_enum_printers(struct client_info *info, int argc, char *argv[]); -void cmd_spoolss_open_printer_ex(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_spoolss_enum_jobs( const char* printer_name, - const char* station, const char* user_name, - uint32 level, - void ***ctr, JOB_INFO_FN(fn)); -void cmd_spoolss_enum_jobs(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_spoolss_enum_printerdata( const char* printer_name, const char* station, const char* user_name ); -void cmd_spoolss_enum_printerdata(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_srvsvc.c */ - -BOOL net_srv_get_info(struct client_info *info, - uint32 info_level, - SRV_INFO_CTR *ctr); -void cmd_srv_query_info(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_srv_enum_tprt( const char* dest_srv, - uint32 info_level, - SRV_TPRT_INFO_CTR *ctr, - TPRT_INFO_FN(tprt_fn)); -void cmd_srv_enum_tprt(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_conn(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_shares(struct client_info *info, int argc, char *argv[]); -void cmd_srv_share_get_info(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_sess(struct client_info *info, int argc, char *argv[]); -void cmd_srv_enum_files(struct client_info *info, int argc, char *argv[]); -void cmd_time(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_svcctl.c */ - -void svc_display_query_svc_cfg(const QUERY_SERVICE_CONFIG *cfg); -BOOL svc_query_service( POLICY_HND *pol_scm, - const char *svc_name, - SVC_QUERY_FN(svc_query_fn)); -void cmd_svc_info(struct client_info *info, int argc, char *argv[]); -BOOL msrpc_svc_enum(const char* srv_name, - ENUM_SRVC_STATUS **svcs, - uint32 *num_svcs, - SVC_INFO_FN(info_fn), - SVC_QUERY_FN(query_fn)); -void cmd_svc_enum(struct client_info *info, int argc, char *argv[]); -void cmd_svc_stop(struct client_info *info, int argc, char *argv[]); -void cmd_svc_start(struct client_info *info, int argc, char *argv[]); -void cmd_svc_set(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmd_wkssvc.c */ - -void cmd_wks_query_info(struct client_info *info, int argc, char *argv[]); - -/*The following definitions come from rpcclient/cmdat.c */ - - -/*The following definitions come from rpcclient/cmdat_cmds.c */ - -void add_at_commands(void); - -/*The following definitions come from rpcclient/display_at.c */ - -void display_at_enum_info(FILE *out_hnd, enum action_type action, - uint32 num_jobs, const AT_ENUM_INFO *const jobs, - char *const *const commands); -void display_at_job_info(FILE *out_hnd, enum action_type action, - AT_JOB_INFO *const job, fstring command); - -/*The following definitions come from rpcclient/display_event.c */ - -void display_eventlog_eventrecord(FILE *out_hnd, enum action_type action, EVENTLOGRECORD *const ev); - -/*The following definitions come from rpcclient/display_reg.c */ - -char *get_reg_val_type_str(uint32 type); -void display_reg_value_info(FILE *out_hnd, enum action_type action, - const char *val_name, - uint32 val_type, const BUFFER2 *value); -void display_reg_key_info(FILE *out_hnd, enum action_type action, - const char *key_name, time_t key_mod_time); - -/*The following definitions come from rpcclient/display_sam.c */ - -void display_alias_members(FILE *out_hnd, enum action_type action, - uint32 num_mem, char *const *const sid_mem, - uint32 *const type); -void display_alias_rid_info(FILE *out_hnd, enum action_type action, - DOM_SID *const sid, - uint32 num_rids, uint32 *const rid); -void display_group_members(FILE *out_hnd, enum action_type action, - uint32 num_mem, char *const *const name, uint32 *const type); -void display_group_info1(FILE *out_hnd, enum action_type action, GROUP_INFO1 *const info1); -void display_group_info4(FILE *out_hnd, enum action_type action, GROUP_INFO4 *const info4); -void display_group_info_ctr(FILE *out_hnd, enum action_type action, - GROUP_INFO_CTR *const ctr); -void display_group_rid_info(FILE *out_hnd, enum action_type action, - uint32 num_gids, DOM_GID *const gid); -void display_alias_name_info(FILE *out_hnd, enum action_type action, - uint32 num_aliases, fstring *const alias_name, const uint32 *const num_als_usrs); -void display_alias_info3(FILE *out_hnd, enum action_type action, ALIAS_INFO3 *const info3); -void display_alias_info_ctr(FILE *out_hnd, enum action_type action, - ALIAS_INFO_CTR *const ctr); -void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_INFO_21 *const usr); -void display_sam_unk_info_2(FILE *out_hnd, enum action_type action, - SAM_UNK_INFO_2 *const info2); -void display_sam_unk_ctr(FILE *out_hnd, enum action_type action, - uint32 switch_value, SAM_UNK_CTR *const ctr); -void display_sam_info_1(FILE *out_hnd, enum action_type action, - SAM_ENTRY1 *const e1, SAM_STR1 *const s1); -void display_sam_info_1_ctr(FILE *out_hnd, enum action_type action, - uint32 count, SAM_DISPINFO_1 *const ctr); -void display_sam_disp_info_ctr(FILE *out_hnd, enum action_type action, - uint16 level, uint32 count, - SAM_DISPINFO_CTR *const ctr); - -/*The following definitions come from rpcclient/display_sec.c */ - -void display_sec_desc(FILE *out_hnd, enum action_type action, SEC_DESC *const sec); - -/*The following definitions come from rpcclient/display_spool.c */ - -void display_printer_info_ctr(FILE *out_hnd, enum action_type action, uint32 level, - uint32 count, PRINTER_INFO_CTR ctr); -void display_printer_enumdata(FILE *out_hnd, enum action_type action, uint32 idx, - uint32 valuelen, uint16 *value, uint32 rvaluelen, - uint32 type, - uint32 datalen, uint8 *data, uint32 rdatalen); -void display_job_info_2(FILE *out_hnd, enum action_type action, - JOB_INFO_2 *const i2); -void display_job_info_1(FILE *out_hnd, enum action_type action, - JOB_INFO_1 *const i1); -void display_job_info_2_ctr(FILE *out_hnd, enum action_type action, - uint32 count, JOB_INFO_2 *const *const ctr); -void display_job_info_1_ctr(FILE *out_hnd, enum action_type action, - uint32 count, JOB_INFO_1 *const *const ctr); -void display_job_info_ctr(FILE *out_hnd, enum action_type action, - uint32 level, uint32 count, - void *const *const ctr); - -/*The following definitions come from rpcclient/display_srv.c */ - -char *get_file_mode_str(uint32 share_mode); -char *get_file_oplock_str(uint32 op_type); -char *get_server_type_str(uint32 type); -void display_srv_info_ctr(FILE *out_hnd, enum action_type action, - const SRV_INFO_CTR *ctr); -void display_conn_info_0(FILE *out_hnd, enum action_type action, - CONN_INFO_0 *const info0); -void display_conn_info_1(FILE *out_hnd, enum action_type action, - CONN_INFO_1 *const info1, CONN_INFO_1_STR *const str1); -void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action, - SRV_CONN_INFO_0 *const ctr); -void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action, - SRV_CONN_INFO_1 *const ctr); -void display_srv_conn_info_ctr(FILE *out_hnd, enum action_type action, - SRV_CONN_INFO_CTR *const ctr); -void display_tprt_info_0(FILE *out_hnd, enum action_type action, - TPRT_INFO_0 *const info0, TPRT_INFO_0_STR *const str0); -void display_srv_tprt_info_0_ctr(FILE *out_hnd, enum action_type action, - const SRV_TPRT_INFO_0 *const ctr); -void display_srv_tprt_info_ctr(FILE *out_hnd, enum action_type action, - const SRV_TPRT_INFO_CTR *const ctr); -void display_srv_share_info_ctr(FILE *out_hnd, enum action_type action, - SRV_SHARE_INFO_CTR *const ctr); -void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action, - SRV_FILE_INFO_CTR *const ctr); -void display_sess_info_0(FILE *out_hnd, enum action_type action, - SESS_INFO_0 *const info0, SESS_INFO_0_STR *const str0); -void display_sess_info_1(FILE *out_hnd, enum action_type action, - SESS_INFO_1 *const info1, SESS_INFO_1_STR *const str1); -void display_srv_sess_info_0_ctr(FILE *out_hnd, enum action_type action, - SRV_SESS_INFO_0 *const ctr); -void display_srv_sess_info_1_ctr(FILE *out_hnd, enum action_type action, - SRV_SESS_INFO_1 *const ctr); -void display_srv_sess_info_ctr(FILE *out_hnd, enum action_type action, - SRV_SESS_INFO_CTR *const ctr); -void display_server(FILE *out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment); -void display_share(FILE *out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment); -void display_share2(FILE *out_hnd, enum action_type action, - char *const sname, uint32 type, char *const comment, - uint32 perms, uint32 max_uses, uint32 num_uses, - char *const path, char *const password); -void display_name(FILE *out_hnd, enum action_type action, - char *const sname); - -/*The following definitions come from rpcclient/display_svc.c */ - -char *get_svc_start_type_str(uint32 type); -void display_query_svc_cfg(FILE *out_hnd, enum action_type action, - const QUERY_SERVICE_CONFIG *const cfg); -void display_svc_info(FILE *out_hnd, enum action_type action, - const ENUM_SRVC_STATUS *const svc); - -/*The following definitions come from rpcclient/display_sync.c */ - -void display_sam_sync_ctr(FILE *out_hnd, enum action_type action, - SAM_DELTA_HDR *const delta, - SAM_DELTA_CTR *const ctr); -void display_sam_sync(FILE *out_hnd, enum action_type action, - SAM_DELTA_HDR *const deltas, - SAM_DELTA_CTR *const ctr, - uint32 num); - -/*The following definitions come from rpcclient/eventlog.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/eventlog_cmds.c */ - -void add_evt_commands(void); - -/*The following definitions come from rpcclient/lsa.c */ - - -/*The following definitions come from rpcclient/lsa_cmds.c */ - -void add_lsa_commands(void); - -/*The following definitions come from rpcclient/net.c */ - - -/*The following definitions come from rpcclient/net_cmds.c */ - -void add_net_commands(void); - -/*The following definitions come from rpcclient/netlogon_cmds.c */ - -void add_ntl_commands(void); - -/*The following definitions come from rpcclient/regedit.c */ - - -/*The following definitions come from rpcclient/regedit_cmds.c */ - -void add_reg_commands(void); - -/*The following definitions come from rpcclient/rpcclient.c */ - - -/*The following definitions come from rpcclient/samedit.c */ - - -/*The following definitions come from rpcclient/samedit_cmds.c */ - -void add_sam_commands(void); - -/*The following definitions come from rpcclient/spoolss.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/spoolss_cmds.c */ - -void add_spl_commands(void); - -/*The following definitions come from rpcclient/svcctrl.c */ - -int main(int argc, char *argv[]); - -/*The following definitions come from rpcclient/svcctrl_cmds.c */ +/*The following definitions come from samrd/samrd.c */ -char *complete_svcenum(char *text, int state); -void add_svc_commands(void); +msrpc_service_fns *get_service_fns(void); /*The following definitions come from samrd/samr_util.c */ uint32 samr_make_usr_obj_sd(SEC_DESC_BUF *buf, DOM_SID *usr_sid); -/*The following definitions come from samrd/samrd.c */ - -msrpc_service_fns *get_service_fns(void); - /*The following definitions come from samrd/srv_samr_als_tdb.c */ uint32 _samr_add_aliasmem(const POLICY_HND *alias_pol, const DOM_SID *sid); @@ -3920,6 +3897,139 @@ uint32 samr_open_by_nt5ldaprid( LDAPDB *hds, POLICY_HND *pol, uint32 access_mask, uint32 rid); BOOL pwdbsam_initialise(void); +/*The following definitions come from samrd/srv_samr_passdb.c */ + +uint32 _samr_close(POLICY_HND *hnd); +uint32 _samr_unknown_2d(const POLICY_HND *domain_pol, const DOM_SID *sid); +uint32 _samr_open_domain(const POLICY_HND *connect_pol, + uint32 ace_perms, + const DOM_SID *sid, + POLICY_HND *domain_pol); +uint32 _samr_get_usrdom_pwinfo(const POLICY_HND *user_pol, + uint16 *unknown_0, + uint16 *unknown_1, + uint32 *unknown_2); +uint32 _samr_query_sec_obj(const POLICY_HND *user_pol, SEC_DESC_BUF *buf); +uint32 _samr_enum_dom_users( const POLICY_HND *pol, uint32 *start_idx, + uint16 acb_mask, uint16 unk_1, uint32 size, + SAM_ENTRY **sam, + UNISTR2 **uni_acct_name, + uint32 *num_sam_users); +uint32 _samr_add_groupmem(const POLICY_HND *pol, uint32 rid, uint32 unknown); +uint32 _samr_del_groupmem(const POLICY_HND *pol, uint32 rid); +uint32 _samr_add_aliasmem(const POLICY_HND *alias_pol, const DOM_SID *sid); +uint32 _samr_del_aliasmem(const POLICY_HND *alias_pol, const DOM_SID *sid); +uint32 _samr_enum_domains(const POLICY_HND *pol, uint32 *start_idx, + uint32 size, + SAM_ENTRY **sam, + UNISTR2 **uni_acct_name, + uint32 *num_sam_users); +uint32 _samr_enum_dom_groups(const POLICY_HND *pol, + uint32 *start_idx, uint32 size, + SAM_ENTRY **sam, + UNISTR2 **uni_acct_name, + uint32 *num_sam_groups); +uint32 _samr_enum_dom_aliases(const POLICY_HND *pol, + uint32 *start_idx, uint32 size, + SAM_ENTRY **sam, + UNISTR2 **uni_acct_name, + uint32 *num_sam_aliases); +uint32 _samr_query_dispinfo( const POLICY_HND *domain_pol, uint16 level, + uint32 start_idx, + uint32 max_entries, + uint32 max_size, + uint32 *data_size, + uint32 *num_entries, + SAM_DISPINFO_CTR *ctr); +uint32 _samr_delete_dom_user(POLICY_HND *user_pol); +uint32 _samr_delete_dom_group(POLICY_HND *group_pol); +uint32 _samr_query_groupmem(const POLICY_HND *group_pol, + uint32 *num_mem, + uint32 **rid, + uint32 **attr); +uint32 _samr_set_groupinfo(const POLICY_HND *pol, + uint16 switch_level, + const GROUP_INFO_CTR* ctr); +uint32 _samr_query_groupinfo(const POLICY_HND *pol, + uint16 switch_level, + GROUP_INFO_CTR* ctr); +uint32 _samr_query_aliasinfo(const POLICY_HND *alias_pol, + uint16 switch_level, + ALIAS_INFO_CTR *ctr); +uint32 _samr_query_useraliases(const POLICY_HND *pol, + const uint32 *ptr_sid, const DOM_SID2 *sid, + uint32 *num_aliases, uint32 **rid); +uint32 _samr_delete_dom_alias(POLICY_HND *alias_pol); +uint32 _samr_query_aliasmem(const POLICY_HND *alias_pol, + uint32 *num_mem, DOM_SID2 **sid); +uint32 _samr_lookup_names(const POLICY_HND *pol, + + uint32 num_names1, + uint32 flags, + uint32 ptr, + const UNISTR2 *uni_name, + + uint32 *num_rids1, + uint32 rid[MAX_SAM_ENTRIES], + uint32 *num_types1, + uint32 type[MAX_SAM_ENTRIES]); +uint32 _samr_chgpasswd_user( const UNISTR2 *uni_dest_host, + const UNISTR2 *uni_user_name, + const char nt_newpass[516], + const uchar nt_oldhash[16], + const char lm_newpass[516], + const uchar lm_oldhash[16]); +uint32 _samr_get_dom_pwinfo(const UNISTR2 *uni_srv_name, + uint16 *unk_0, uint16 *unk_1, uint16 *unk_2); +uint32 _samr_lookup_rids(const POLICY_HND *pol, + uint32 num_rids, uint32 flags, + const uint32 *rids, + uint32 *num_names, + UNIHDR **hdr_name, UNISTR2** uni_name, + uint32 **types); +uint32 _samr_open_user(const POLICY_HND *domain_pol, + uint32 access_mask, uint32 user_rid, + POLICY_HND *user_pol); +uint32 _samr_query_userinfo(const POLICY_HND *pol, uint16 switch_value, + SAM_USERINFO_CTR *ctr); +uint32 _samr_set_userinfo(const POLICY_HND *pol, uint16 switch_value, + SAM_USERINFO_CTR *ctr); +uint32 _samr_set_userinfo2(const POLICY_HND *pol, uint16 switch_value, + SAM_USERINFO_CTR *ctr); +uint32 _samr_query_usergroups(const POLICY_HND *pol, + uint32 *num_groups, + DOM_GID **gids); +uint32 _samr_create_dom_alias(const POLICY_HND *domain_pol, + const UNISTR2 *uni_acct_name, + uint32 access_mask, + POLICY_HND *alias_pol, uint32 *rid); +uint32 _samr_create_dom_group(const POLICY_HND *domain_pol, + const UNISTR2 *uni_acct_name, + uint32 access_mask, + POLICY_HND *group_pol, uint32 *rid); +uint32 _samr_query_dom_info(const POLICY_HND *domain_pol, + uint16 switch_value, + SAM_UNK_CTR *ctr); +uint32 _samr_create_user(const POLICY_HND *domain_pol, + const UNISTR2 *uni_username, + uint16 acb_info, uint32 access_mask, + POLICY_HND *user_pol, + uint32 *unknown_0, uint32 *user_rid); +uint32 _samr_connect_anon(const UNISTR2 *srv_name, uint32 access_mask, + POLICY_HND *connect_pol); +uint32 _samr_connect(const UNISTR2 *srv_name, uint32 access_mask, + POLICY_HND *connect_pol); +uint32 _samr_open_alias(const POLICY_HND *domain_pol, + uint32 access_mask, uint32 alias_rid, + POLICY_HND *alias_pol); +uint32 _samr_open_group(const POLICY_HND *domain_pol, uint32 access_mask, + uint32 group_rid, + POLICY_HND *group_pol); +uint32 _samr_lookup_domain(const POLICY_HND *connect_pol, + const UNISTR2 *uni_domain, + DOM_SID *dom_sid); +BOOL pwdbsam_initialise(void); + /*The following definitions come from samrd/srv_samr_sam_tdb.c */ uint32 _samr_enum_domains(const POLICY_HND *pol, uint32 *start_idx, @@ -4055,6 +4165,17 @@ void generate_next_challenge(char *challenge); BOOL set_challenge(unsigned char *challenge); BOOL last_challenge(unsigned char *challenge); +/*The following definitions come from smbd/chgpasswd.c */ + +BOOL chgpasswd(const char *_name,char *oldpass,char *newpass, BOOL as_root); +BOOL chgpasswd(const char *name,char *oldpass,char *newpass, BOOL as_root); +BOOL pass_oem_change(const char *user, + const uchar *lmdata, const uchar *lmhash, + const uchar *ntdata, const uchar *nthash); +BOOL change_oem_password(struct smb_passwd *smbpw, UNISTR2 *new_passwd, + BOOL unicode, BOOL override); +BOOL update_smbpassword_file(const char *user, const char *password); + /*The following definitions come from smbd/close.c */ void close_file(files_struct *fsp, BOOL normal_close); @@ -4438,6 +4559,17 @@ BOOL become_user(connection_struct *conn, uint16 vuid); BOOL become_userk(connection_struct *conn, const vuser_key *key); BOOL unbecome_user(void ); +/*The following definitions come from smbd/vfs.c */ + +int vfs_init_default(connection_struct *conn); +BOOL vfs_init_custom(connection_struct *conn); +BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf); +ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N); +SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, + int out_fd, files_struct *out_fsp, + SMB_OFF_T n, char *header, int headlen, int align); +char *vfs_readdirname(connection_struct *conn, void *p); + /*The following definitions come from smbd/vfs-wrap.c */ int vfswrap_dummy_connect(struct vfs_connection_struct *conn, char *service, @@ -4467,17 +4599,6 @@ int vfswrap_unlink(char *path); int vfswrap_chmod(char *path, mode_t mode); int vfswrap_utime(char *path, struct utimbuf *times); -/*The following definitions come from smbd/vfs.c */ - -int vfs_init_default(connection_struct *conn); -BOOL vfs_init_custom(connection_struct *conn); -BOOL vfs_file_exist(connection_struct *conn,char *fname,SMB_STRUCT_STAT *sbuf); -ssize_t vfs_write_data(files_struct *fsp,char *buffer,size_t N); -SMB_OFF_T vfs_transfer_file(int in_fd, files_struct *in_fsp, - int out_fd, files_struct *out_fsp, - SMB_OFF_T n, char *header, int headlen, int align); -char *vfs_readdirname(connection_struct *conn, void *p); - /*The following definitions come from smbwrapper/realcalls.c */ int real_utime(const char *name, struct utimbuf *buf); diff --git a/source/include/rpc_parse_proto.h b/source/include/rpc_parse_proto.h index cf349a41b77..39de05474d1 100644 --- a/source/include/rpc_parse_proto.h +++ b/source/include/rpc_parse_proto.h @@ -158,6 +158,83 @@ BOOL make_lsa_q_close(LSA_Q_CLOSE * q_c, POLICY_HND *hnd); BOOL lsa_io_q_close(char *desc, LSA_Q_CLOSE * q_c, prs_struct * ps, int depth); BOOL lsa_io_r_close(char *desc, LSA_R_CLOSE * r_c, prs_struct * ps, int depth); +/*The following definitions come from rpc_parse/parse_misc.c */ + +BOOL smb_io_bigint(char *desc, BIGINT *bigint, prs_struct *ps, int depth); +BOOL smb_io_time(char *desc, NTTIME *nttime, prs_struct *ps, int depth); +BOOL smb_io_lookup_level(char *desc, LOOKUP_LEVEL *level, prs_struct *ps, int depth); +uint32 get_enum_hnd(ENUM_HND *enh); +BOOL make_enum_hnd(ENUM_HND *enh, uint32 hnd); +BOOL smb_io_enum_hnd(char *desc, ENUM_HND *hnd, prs_struct *ps, int depth); +BOOL smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth); +BOOL make_dom_sid2(DOM_SID2 *sid2, const DOM_SID *sid); +BOOL smb_io_dom_sid2(char *desc, DOM_SID2 *sid, prs_struct *ps, int depth); +BOOL make_str_hdr(STRHDR *hdr, int max_len, int len, uint32 buffer); +BOOL smb_io_strhdr(char *desc, STRHDR *hdr, prs_struct *ps, int depth); +BOOL make_strhdr2(STRHDR2 *hdr, uint32 max_len, uint32 len, uint32 buffer); +BOOL smb_io_strhdr2(char *desc, STRHDR2 *hdr, prs_struct *ps, int depth); +BOOL make_uni_hdr(UNIHDR *hdr, int len); +BOOL make_unihdr_from_unistr2(UNIHDR *hdr, const UNISTR2 *str); +BOOL smb_io_unihdr(char *desc, UNIHDR *hdr, prs_struct *ps, int depth); +BOOL make_buf_hdr(BUFHDR *hdr, int max_len, int len); +BOOL smb_io_hdrbuf_pre(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, uint32 *offset); +BOOL smb_io_hdrbuf_post(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, + uint32 ptr_hdrbuf, uint32 max_len, uint32 len); +BOOL smb_io_hdrbuf(char *desc, BUFHDR *hdr, prs_struct *ps, int depth); +BOOL make_bufhdr2(BUFHDR2 *hdr, uint32 info_level, uint32 length, uint32 buffer); +BOOL smb_io_bufhdr2(char *desc, BUFHDR2 *hdr, prs_struct *ps, int depth); +BOOL make_uni_hdr2(UNIHDR2 *hdr, int len); +BOOL make_unihdr2_from_unistr2(UNIHDR2 *hdr, const UNISTR2 *str); +BOOL smb_io_unihdr2(char *desc, UNIHDR2 *hdr2, prs_struct *ps, int depth); +BOOL make_unistr(UNISTR *str, char *buf); +BOOL smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth); +BOOL make_buffer3_uint32(BUFFER3 *str, uint32 val); +BOOL make_buffer3_str(BUFFER3 *str, const char *buf, int len); +BOOL make_buffer3_hex(BUFFER3 *str, char *buf); +BOOL make_buffer3_bytes(BUFFER3 *str, uint8 *buf, int len); +BOOL smb_io_buffer3(char *desc, BUFFER3 *buf3, prs_struct *ps, int depth); +BOOL make_buffer4_str(BUFFER4 *str, const char *buf, int len); +BOOL smb_io_buffer4(char *desc, BUFFER4 *buf4, uint32 buffer, prs_struct *ps, int depth); +BOOL init_buffer5(BUFFER5 **str); +BOOL clear_buffer5(BUFFER5 **str); +BOOL make_buffer5(BUFFER5 *str, char *buf, int len); +BOOL smb_io_buffer5(char *desc, BUFFER5 *buf5, prs_struct *ps, int depth); +BOOL make_buffer2_multi(BUFFER2 *str, char *const* const buf, uint32 num); +BOOL make_buffer2(BUFFER2 *str, const char *buf, int len); +BOOL smb_io_buffer2(char *desc, BUFFER2 *buf2, uint32 buffer, prs_struct *ps, int depth); +BOOL make_buf_unistr2(UNISTR2 *str, uint32 *ptr, const char *buf); +BOOL make_string2(STRING2 *str, const char *buf, int len); +BOOL make_buf_string2(STRING2 *str, uint32 *ptr, const char *buf); +BOOL smb_io_string2(char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth); +BOOL make_unistr2(UNISTR2 *str, const char *buf, int len); +BOOL smb_io_unistr2(char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth); +BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx); +BOOL smb_io_dom_rid2(char *desc, DOM_RID2 *rid2, prs_struct *ps, int depth); +BOOL make_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type); +BOOL smb_io_dom_rid3(char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth); +BOOL make_log_info(DOM_LOG_INFO *log, + const char *logon_srv, const char *acct_name, + uint16 sec_chan, const char *comp_name); +BOOL smb_io_log_info(char *desc, DOM_LOG_INFO *log, prs_struct *ps, int depth); +BOOL smb_io_chal(char *desc, DOM_CHAL *chal, prs_struct *ps, int depth); +BOOL smb_io_cred(char *desc, DOM_CRED *cred, prs_struct *ps, int depth); +BOOL make_clnt_info2(DOM_CLNT_INFO2 *clnt, + const char *logon_srv, const char *comp_name, + DOM_CRED *clnt_cred); +BOOL smb_io_clnt_info2(char *desc, DOM_CLNT_INFO2 *clnt, prs_struct *ps, int depth); +BOOL make_clnt_info(DOM_CLNT_INFO *clnt, + const char *logon_srv, const char *acct_name, + uint16 sec_chan, const char *comp_name, + DOM_CRED *cred); +BOOL smb_io_clnt_info(char *desc, DOM_CLNT_INFO *clnt, prs_struct *ps, int depth); +BOOL make_owf_info(OWF_INFO *hash, const uint8 data[16]); +BOOL smb_io_owf_info(char *desc, OWF_INFO *hash, prs_struct *ps, int depth); +BOOL smb_io_gid(char *desc, DOM_GID *gid, prs_struct *ps, int depth); +BOOL smb_io_pol_hnd(char *desc, POLICY_HND *pol, prs_struct *ps, int depth); +BOOL smb_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); +BOOL smb_io_dom_query_5(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); +BOOL smb_io_unistr3(char *desc, UNISTR3 *name, prs_struct *ps, int depth); + /*The following definitions come from rpc_parse/parse_netsec.c */ BOOL rpc_hdr_netsec_auth_chk(RPC_HDR_AUTH *rai); diff --git a/source/include/winbindd_proto.h b/source/include/winbindd_proto.h index 48a4ded8887..6407a73c4d3 100644 --- a/source/include/winbindd_proto.h +++ b/source/include/winbindd_proto.h @@ -185,10 +185,263 @@ void CatchChildLeaveStatus(void); int vslprintf(char *str, int n, char *format, va_list ap); +/*The following definitions come from libsmb/clientgen.c */ + +int cli_set_port(struct cli_state *cli, int port); +char *cli_errstr(struct cli_state *cli); +void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); +BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); +void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); +BOOL cli_send_trans(struct cli_state *cli, int trans, + char *name, int pipe_name_len, + int fid, int flags, + uint16 *setup, int lsetup, int msetup, + char *param, int lparam, int mparam, + char *data, int ldata, int mdata); +BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, + uint16 *setup, uint32 setup_count, uint32 max_setup_count, + char *params, uint32 param_count, uint32 max_param_count, + char *data, uint32 data_count, uint32 max_data_count, + char **rparam, uint32 *rparam_count, + char **rdata, uint32 *rdata_count); +BOOL cli_api(struct cli_state *cli, + char *param, int prcnt, int mprcnt, + char *data, int drcnt, int mdrcnt, + char **rparam, int *rprcnt, + char **rdata, int *rdrcnt); +BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); +BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); +BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, + void (*fn)(const char *, uint32, const char *)); +BOOL cli_session_setup_x(struct cli_state *cli, + char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_session_setup(struct cli_state *cli, + char *myhostname, char *user, + char *pass, int passlen, + char *ntpass, int ntpasslen, + char *user_domain); +BOOL cli_ulogoff(struct cli_state *cli); +BOOL cli_send_tconX(struct cli_state *cli, + char *share, char *dev, char *pass, int passlen); +BOOL cli_tdis(struct cli_state *cli); +BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); +BOOL cli_unlink(struct cli_state *cli, char *fname); +BOOL cli_mkdir(struct cli_state *cli, char *dname); +BOOL cli_rmdir(struct cli_state *cli, char *dname); +int cli_nt_create(struct cli_state *cli, const char *fname); +int cli_open(struct cli_state *cli, const char *fname, + int flags, int share_mode); +BOOL cli_close(struct cli_state *cli, int fnum); +BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); +size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); +size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); +ssize_t cli_write(struct cli_state *cli, + int fnum, uint16 write_mode, + char *buf, off_t offset, size_t size, size_t bytes_left); +BOOL cli_getattrE(struct cli_state *cli, int fd, + uint16 *attr, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time); +BOOL cli_getatr(struct cli_state *cli, char *fname, + uint16 *attr, size_t *size, time_t *t); +BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); +BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + size_t *size, uint16 *mode); +BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, size_t *size, uint16 *mode, + SMB_INO_T *ino); +BOOL cli_qfileinfo(struct cli_state *cli, int fnum, + uint16 *mode, size_t *size, + time_t *c_time, time_t *a_time, time_t *m_time, + time_t *w_time, SMB_INO_T *ino); +int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, + void (*fn)(file_info *, const char *)); +BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, + const char *old_password); +BOOL cli_negprot(struct cli_state *cli); +BOOL cli_session_request(struct cli_state *cli, + struct nmb_name *calling, struct nmb_name *called); +BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); +void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); +struct cli_state *cli_initialise(struct cli_state *cli); +void cli_close_socket(struct cli_state *cli); +void cli_shutdown(struct cli_state *cli); +int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); +void cli_sockopt(struct cli_state *cli, char *options); +uint16 cli_setpid(struct cli_state *cli, uint16 pid); +BOOL cli_reestablish_connection(struct cli_state *cli); +BOOL cli_establish_connection(struct cli_state *cli, + const char *dest_host, struct in_addr *dest_ip, + struct nmb_name *calling, struct nmb_name *called, + char *service, char *service_type, + BOOL do_shutdown, BOOL do_tcon); +BOOL cli_connect_auth(struct cli_state *cli, + const char* desthost, + struct in_addr *dest_ip, + const struct ntuser_creds *usr); +BOOL cli_connect_servers_auth(struct cli_state *cli, + char *p, + const struct ntuser_creds *usr); +BOOL cli_connect_serverlist(struct cli_state *cli, char *p); +int cli_printjob_del(struct cli_state *cli, int job); +int cli_print_queue(struct cli_state *cli, + void (*fn)(struct print_job_info *)); +BOOL cli_chkpath(struct cli_state *cli, char *path); +BOOL cli_message_start(struct cli_state *cli, char *host, char *username, + int *grp); +BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); +BOOL cli_message_end(struct cli_state *cli, int grp); +BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); +BOOL get_any_dc_name(const char *domain, char *srv_name); + +/*The following definitions come from libsmb/credentials.c */ + +char *credstr(const uchar *cred); +void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, + uchar session_key[8]); +void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, + DOM_CHAL *cred); +int cred_assert(const DOM_CHAL *cred, uchar session_key[8], + DOM_CHAL *stored_cred, UTIME timestamp); +BOOL clnt_deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); +BOOL deal_with_creds(uchar sess_key[8], + DOM_CRED *sto_clnt_cred, + const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); + +/*The following definitions come from libsmb/namequery.c */ + +BOOL name_status(int fd,char *name,int name_type,BOOL recurse, + struct in_addr to_ip,char *master,char *rname, + void (*fn)(struct packet_struct *)); +struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse, + struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *)); +FILE *startlmhosts(char *fname); +BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); +void endlmhosts(FILE *fp); +BOOL is_ip_address(const char *name); +BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); +BOOL resolve_srv_name(const char* srv_name, fstring dest_host, + struct in_addr *ip); +BOOL find_master_ip(char *group, struct in_addr *master_ip); + +/*The following definitions come from libsmb/nmblib.c */ + +void debug_nmb_packet(struct packet_struct *p); +char *nmb_namestr(struct nmb_name *n); +void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); +struct packet_struct *copy_packet(struct packet_struct *packet); +void free_packet(struct packet_struct *packet); +struct packet_struct *read_packet(int fd,enum packet_type packet_type); +void make_nmb_name( struct nmb_name *n, const char *name, int type, const char *this_scope ); +BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); +BOOL send_packet(struct packet_struct *p); +struct packet_struct *receive_packet(int fd,enum packet_type type,int t); +void sort_query_replies(char *data, int n, struct in_addr ip); +BOOL read_nmb_sock(int c, struct nmb_state *con); +int get_nmb_sock(void); +char *dns_to_netbios_name(char *dns_name); +int name_mangle( char *In, char *Out, char name_type ); +int name_extract(char *buf,int ofs,char *name); +int name_len(char *s1); + +/*The following definitions come from libsmb/nterr.c */ + +BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); +const char *get_nt_error_msg(uint32 nt_code); + +/*The following definitions come from libsmb/pwd_cache.c */ + +void pwd_init(struct pwd_info *pwd); +BOOL pwd_is_nullpwd(const struct pwd_info *pwd); +void pwd_obfuscate_key(struct pwd_info *pwd, uint32 int_key, char *str_key); +BOOL pwd_compare(const struct pwd_info *_pwd1, const struct pwd_info *_pwd2); +void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); +void pwd_set_nullpwd(struct pwd_info *pwd); +void pwd_set_cleartext(struct pwd_info *pwd, char *clr); +void pwd_get_cleartext(struct pwd_info *pwd, char *clr); +void pwd_set_lm_nt_16(struct pwd_info *pwd, + const uchar lm_pwd[16], + const uchar nt_pwd[16]); +void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); +void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); +void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], + const char *user, const char *server, const char *domain, + uchar sess_key[16]); +void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], + uchar sess_key[16]); +void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], + uchar *nt_owf, size_t *nt_owf_len); + /*The following definitions come from lib/smbrun.c */ int smbrun(char *cmd,char *outfile,BOOL shared); +/*The following definitions come from libsmb/smbdes.c */ + +void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); +void E_P16(uchar *p14,uchar *p16); +void E_P24(const uchar *p21, const uchar *c8, uchar *p24); +void D_P16(const uchar *p14, const uchar *in, uchar *out); +void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); +void cred_hash1(uchar *out, const uchar *in, const uchar *key); +void cred_hash2(uchar *out,uchar *in,uchar *key); +void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); +void SamOEMhash( uchar *data, const uchar *key, int val); +void sam_pwd_hash(uint32 rid, const uchar *in, uchar *out, int forw); + +/*The following definitions come from libsmb/smbencrypt.c */ + +void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); +void E_md4hash(uchar * pwrd, uchar * p16); +void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); +void lm_owf_gen(const char *pwd, uchar p16[16]); +void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); +void nt_owf_gen(const char *pwd, uchar nt_p16[16]); +void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); +void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); +void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); +void SMBOWFencrypt_ntv2(const uchar kr[16], + const uchar * srv_chal, int srv_chal_len, + const uchar * cli_chal, int cli_chal_len, + char resp_buf[16]); +void SMBsesskeygen_ntv2(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBsesskeygen_ntv1(const uchar kr[16], + const uchar * nt_resp, char sess_key[16]); +void SMBgenclientchals(char *lm_cli_chal, + char *nt_cli_chal, int *nt_cli_chal_len, + const char *srv, const char *dom); +void ntv2_owf_gen(const uchar owf[16], + const char *user_n, const char *domain_n, uchar kr_buf[16]); +void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, + uchar p24[24]); +BOOL make_oem_passwd_hash(uchar data[516], + const char *pwrd, int new_pw_len, + const uchar old_pw_hash[16], BOOL unicode); +BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); +void create_ntlmssp_resp(struct pwd_info *pwd, + char *domain, char *user_name, char *my_name, + uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); +BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, + int new_pwrd_size, uint32 * new_pw_len); +BOOL encode_pw_buffer(char buffer[516], const char *new_pass, + int new_pw_len, BOOL nt_pass_set); + +/*The following definitions come from libsmb/smberr.c */ + +char *smb_err_msg(uint8 class, uint32 num); +BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); +BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); +char *smb_errstr(char *inbuf); + /*The following definitions come from lib/snprintf.c */ @@ -198,11 +451,6 @@ void become_root(BOOL save_dir); void unbecome_root(BOOL restore_dir); const vuser_key *get_sec_ctx(void); -/*The following definitions come from lib/surs.c */ - -BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); -BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); - /*The following definitions come from lib/sursalgdomonly.c */ BOOL surs_algdomonly_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, @@ -217,6 +465,11 @@ BOOL surs_nt5ldap_sam_sid_to_unixid(LDAPDB *hds, DOM_SID * sid, uint32 type, BOOL surs_nt5ldap_unixid_to_sam_sid(LDAPDB *hds, uint32 id, uint32 type, DOM_SID * sid, BOOL create); +/*The following definitions come from lib/surs.c */ + +BOOL surs_sam_sid_to_unixid(DOM_SID *sid, uint32 type, uint32 *id, BOOL create); +BOOL surs_unixid_to_sam_sid(uint32 id, uint32 type, DOM_SID *sid, BOOL create); + /*The following definitions come from lib/surstdb.c */ BOOL surs_tdb_sam_sid_to_unixid(DOM_SID * sid, uint32 type, uint32 * id, @@ -289,6 +542,25 @@ const struct passwd *Get_Pwnam(char *user,BOOL allow_change); BOOL user_ok(char *user,int snum); BOOL user_in_list(char *user,char *list); +/*The following definitions come from lib/util_array.c */ + +void free_void_array(uint32 num_entries, void **entries, + void(free_item)(void*)); +void* add_copy_to_array(uint32 *len, void ***array, const void *item, + void*(item_dup)(const void*), BOOL alloc_anyway); +void* add_item_to_array(uint32 *len, void ***array, void *item); +void free_use_info_array(uint32 num_entries, struct use_info **entries); +struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, + const struct use_info *name); +void free_char_array(uint32 num_entries, char **entries); +char* add_chars_to_array(uint32 *len, char ***array, const char *name); +void free_uint32_array(uint32 num_entries, uint32 **entries); +uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); +void free_unistr_array(uint32 num_entries, UNISTR2 **entries); +UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); +void free_sid_array(uint32 num_entries, DOM_SID **entries); +DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); + /*The following definitions come from lib/util.c */ BOOL init_myworkgroup(void); @@ -396,25 +668,6 @@ char *passdb_path(char *name); char *lock_path(char *name); const char *get_sid_name_use_str(uint32 sid_name_use); -/*The following definitions come from lib/util_array.c */ - -void free_void_array(uint32 num_entries, void **entries, - void(free_item)(void*)); -void* add_copy_to_array(uint32 *len, void ***array, const void *item, - void*(item_dup)(const void*), BOOL alloc_anyway); -void* add_item_to_array(uint32 *len, void ***array, void *item); -void free_use_info_array(uint32 num_entries, struct use_info **entries); -struct use_info* add_use_info_to_array(uint32 *len, struct use_info ***array, - const struct use_info *name); -void free_char_array(uint32 num_entries, char **entries); -char* add_chars_to_array(uint32 *len, char ***array, const char *name); -void free_uint32_array(uint32 num_entries, uint32 **entries); -uint32* add_uint32s_to_array(uint32 *len, uint32 ***array, const uint32 *name); -void free_unistr_array(uint32 num_entries, UNISTR2 **entries); -UNISTR2* add_unistr_to_array(uint32 *len, UNISTR2 ***array, UNISTR2 *name); -void free_sid_array(uint32 num_entries, DOM_SID **entries); -DOM_SID* add_sid_to_array(uint32 *len, DOM_SID ***array, const DOM_SID *sid); - /*The following definitions come from lib/util_file.c */ BOOL do_file_lock(int fd, int waitsecs, int type); @@ -630,259 +883,6 @@ BOOL tdb_lookup_vuid( const vuser_key *uk, user_struct **usr); BOOL tdb_store_vuid( const vuser_key *uk, user_struct *usr); BOOL vuid_init_db(void); -/*The following definitions come from libsmb/clientgen.c */ - -int cli_set_port(struct cli_state *cli, int port); -char *cli_errstr(struct cli_state *cli); -void cli_safe_smb_errstr(struct cli_state *cli, char *msg, size_t len); -BOOL get_safe_rap_errstr(int rap_error, char *err_msg, size_t msglen); -void cli_safe_errstr(struct cli_state *cli, char *err_msg, size_t msglen); -BOOL cli_send_trans(struct cli_state *cli, int trans, - char *name, int pipe_name_len, - int fid, int flags, - uint16 *setup, int lsetup, int msetup, - char *param, int lparam, int mparam, - char *data, int ldata, int mdata); -BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len, - uint16 *setup, uint32 setup_count, uint32 max_setup_count, - char *params, uint32 param_count, uint32 max_param_count, - char *data, uint32 data_count, uint32 max_data_count, - char **rparam, uint32 *rparam_count, - char **rdata, uint32 *rdata_count); -BOOL cli_api(struct cli_state *cli, - char *param, int prcnt, int mprcnt, - char *data, int drcnt, int mdrcnt, - char **rparam, int *rprcnt, - char **rdata, int *rdrcnt); -BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation); -BOOL cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *)); -BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype, - void (*fn)(const char *, uint32, const char *)); -BOOL cli_session_setup_x(struct cli_state *cli, - char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_session_setup(struct cli_state *cli, - char *myhostname, char *user, - char *pass, int passlen, - char *ntpass, int ntpasslen, - char *user_domain); -BOOL cli_ulogoff(struct cli_state *cli); -BOOL cli_send_tconX(struct cli_state *cli, - char *share, char *dev, char *pass, int passlen); -BOOL cli_tdis(struct cli_state *cli); -BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst); -BOOL cli_unlink(struct cli_state *cli, char *fname); -BOOL cli_mkdir(struct cli_state *cli, char *dname); -BOOL cli_rmdir(struct cli_state *cli, char *dname); -int cli_nt_create(struct cli_state *cli, const char *fname); -int cli_open(struct cli_state *cli, const char *fname, - int flags, int share_mode); -BOOL cli_close(struct cli_state *cli, int fnum); -BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout); -size_t cli_read_one(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); -size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size, BOOL overlap); -ssize_t cli_write(struct cli_state *cli, - int fnum, uint16 write_mode, - char *buf, off_t offset, size_t size, size_t bytes_left); -BOOL cli_getattrE(struct cli_state *cli, int fd, - uint16 *attr, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time); -BOOL cli_getatr(struct cli_state *cli, char *fname, - uint16 *attr, size_t *size, time_t *t); -BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t); -BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - size_t *size, uint16 *mode); -BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, size_t *size, uint16 *mode, - SMB_INO_T *ino); -BOOL cli_qfileinfo(struct cli_state *cli, int fnum, - uint16 *mode, size_t *size, - time_t *c_time, time_t *a_time, time_t *m_time, - time_t *w_time, SMB_INO_T *ino); -int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, - void (*fn)(file_info *, const char *)); -BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password, - const char *old_password); -BOOL cli_negprot(struct cli_state *cli); -BOOL cli_session_request(struct cli_state *cli, - struct nmb_name *calling, struct nmb_name *called); -BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip); -void cli_init_creds(struct cli_state *cli, const struct ntuser_creds *usr); -struct cli_state *cli_initialise(struct cli_state *cli); -void cli_close_socket(struct cli_state *cli); -void cli_shutdown(struct cli_state *cli); -int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num); -void cli_sockopt(struct cli_state *cli, char *options); -uint16 cli_setpid(struct cli_state *cli, uint16 pid); -BOOL cli_reestablish_connection(struct cli_state *cli); -BOOL cli_establish_connection(struct cli_state *cli, - const char *dest_host, struct in_addr *dest_ip, - struct nmb_name *calling, struct nmb_name *called, - char *service, char *service_type, - BOOL do_shutdown, BOOL do_tcon); -BOOL cli_connect_auth(struct cli_state *cli, - const char* desthost, - struct in_addr *dest_ip, - const struct ntuser_creds *usr); -BOOL cli_connect_servers_auth(struct cli_state *cli, - char *p, - const struct ntuser_creds *usr); -BOOL cli_connect_serverlist(struct cli_state *cli, char *p); -int cli_printjob_del(struct cli_state *cli, int job); -int cli_print_queue(struct cli_state *cli, - void (*fn)(struct print_job_info *)); -BOOL cli_chkpath(struct cli_state *cli, char *path); -BOOL cli_message_start(struct cli_state *cli, char *host, char *username, - int *grp); -BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp); -BOOL cli_message_end(struct cli_state *cli, int grp); -BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); -BOOL get_any_dc_name(const char *domain, char *srv_name); - -/*The following definitions come from libsmb/credentials.c */ - -char *credstr(const uchar *cred); -void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, const char *pass, - uchar session_key[8]); -void cred_create(uchar session_key[8], DOM_CHAL *stor_cred, UTIME timestamp, - DOM_CHAL *cred); -int cred_assert(const DOM_CHAL *cred, uchar session_key[8], - DOM_CHAL *stored_cred, UTIME timestamp); -BOOL clnt_deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, DOM_CRED *rcv_srv_cred); -BOOL deal_with_creds(uchar sess_key[8], - DOM_CRED *sto_clnt_cred, - const DOM_CRED *rcv_clnt_cred, DOM_CRED *rtn_srv_cred); - -/*The following definitions come from libsmb/namequery.c */ - -BOOL name_status(int fd,char *name,int name_type,BOOL recurse, - struct in_addr to_ip,char *master,char *rname, - void (*fn)(struct packet_struct *)); -struct in_addr *name_query(int fd,const char *name,int name_type, BOOL bcast,BOOL recurse, - struct in_addr to_ip, int *count, void (*fn)(struct packet_struct *)); -FILE *startlmhosts(char *fname); -BOOL getlmhostsent( FILE *fp, pstring name, int *name_type, struct in_addr *ipaddr); -void endlmhosts(FILE *fp); -BOOL is_ip_address(const char *name); -BOOL resolve_name(const char *name, struct in_addr *return_ip, int name_type); -BOOL resolve_srv_name(const char* srv_name, fstring dest_host, - struct in_addr *ip); -BOOL find_master_ip(char *group, struct in_addr *master_ip); - -/*The following definitions come from libsmb/nmblib.c */ - -void debug_nmb_packet(struct packet_struct *p); -char *nmb_namestr(struct nmb_name *n); -void nmb_safe_namestr(struct nmb_name *n, char *str, size_t len); -struct packet_struct *copy_packet(struct packet_struct *packet); -void free_packet(struct packet_struct *packet); -struct packet_struct *read_packet(int fd,enum packet_type packet_type); -void make_nmb_name( struct nmb_name *n, const char *name, int type, const char *this_scope ); -BOOL nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2); -BOOL send_packet(struct packet_struct *p); -struct packet_struct *receive_packet(int fd,enum packet_type type,int t); -void sort_query_replies(char *data, int n, struct in_addr ip); -BOOL read_nmb_sock(int c, struct nmb_state *con); -int get_nmb_sock(void); -char *dns_to_netbios_name(char *dns_name); -int name_mangle( char *In, char *Out, char name_type ); -int name_extract(char *buf,int ofs,char *name); -int name_len(char *s1); - -/*The following definitions come from libsmb/nterr.c */ - -BOOL get_safe_nt_error_msg(uint32 nt_code, char *msg, size_t len); -const char *get_nt_error_msg(uint32 nt_code); - -/*The following definitions come from libsmb/pwd_cache.c */ - -void pwd_init(struct pwd_info *pwd); -BOOL pwd_is_nullpwd(const struct pwd_info *pwd); -void pwd_obfuscate_key(struct pwd_info *pwd, uint32 int_key, char *str_key); -BOOL pwd_compare(const struct pwd_info *_pwd1, const struct pwd_info *_pwd2); -void pwd_read(struct pwd_info *pwd, char *passwd_report, BOOL do_encrypt); -void pwd_set_nullpwd(struct pwd_info *pwd); -void pwd_set_cleartext(struct pwd_info *pwd, char *clr); -void pwd_get_cleartext(struct pwd_info *pwd, char *clr); -void pwd_set_lm_nt_16(struct pwd_info *pwd, - const uchar lm_pwd[16], - const uchar nt_pwd[16]); -void pwd_get_lm_nt_16(const struct pwd_info *pwd, uchar lm_pwd[16], uchar nt_pwd[16]); -void pwd_make_lm_nt_16(struct pwd_info *pwd, char *clr); -void pwd_make_lm_nt_owf2(struct pwd_info *pwd, const uchar srv_key[8], - const char *user, const char *server, const char *domain, - uchar sess_key[16]); -void pwd_make_lm_nt_owf(struct pwd_info *pwd, uchar cryptkey[8], - uchar sess_key[16]); -void pwd_get_lm_nt_owf(struct pwd_info *pwd, uchar lm_owf[24], - uchar *nt_owf, size_t *nt_owf_len); - -/*The following definitions come from libsmb/smbdes.c */ - -void smbhash(uchar *out, const uchar *in, const uchar *key, int forw); -void E_P16(uchar *p14,uchar *p16); -void E_P24(const uchar *p21, const uchar *c8, uchar *p24); -void D_P16(const uchar *p14, const uchar *in, uchar *out); -void E_old_pw_hash( const uchar *p14, const uchar *in, uchar *out); -void cred_hash1(uchar *out, const uchar *in, const uchar *key); -void cred_hash2(uchar *out,uchar *in,uchar *key); -void cred_hash3(uchar *out, const uchar *in,uchar *key, int forw); -void SamOEMhash( uchar *data, const uchar *key, int val); -void sam_pwd_hash(uint32 rid, const uchar *in, uchar *out, int forw); - -/*The following definitions come from libsmb/smbencrypt.c */ - -void SMBencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void SMBNTencrypt(uchar * pwrd, uchar * c8, uchar * p24); -void E_md4hash(uchar * pwrd, uchar * p16); -void lm_owf_genW(const UNISTR2 * pwd, uchar p16[16]); -void lm_owf_gen(const char *pwd, uchar p16[16]); -void nt_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16]); -void nt_owf_gen(const char *pwd, uchar nt_p16[16]); -void nt_lm_owf_genW(const UNISTR2 * pwd, uchar nt_p16[16], uchar lm_p16[16]); -void nt_lm_owf_gen(const char *pwd, uchar nt_p16[16], uchar lm_p16[16]); -void SMBOWFencrypt(const uchar pwrd[16], const uchar * c8, uchar p24[24]); -void SMBOWFencrypt_ntv2(const uchar kr[16], - const uchar * srv_chal, int srv_chal_len, - const uchar * cli_chal, int cli_chal_len, - char resp_buf[16]); -void SMBsesskeygen_ntv2(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBsesskeygen_ntv1(const uchar kr[16], - const uchar * nt_resp, char sess_key[16]); -void SMBgenclientchals(char *lm_cli_chal, - char *nt_cli_chal, int *nt_cli_chal_len, - const char *srv, const char *dom); -void ntv2_owf_gen(const uchar owf[16], - const char *user_n, const char *domain_n, uchar kr_buf[16]); -void NTLMSSPOWFencrypt(const uchar pwrd[8], const uchar * ntlmchalresp, - uchar p24[24]); -BOOL make_oem_passwd_hash(uchar data[516], - const char *pwrd, int new_pw_len, - const uchar old_pw_hash[16], BOOL unicode); -BOOL nt_encrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -BOOL nt_decrypt_string2(STRING2 * out, const STRING2 * in, const uchar * key); -void create_ntlmssp_resp(struct pwd_info *pwd, - char *domain, char *user_name, char *my_name, - uint32 ntlmssp_cli_flgs, prs_struct * auth_resp); -BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd, - int new_pwrd_size, uint32 * new_pw_len); -BOOL encode_pw_buffer(char buffer[516], const char *new_pass, - int new_pw_len, BOOL nt_pass_set); - -/*The following definitions come from libsmb/smberr.c */ - -char *smb_err_msg(uint8 class, uint32 num); -BOOL smb_safe_err_msg(uint8 class, uint32 num, char *ret, size_t len); -BOOL smb_safe_errstr(char *inbuf, char *msg, size_t len); -char *smb_errstr(char *inbuf); - /*The following definitions come from nsswitch/winbindd.c */ void exit_server(char *reason); @@ -1770,83 +1770,6 @@ BOOL make_lsa_q_close(LSA_Q_CLOSE * q_c, POLICY_HND *hnd); BOOL lsa_io_q_close(char *desc, LSA_Q_CLOSE * q_c, prs_struct * ps, int depth); BOOL lsa_io_r_close(char *desc, LSA_R_CLOSE * r_c, prs_struct * ps, int depth); -/*The following definitions come from rpc_parse/parse_misc.c */ - -BOOL smb_io_bigint(char *desc, BIGINT *bigint, prs_struct *ps, int depth); -BOOL smb_io_time(char *desc, NTTIME *nttime, prs_struct *ps, int depth); -BOOL smb_io_lookup_level(char *desc, LOOKUP_LEVEL *level, prs_struct *ps, int depth); -uint32 get_enum_hnd(ENUM_HND *enh); -BOOL make_enum_hnd(ENUM_HND *enh, uint32 hnd); -BOOL smb_io_enum_hnd(char *desc, ENUM_HND *hnd, prs_struct *ps, int depth); -BOOL smb_io_dom_sid(char *desc, DOM_SID *sid, prs_struct *ps, int depth); -BOOL make_dom_sid2(DOM_SID2 *sid2, const DOM_SID *sid); -BOOL smb_io_dom_sid2(char *desc, DOM_SID2 *sid, prs_struct *ps, int depth); -BOOL make_str_hdr(STRHDR *hdr, int max_len, int len, uint32 buffer); -BOOL smb_io_strhdr(char *desc, STRHDR *hdr, prs_struct *ps, int depth); -BOOL make_strhdr2(STRHDR2 *hdr, uint32 max_len, uint32 len, uint32 buffer); -BOOL smb_io_strhdr2(char *desc, STRHDR2 *hdr, prs_struct *ps, int depth); -BOOL make_uni_hdr(UNIHDR *hdr, int len); -BOOL make_unihdr_from_unistr2(UNIHDR *hdr, const UNISTR2 *str); -BOOL smb_io_unihdr(char *desc, UNIHDR *hdr, prs_struct *ps, int depth); -BOOL make_buf_hdr(BUFHDR *hdr, int max_len, int len); -BOOL smb_io_hdrbuf_pre(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, uint32 *offset); -BOOL smb_io_hdrbuf_post(char *desc, BUFHDR *hdr, prs_struct *ps, int depth, - uint32 ptr_hdrbuf, uint32 max_len, uint32 len); -BOOL smb_io_hdrbuf(char *desc, BUFHDR *hdr, prs_struct *ps, int depth); -BOOL make_bufhdr2(BUFHDR2 *hdr, uint32 info_level, uint32 length, uint32 buffer); -BOOL smb_io_bufhdr2(char *desc, BUFHDR2 *hdr, prs_struct *ps, int depth); -BOOL make_uni_hdr2(UNIHDR2 *hdr, int len); -BOOL make_unihdr2_from_unistr2(UNIHDR2 *hdr, const UNISTR2 *str); -BOOL smb_io_unihdr2(char *desc, UNIHDR2 *hdr2, prs_struct *ps, int depth); -BOOL make_unistr(UNISTR *str, char *buf); -BOOL smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth); -BOOL make_buffer3_uint32(BUFFER3 *str, uint32 val); -BOOL make_buffer3_str(BUFFER3 *str, const char *buf, int len); -BOOL make_buffer3_hex(BUFFER3 *str, char *buf); -BOOL make_buffer3_bytes(BUFFER3 *str, uint8 *buf, int len); -BOOL smb_io_buffer3(char *desc, BUFFER3 *buf3, prs_struct *ps, int depth); -BOOL make_buffer4_str(BUFFER4 *str, const char *buf, int len); -BOOL smb_io_buffer4(char *desc, BUFFER4 *buf4, uint32 buffer, prs_struct *ps, int depth); -BOOL init_buffer5(BUFFER5 **str); -BOOL clear_buffer5(BUFFER5 **str); -BOOL make_buffer5(BUFFER5 *str, char *buf, int len); -BOOL smb_io_buffer5(char *desc, BUFFER5 *buf5, prs_struct *ps, int depth); -BOOL make_buffer2_multi(BUFFER2 *str, char *const* const buf, uint32 num); -BOOL make_buffer2(BUFFER2 *str, const char *buf, int len); -BOOL smb_io_buffer2(char *desc, BUFFER2 *buf2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_buf_unistr2(UNISTR2 *str, uint32 *ptr, const char *buf); -BOOL make_string2(STRING2 *str, const char *buf, int len); -BOOL make_buf_string2(STRING2 *str, uint32 *ptr, const char *buf); -BOOL smb_io_string2(char *desc, STRING2 *str2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_unistr2(UNISTR2 *str, const char *buf, int len); -BOOL smb_io_unistr2(char *desc, UNISTR2 *uni2, uint32 buffer, prs_struct *ps, int depth); -BOOL make_dom_rid2(DOM_RID2 *rid2, uint32 rid, uint16 type, uint32 idx); -BOOL smb_io_dom_rid2(char *desc, DOM_RID2 *rid2, prs_struct *ps, int depth); -BOOL make_dom_rid3(DOM_RID3 *rid3, uint32 rid, uint8 type); -BOOL smb_io_dom_rid3(char *desc, DOM_RID3 *rid3, prs_struct *ps, int depth); -BOOL make_log_info(DOM_LOG_INFO *log, - const char *logon_srv, const char *acct_name, - uint16 sec_chan, const char *comp_name); -BOOL smb_io_log_info(char *desc, DOM_LOG_INFO *log, prs_struct *ps, int depth); -BOOL smb_io_chal(char *desc, DOM_CHAL *chal, prs_struct *ps, int depth); -BOOL smb_io_cred(char *desc, DOM_CRED *cred, prs_struct *ps, int depth); -BOOL make_clnt_info2(DOM_CLNT_INFO2 *clnt, - const char *logon_srv, const char *comp_name, - DOM_CRED *clnt_cred); -BOOL smb_io_clnt_info2(char *desc, DOM_CLNT_INFO2 *clnt, prs_struct *ps, int depth); -BOOL make_clnt_info(DOM_CLNT_INFO *clnt, - const char *logon_srv, const char *acct_name, - uint16 sec_chan, const char *comp_name, - DOM_CRED *cred); -BOOL smb_io_clnt_info(char *desc, DOM_CLNT_INFO *clnt, prs_struct *ps, int depth); -BOOL make_owf_info(OWF_INFO *hash, const uint8 data[16]); -BOOL smb_io_owf_info(char *desc, OWF_INFO *hash, prs_struct *ps, int depth); -BOOL smb_io_gid(char *desc, DOM_GID *gid, prs_struct *ps, int depth); -BOOL smb_io_pol_hnd(char *desc, POLICY_HND *pol, prs_struct *ps, int depth); -BOOL smb_io_dom_query_3(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); -BOOL smb_io_dom_query_5(char *desc, DOM_QUERY_3 *d_q, prs_struct *ps, int depth); -BOOL smb_io_unistr3(char *desc, UNISTR3 *name, prs_struct *ps, int depth); - /*The following definitions come from rpc_parse/parse_net.c */ BOOL make_q_logon_ctrl2(NET_Q_LOGON_CTRL2 * q_l, diff --git a/source/lib/util.c b/source/lib/util.c index 91beec37c0c..9e55e662517 100644 --- a/source/lib/util.c +++ b/source/lib/util.c @@ -2779,6 +2779,11 @@ void dump_data(int level, const char *buf1, int len) { uchar const *buf = (uchar const *)buf1; int i = 0; + if (buf == NULL) + { + DEBUG(level, ("dump_data: NULL, len=%d\n", len)); + return; + } if (len < 0) return; if (len == 0) diff --git a/source/lsarpcd/lsarpcd.c b/source/lsarpcd/lsarpcd.c index 15eeee20040..e53bc9ff8be 100644 --- a/source/lsarpcd/lsarpcd.c +++ b/source/lsarpcd/lsarpcd.c @@ -84,6 +84,11 @@ static void update_trust_account(void) s1 = _lsa_open_secret(&lsa_pol, &uni_sec_name, 0x02000000, &pol_sec); } + else + { + DEBUG(0, ("_lsa_open_policy2 failed with 0x%x\n", s)); + return; + } if (s1 == NT_STATUS_NOPROBLEMO) { @@ -93,6 +98,13 @@ static void update_trust_account(void) s2 = NT_STATUS_INVALID_HANDLE; } } + else + { + DEBUG(0, ("_lsa_open_secret failed with 0x%x\n", s1)); + _lsa_close(&lsa_pol); + return; + } + if (s2 == NT_STATUS_NOPROBLEMO) { s2 = _lsa_query_secret(&pol_sec, &encsec, &ntlct, NULL, NULL); diff --git a/source/lsarpcd/srv_lsa_samdb.c b/source/lsarpcd/srv_lsa_samdb.c index 53293a79f27..f39560c2bb8 100644 --- a/source/lsarpcd/srv_lsa_samdb.c +++ b/source/lsarpcd/srv_lsa_samdb.c @@ -719,6 +719,9 @@ uint32 _lsa_open_secret(const POLICY_HND *hnd, tdb = open_secret_db(O_RDWR); if (tdb == NULL) { + DEBUG(0, ("_lsa_open_secret: couldn't open secret_db. Possible attack?")); + DEBUG(0, ("\nuid=%d, gid=%d, euid=%d, egid=%d\n", + getuid(), getgid(), geteuid(), getegid())); return NT_STATUS_ACCESS_DENIED; } diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c index 90ae41d1101..acb31380f6a 100644 --- a/source/rpc_parse/parse_net.c +++ b/source/rpc_parse/parse_net.c @@ -1664,24 +1664,24 @@ BOOL net_io_user_info3(char *desc, NET_USER_INFO_3 * usr, prs_struct * ps, if (usr == NULL) return False; - prs_debug(ps, depth, desc, "net_io_lsa_user_info3"); + prs_debug(ps, depth, desc, "net_io_user_info3"); depth++; prs_align(ps); - smb_io_time("time", &(usr->logon_time), ps, depth); /* logon time */ - smb_io_time("time", &(usr->logoff_time), ps, depth); /* logoff time */ - smb_io_time("time", &(usr->kickoff_time), ps, depth); /* kickoff time */ - smb_io_time("time", &(usr->pass_last_set_time), ps, depth); /* password last set time */ - smb_io_time("time", &(usr->pass_can_change_time), ps, depth); /* password can change time */ - smb_io_time("time", &(usr->pass_must_change_time), ps, depth); /* password must change time */ + smb_io_time("logon_time", &(usr->logon_time), ps, depth); /* logon time */ + smb_io_time("logoff_time", &(usr->logoff_time), ps, depth); /* logoff time */ + smb_io_time("kickoff_time", &(usr->kickoff_time), ps, depth); /* kickoff time */ + smb_io_time("pass_last_set_time", &(usr->pass_last_set_time), ps, depth); /* password last set time */ + smb_io_time("pass_can_change_time", &(usr->pass_can_change_time), ps, depth); /* password can change time */ + smb_io_time("pass_must_change_time", &(usr->pass_must_change_time), ps, depth); /* password must change time */ - smb_io_unihdr("unihdr", &(usr->hdr_user_name), ps, depth); /* username unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_full_name), ps, depth); /* user's full name unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_logon_script), ps, depth); /* logon script unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_profile_path), ps, depth); /* profile path unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_home_dir), ps, depth); /* home directory unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_dir_drive), ps, depth); /* home directory drive unicode string header */ + smb_io_unihdr("hdr_user_name", &(usr->hdr_user_name), ps, depth); /* username unicode string header */ + smb_io_unihdr("hdr_full_name", &(usr->hdr_full_name), ps, depth); /* user's full name unicode string header */ + smb_io_unihdr("hdr_logon_script", &(usr->hdr_logon_script), ps, depth); /* logon script unicode string header */ + smb_io_unihdr("hdr_profile_path", &(usr->hdr_profile_path), ps, depth); /* profile path unicode string header */ + smb_io_unihdr("hdr_home_dir", &(usr->hdr_home_dir), ps, depth); /* home directory unicode string header */ + smb_io_unihdr("hdr_dir_drive", &(usr->hdr_dir_drive), ps, depth); /* home directory drive unicode string header */ prs_uint16("logon_count ", ps, depth, &(usr->logon_count)); /* logon count */ prs_uint16("bad_pw_count ", ps, depth, &(usr->bad_pw_count)); /* bad password count */ @@ -1694,8 +1694,8 @@ BOOL net_io_user_info3(char *desc, NET_USER_INFO_3 * usr, prs_struct * ps, prs_uint8s(False, "user_sess_key", ps, depth, usr->user_sess_key, 16); /* unused user session key */ - smb_io_unihdr("unihdr", &(usr->hdr_logon_srv), ps, depth); /* logon server unicode string header */ - smb_io_unihdr("unihdr", &(usr->hdr_logon_dom), ps, depth); /* logon domain unicode string header */ + smb_io_unihdr("hdr_logon_srv", &(usr->hdr_logon_srv), ps, depth); /* logon server unicode string header */ + smb_io_unihdr("hdr_logon_dom", &(usr->hdr_logon_dom), ps, depth); /* logon domain unicode string header */ prs_uint32("buffer_dom_id ", ps, depth, &(usr->buffer_dom_id)); /* undocumented logon domain id pointer */ prs_uint8s(False, "padding ", ps, depth, usr->padding, 40); /* unused padding bytes? */ @@ -1703,20 +1703,20 @@ BOOL net_io_user_info3(char *desc, NET_USER_INFO_3 * usr, prs_struct * ps, prs_uint32("num_other_sids", ps, depth, &(usr->num_other_sids)); /* 0 - num_sids */ prs_uint32("buffer_other_sids", ps, depth, &(usr->buffer_other_sids)); /* NULL - undocumented pointer to SIDs. */ - smb_io_unistr2("unistr2", &(usr->uni_user_name), + smb_io_unistr2("user_name", &(usr->uni_user_name), usr->hdr_user_name.buffer, ps, depth); /* username unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_full_name), + smb_io_unistr2("full_name", &(usr->uni_full_name), usr->hdr_full_name.buffer, ps, depth); /* user's full name unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_logon_script), + smb_io_unistr2("logon_script", &(usr->uni_logon_script), usr->hdr_logon_script.buffer, ps, depth); /* logon script unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_profile_path), + smb_io_unistr2("profile_path", &(usr->uni_profile_path), usr->hdr_profile_path.buffer, ps, depth); /* profile path unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_home_dir), + smb_io_unistr2("home_dir", &(usr->uni_home_dir), usr->hdr_home_dir.buffer, ps, depth); /* home directory unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_dir_drive), + smb_io_unistr2("dir_drive", &(usr->uni_dir_drive), usr->hdr_dir_drive.buffer, ps, depth); /* home directory drive unicode string */ - prs_align(ps); + prs_uint32("num_groups2 ", ps, depth, &(usr->num_groups2)); /* num groups */ SMB_ASSERT_ARRAY(usr->gids, usr->num_groups2); for (i = 0; i < usr->num_groups2; i++) @@ -1724,12 +1724,12 @@ BOOL net_io_user_info3(char *desc, NET_USER_INFO_3 * usr, prs_struct * ps, smb_io_gid("", &(usr->gids[i]), ps, depth); /* group info */ } - smb_io_unistr2("unistr2", &(usr->uni_logon_srv), + smb_io_unistr2("logon_srv", &(usr->uni_logon_srv), usr->hdr_logon_srv.buffer, ps, depth); /* logon server unicode string */ - smb_io_unistr2("unistr2", &(usr->uni_logon_dom), + smb_io_unistr2("logon_dom", &(usr->uni_logon_dom), usr->hdr_logon_srv.buffer, ps, depth); /* logon domain unicode string */ - smb_io_dom_sid2("sid", &(usr->dom_sid), ps, depth); /* domain SID */ + smb_io_dom_sid2("dom_sid", &(usr->dom_sid), ps, depth); /* domain SID */ SMB_ASSERT_ARRAY(usr->other_sids, usr->num_other_sids); diff --git a/source/rpcclient/display_sam.c b/source/rpcclient/display_sam.c index 4da8ab6adc7..c8d22741d1e 100644 --- a/source/rpcclient/display_sam.c +++ b/source/rpcclient/display_sam.c @@ -2,8 +2,9 @@ Unix SMB/Netbios implementation. Version 1.9. Samba utility functions - Copyright (C) Andrew Tridgell 1992-1999 - Copyright (C) Luke Kenneth Casson Leighton 1996 - 1999 + Copyright (C) Andrew Tridgell 1992-2000, + Copyright (C) Luke Kenneth Casson Leighton 1996-2000, + Copyright (C) Elrond 2000 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ */ #include "includes.h" +#include "rpcclient.h" /**************************************************************************** display alias members @@ -157,8 +159,8 @@ void display_group_members(FILE *out_hnd, enum action_type action, /**************************************************************************** display group info ****************************************************************************/ -void display_group_info1(FILE *out_hnd, enum action_type action, GROUP_INFO1 *const info1) - +static void display_group_info1(FILE *out_hnd, enum action_type action, + GROUP_INFO1 *const info1) { switch (action) { @@ -188,8 +190,8 @@ void display_group_info1(FILE *out_hnd, enum action_type action, GROUP_INFO1 *co /**************************************************************************** display group info ****************************************************************************/ -void display_group_info4(FILE *out_hnd, enum action_type action, GROUP_INFO4 *const info4) - +static void display_group_info4(FILE *out_hnd, enum action_type action, + GROUP_INFO4 *const info4) { switch (action) { @@ -343,8 +345,7 @@ void display_alias_name_info(FILE *out_hnd, enum action_type action, /**************************************************************************** display alias info ****************************************************************************/ -void display_alias_info3(FILE *out_hnd, enum action_type action, ALIAS_INFO3 *const info3) - +static void display_alias_info3(FILE *out_hnd, enum action_type action, ALIAS_INFO3 *const info3) { switch (action) { @@ -491,7 +492,7 @@ void display_sam_user_info_21(FILE *out_hnd, enum action_type action, SAM_USER_I /**************************************************************************** display sam sync structure ****************************************************************************/ -void display_sam_unk_info_2(FILE *out_hnd, enum action_type action, +static void display_sam_unk_info_2(FILE *out_hnd, enum action_type action, SAM_UNK_INFO_2 *const info2) { switch (action) @@ -573,7 +574,7 @@ void display_sam_unk_ctr(FILE *out_hnd, enum action_type action, /**************************************************************************** sam info level 1 display function ****************************************************************************/ -void display_sam_info_1(FILE *out_hnd, enum action_type action, +static void display_sam_info_1(FILE *out_hnd, enum action_type action, SAM_ENTRY1 *const e1, SAM_STR1 *const s1) { if (e1 == NULL) @@ -620,7 +621,7 @@ void display_sam_info_1(FILE *out_hnd, enum action_type action, /**************************************************************************** connection info level 1 container display function ****************************************************************************/ -void display_sam_info_1_ctr(FILE *out_hnd, enum action_type action, +static void display_sam_info_1_ctr(FILE *out_hnd, enum action_type action, uint32 count, SAM_DISPINFO_1 *const ctr) { if (ctr == NULL) diff --git a/source/rpcclient/display_srv.c b/source/rpcclient/display_srv.c index d14c8f713dd..3181ebefb45 100644 --- a/source/rpcclient/display_srv.c +++ b/source/rpcclient/display_srv.c @@ -26,7 +26,7 @@ /**************************************************************************** convert a share mode to a string ****************************************************************************/ -char *get_file_mode_str(uint32 share_mode) +static char *get_file_mode_str(uint32 share_mode) { static fstring mode; @@ -88,7 +88,7 @@ static const char *get_share_type_str(uint32 type) /**************************************************************************** convert a server type enum to a string ****************************************************************************/ -char *get_server_type_str(uint32 type) +static char *get_server_type_str(uint32 type) { static fstring typestr; @@ -269,7 +269,7 @@ void display_srv_info_ctr(FILE *out_hnd, enum action_type action, /**************************************************************************** connection info level 0 display function ****************************************************************************/ -void display_conn_info_0(FILE *out_hnd, enum action_type action, +static void display_conn_info_0(FILE *out_hnd, enum action_type action, CONN_INFO_0 *const info0) { if (info0 == NULL) @@ -303,7 +303,7 @@ void display_conn_info_0(FILE *out_hnd, enum action_type action, /**************************************************************************** connection info level 1 display function ****************************************************************************/ -void display_conn_info_1(FILE *out_hnd, enum action_type action, +static void display_conn_info_1(FILE *out_hnd, enum action_type action, CONN_INFO_1 *const info1, CONN_INFO_1_STR *const str1) { if (info1 == NULL || str1 == NULL) @@ -350,7 +350,7 @@ void display_conn_info_1(FILE *out_hnd, enum action_type action, /**************************************************************************** connection info level 0 container display function ****************************************************************************/ -void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action, +static void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action, SRV_CONN_INFO_0 *const ctr) { if (ctr == NULL) @@ -387,7 +387,7 @@ void display_srv_conn_info_0_ctr(FILE *out_hnd, enum action_type action, /**************************************************************************** connection info level 1 container display function ****************************************************************************/ -void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action, +static void display_srv_conn_info_1_ctr(FILE *out_hnd, enum action_type action, SRV_CONN_INFO_1 *const ctr) { if (ctr == NULL) @@ -878,7 +878,7 @@ void display_srv_file_info_ctr(FILE *out_hnd, enum action_type action, /**************************************************************************** sess info level 0 display function ****************************************************************************/ -void display_sess_info_0(FILE *out_hnd, enum action_type action, +static void display_sess_info_0(FILE *out_hnd, enum action_type action, SESS_INFO_0 *const info0, SESS_INFO_0_STR *const str0) { if (info0 == NULL || str0 == NULL) @@ -917,7 +917,7 @@ void display_sess_info_0(FILE *out_hnd, enum action_type action, /**************************************************************************** sess info level 1 display function ****************************************************************************/ -void display_sess_info_1(FILE *out_hnd, enum action_type action, +static void display_sess_info_1(FILE *out_hnd, enum action_type action, SESS_INFO_1 *const info1, SESS_INFO_1_STR *const str1) { if (info1 == NULL || str1 == NULL) diff --git a/source/samrd/srv_samr_passdb.c b/source/samrd/srv_samr_passdb.c index 2cfaa80f80d..7dae052ba8e 100644 --- a/source/samrd/srv_samr_passdb.c +++ b/source/samrd/srv_samr_passdb.c @@ -241,6 +241,9 @@ uint32 _samr_open_domain(const POLICY_HND *connect_pol, return NT_STATUS_ACCESS_DENIED; } + policy_hnd_set_name(get_global_hnd_cache(), + domain_pol, "sam_domain"); + /* associate the domain SID with the (unique) handle. */ if (!set_policy_samr_sid(get_global_hnd_cache(), domain_pol, sid)) { @@ -1247,12 +1250,12 @@ uint32 _samr_query_useraliases(const POLICY_HND *pol, } else { - return NT_STATUS_NO_SUCH_USER; + return NT_STATUS_NO_SUCH_USER; /* no user (in domain) */ } if (num_rids > 0) { - (*rid) = malloc(num_rids * sizeof(uint32)); + (*rid) = g_new(uint32, num_rids); if (mem_grp != NULL && (*rid) != NULL) { int i; @@ -1884,6 +1887,11 @@ static BOOL set_user_info_12(const SAM_USER_INFO_12 *id12, uint32 rid) { return False; } + if (id12 == NULL) + { + DEBUG(2, ("set_user_info_12: id12 is NULL\n")); + return False; + } pwdb_init_sam(&new_pwd); copy_sam_passwd(&new_pwd, pwd); @@ -2434,6 +2442,9 @@ uint32 _samr_connect_anon(const UNISTR2 *srv_name, uint32 access_mask, return NT_STATUS_ACCESS_DENIED; } + policy_hnd_set_name(get_global_hnd_cache(), + connect_pol, "sam_connect_anon"); + return NT_STATUS_NOPROBLEMO; } @@ -2450,6 +2461,9 @@ uint32 _samr_connect(const UNISTR2 *srv_name, uint32 access_mask, return NT_STATUS_ACCESS_DENIED; } + policy_hnd_set_name(get_global_hnd_cache(), + connect_pol, "sam_connect"); + return NT_STATUS_NOPROBLEMO; } |