diff options
author | Andrew Bartlett <abartlet@samba.org> | 2001-09-07 23:56:54 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2001-09-07 23:56:54 +0000 |
commit | ed8883c5ddb9c3709bf2f842ae7522f2e09110ff (patch) | |
tree | 204aac3de6e2afc29961ca5d8c71684c96a01838 /source3 | |
parent | 84cca757397dba107fde479bc2043d8412713cf7 (diff) | |
download | samba-ed8883c5ddb9c3709bf2f842ae7522f2e09110ff.tar.gz samba-ed8883c5ddb9c3709bf2f842ae7522f2e09110ff.tar.bz2 samba-ed8883c5ddb9c3709bf2f842ae7522f2e09110ff.zip |
Change the description on --with-pam_smbpass to make it clearer - some peope
seem to think you need this module for normal samba/PAM operation.
rerun autoconf
rerun autoheader
(Note that --with-pam_smbpass still doesn't build, but at least when it does
again only people who actually need it will select it).
(This used to be commit bbda3dd7422a434f19ca8968dab8f9f210254c2f)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/acconfig.h | 1 | ||||
-rwxr-xr-x | source3/configure | 120 | ||||
-rw-r--r-- | source3/configure.in | 3 | ||||
-rw-r--r-- | source3/include/config.h.in | 24 |
4 files changed, 81 insertions, 67 deletions
diff --git a/source3/acconfig.h b/source3/acconfig.h index 77c909b735..a5655a5e0f 100644 --- a/source3/acconfig.h +++ b/source3/acconfig.h @@ -63,7 +63,6 @@ #undef WITH_NISPLUS #undef WITH_TDBPWD #undef WITH_PAM -#undef WITH_PAM_SMBPASS #undef WITH_NISPLUS_HOME #undef WITH_AUTOMOUNT #undef WITH_SMBMOUNT diff --git a/source3/configure b/source3/configure index 394eeb7e8a..f59146c2ec 100755 --- a/source3/configure +++ b/source3/configure @@ -35,7 +35,7 @@ ac_help="$ac_help ac_help="$ac_help --with-pam Include PAM password database support (default=no)" ac_help="$ac_help - --with-pam_smbpass Include the smbpass PAM module (default=no)" + --with-pam_smbpass Build a PAM module to allow other applications to use our smbpasswd file (default=no)" ac_help="$ac_help --with-tdbsam Include experimental TDB password database (default=no)" ac_help="$ac_help @@ -914,7 +914,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' 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 @@ -11359,10 +11359,6 @@ if test "${with_pam_smbpass+set}" = set; then echo "$ac_t""No libpam found -- disabling pam_smbpass" 1>&6 PAM_MOD="" else - cat >> confdefs.h <<\EOF -#define WITH_PAM_SMBPASS 1 -EOF - PAM_MOD="bin/pam_smbpass.so" fi ;; @@ -11384,12 +11380,12 @@ if test $with_pam_for_crypt = no; then for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11388: checking for $ac_func" >&5 +echo "configure:11384: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11393 "configure" +#line 11389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11412,7 +11408,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11412: \"$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 @@ -11438,7 +11434,7 @@ 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:11442: checking for crypt in -lcrypt" >&5 +echo "configure:11438: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -11446,7 +11442,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 11450 "configure" +#line 11446 "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 @@ -11457,7 +11453,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11457: \"$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 @@ -11492,7 +11488,7 @@ fi ## if test $with_pam_for_crypt = no; then echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6 -echo "configure:11496: checking for a crypt that needs truncated salt" >&5 +echo "configure:11492: checking for a crypt that needs truncated salt" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11501,11 +11497,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_TRUNCATED_SALT=cross else cat > conftest.$ac_ext <<EOF -#line 11505 "configure" +#line 11501 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/crypttest.c" EOF -if { (eval echo configure:11509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_TRUNCATED_SALT=no else @@ -11532,7 +11528,7 @@ fi ################################################# # check for a TDB password database echo $ac_n "checking whether to use TDB password database""... $ac_c" 1>&6 -echo "configure:11536: checking whether to use TDB password database" >&5 +echo "configure:11532: checking whether to use TDB password database" >&5 # Check whether --with-tdbsam or --without-tdbsam was given. if test "${with_tdbsam+set}" = set; then withval="$with_tdbsam" @@ -11558,7 +11554,7 @@ fi ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:11562: checking whether to use LDAP password database" >&5 +echo "configure:11558: 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" @@ -11602,7 +11598,7 @@ fi ################################################# # check for a NISPLUS_HOME support echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6 -echo "configure:11606: checking whether to use NISPLUS_HOME" >&5 +echo "configure:11602: 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" @@ -11627,7 +11623,7 @@ fi ################################################# # check for the secure socket layer echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 -echo "configure:11631: checking whether to use SSL" >&5 +echo "configure:11627: 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" @@ -11686,7 +11682,7 @@ fi ################################################# # check for syslog logging echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 -echo "configure:11690: checking whether to use syslog logging" >&5 +echo "configure:11686: 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" @@ -11711,7 +11707,7 @@ fi ################################################# # check for a shared memory profiling support echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6 -echo "configure:11715: checking whether to use profiling" >&5 +echo "configure:11711: checking whether to use profiling" >&5 # Check whether --with-profiling-data or --without-profiling-data was given. if test "${with_profiling_data+set}" = set; then withval="$with_profiling_data" @@ -11739,7 +11735,7 @@ fi QUOTAOBJS=smbd/noquotas.o echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6 -echo "configure:11743: checking whether to support disk-quotas" >&5 +echo "configure:11739: 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" @@ -11763,7 +11759,7 @@ fi # check for experimental utmp accounting echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6 -echo "configure:11767: checking whether to support utmp accounting" >&5 +echo "configure:11763: checking whether to support utmp accounting" >&5 # Check whether --with-utmp or --without-utmp was given. if test "${with_utmp+set}" = set; then withval="$with_utmp" @@ -11789,7 +11785,7 @@ fi # check for MS Dfs support echo $ac_n "checking whether to support Microsoft Dfs""... $ac_c" 1>&6 -echo "configure:11793: checking whether to support Microsoft Dfs" >&5 +echo "configure:11789: checking whether to support Microsoft Dfs" >&5 # Check whether --with-msdfs or --without-msdfs was given. if test "${with_msdfs+set}" = set; then withval="$with_msdfs" @@ -11889,14 +11885,14 @@ fi ################################################# # these tests are taken from the GNU fileutils package echo "checking how to get filesystem space usage" 1>&6 -echo "configure:11893: checking how to get filesystem space usage" >&5 +echo "configure:11889: 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:11900: checking statvfs64 function (SVR4)" >&5 +echo "configure:11896: checking statvfs64 function (SVR4)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11904,7 +11900,7 @@ else fu_cv_sys_stat_statvfs64=cross else cat > conftest.$ac_ext <<EOF -#line 11908 "configure" +#line 11904 "configure" #include "confdefs.h" #if defined(HAVE_UNISTD_H) @@ -11918,7 +11914,7 @@ else exit (statvfs64 (".", &fsd)); } EOF -if { (eval echo configure:11922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11918: \"$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 @@ -11951,12 +11947,12 @@ fi if test $space = no; then # SVR4 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 -echo "configure:11955: checking statvfs function (SVR4)" >&5 +echo "configure:11951: checking statvfs function (SVR4)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11960 "configure" +#line 11956 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statvfs.h> @@ -11964,7 +11960,7 @@ int main() { struct statvfs fsd; statvfs (0, &fsd); ; return 0; } EOF -if { (eval echo configure:11968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11964: \"$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 @@ -11989,7 +11985,7 @@ 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:11993: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:11989: checking for 3-argument statfs function (DEC OSF/1)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11997,7 +11993,7 @@ else fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext <<EOF -#line 12001 "configure" +#line 11997 "configure" #include "confdefs.h" #include <sys/param.h> @@ -12010,7 +12006,7 @@ else exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:12014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12010: \"$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 @@ -12037,7 +12033,7 @@ 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:12041: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:12037: 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 $ac_n "(cached) $ac_c" 1>&6 else @@ -12045,7 +12041,7 @@ else fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <<EOF -#line 12049 "configure" +#line 12045 "configure" #include "confdefs.h" #ifdef HAVE_SYS_PARAM_H @@ -12064,7 +12060,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:12068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12064: \"$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 @@ -12091,7 +12087,7 @@ 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:12095: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:12091: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12099,7 +12095,7 @@ else fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext <<EOF -#line 12103 "configure" +#line 12099 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statfs.h> @@ -12109,7 +12105,7 @@ else exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:12113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12109: \"$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 @@ -12136,7 +12132,7 @@ 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:12140: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:12136: 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 $ac_n "(cached) $ac_c" 1>&6 else @@ -12144,7 +12140,7 @@ else fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext <<EOF -#line 12148 "configure" +#line 12144 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -12160,7 +12156,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:12164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12160: \"$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 @@ -12187,7 +12183,7 @@ 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:12191: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:12187: 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 $ac_n "(cached) $ac_c" 1>&6 else @@ -12195,7 +12191,7 @@ else fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext <<EOF -#line 12199 "configure" +#line 12195 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -12215,7 +12211,7 @@ else exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:12219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12215: \"$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 @@ -12248,9 +12244,9 @@ fi # file support. # echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6 -echo "configure:12252: checking if large file support can be enabled" >&5 +echo "configure:12248: checking if large file support can be enabled" >&5 cat > conftest.$ac_ext <<EOF -#line 12254 "configure" +#line 12250 "configure" #include "confdefs.h" #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))) @@ -12263,7 +12259,7 @@ int main() { int i ; return 0; } EOF -if { (eval echo configure:12267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes else @@ -12328,7 +12324,7 @@ fi # check for ACL support echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6 -echo "configure:12332: checking whether to support ACLs" >&5 +echo "configure:12328: checking whether to support ACLs" >&5 # Check whether --with-acl-support or --without-acl-support was given. if test "${with_acl_support+set}" = set; then withval="$with_acl_support" @@ -12374,7 +12370,7 @@ EOF ;; *) echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6 -echo "configure:12378: checking for acl_get_file in -lacl" >&5 +echo "configure:12374: checking for acl_get_file in -lacl" >&5 ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12382,7 +12378,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lacl $LIBS" cat > conftest.$ac_ext <<EOF -#line 12386 "configure" +#line 12382 "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 @@ -12393,7 +12389,7 @@ int main() { acl_get_file() ; return 0; } EOF -if { (eval echo configure:12397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12393: \"$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 @@ -12421,13 +12417,13 @@ else fi echo $ac_n "checking for ACL support""... $ac_c" 1>&6 -echo "configure:12425: checking for ACL support" >&5 +echo "configure:12421: checking for ACL support" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12431 "configure" +#line 12427 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/acl.h> @@ -12435,7 +12431,7 @@ int main() { acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p); ; return 0; } EOF -if { (eval echo configure:12439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* samba_cv_HAVE_POSIX_ACLS=yes else @@ -12455,13 +12451,13 @@ echo "$ac_t""$samba_cv_HAVE_POSIX_ACLS" 1>&6 EOF echo $ac_n "checking for acl_get_perm_np""... $ac_c" 1>&6 -echo "configure:12459: checking for acl_get_perm_np" >&5 +echo "configure:12455: checking for acl_get_perm_np" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_ACL_GET_PERM_NP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12465 "configure" +#line 12461 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/acl.h> @@ -12469,7 +12465,7 @@ int main() { acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm); ; return 0; } EOF -if { (eval echo configure:12473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* samba_cv_HAVE_ACL_GET_PERM_NP=yes else @@ -12516,7 +12512,7 @@ fi # (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS). echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6 -echo "configure:12520: checking whether to build winbind" >&5 +echo "configure:12516: checking whether to build winbind" >&5 # Initially, the value of $host_os decides whether winbind is supported @@ -12596,11 +12592,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 12600 "configure" +#line 12596 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else diff --git a/source3/configure.in b/source3/configure.in index 3cb6965d58..8fabb070f0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1672,7 +1672,7 @@ AC_CHECK_LIB(pam, pam_get_data, [AC_DEFINE(HAVE_LIBPAM)]) # check for pam_smbpass support AC_MSG_CHECKING(whether to use pam_smbpass) AC_ARG_WITH(pam_smbpass, -[ --with-pam_smbpass Include the smbpass PAM module (default=no)], +[ --with-pam_smbpass Build a PAM module to allow other applications to use our smbpasswd file (default=no)], [ case "$withval" in yes) AC_MSG_RESULT(yes) @@ -1686,7 +1686,6 @@ AC_ARG_WITH(pam_smbpass, AC_MSG_RESULT([No libpam found -- disabling pam_smbpass]) PAM_MOD="" else - AC_DEFINE(WITH_PAM_SMBPASS) PAM_MOD="bin/pam_smbpass.so" fi ;; diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 2889fa24c0..34ac41784f 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if on AIX 3. System headers sometimes define this. @@ -74,10 +74,12 @@ #undef HAVE_SOCKLEN_T_TYPE #undef ssize_t #undef ino_t +#undef ssize_t #undef loff_t #undef offset_t #undef aclent_t #undef wchar_t +#undef HAVE_CONNECT #undef HAVE_SHORT_INO_T #undef WITH_SMBWRAPPER #undef WITH_AFS @@ -95,6 +97,7 @@ #undef OSF1 #undef NEXT2 #undef RELIANTUNIX +#undef HAVE_MMAP #undef HAVE_FCNTL_LOCK #undef HAVE_FTRUNCATE_EXTEND #undef FTRUNCATE_NEEDS_ROOT @@ -109,9 +112,13 @@ #undef STAT_STATFS3_OSF1 #undef STAT_STATFS4 #undef STAT_STATVFS +#undef STAT_STATVFS64 #undef HAVE_IFACE_AIX #undef HAVE_IFACE_IFCONF #undef HAVE_IFACE_IFREQ +#undef HAVE_CRYPT +#undef HAVE_PUTPRPWNAM +#undef HAVE_SET_AUTH_PARAMETERS #undef WITH_SYSLOG #undef WITH_PROFILE #undef WITH_SSL @@ -119,7 +126,6 @@ #undef WITH_NISPLUS #undef WITH_TDBPWD #undef WITH_PAM -#undef WITH_PAM_SMBPASS #undef WITH_NISPLUS_HOME #undef WITH_AUTOMOUNT #undef WITH_SMBMOUNT @@ -152,8 +158,17 @@ #undef KRB5_AUTH #undef SEEKDIR_RETURNS_VOID #undef HAVE_DIRENT_D_OFF +#undef HAVE_GETSPNAM +#undef HAVE_BIGCRYPT +#undef HAVE_GETPRPWNAM +#undef HAVE_FSTAT64 +#undef HAVE_LSTAT64 +#undef HAVE_STAT64 #undef HAVE_SETRESGID #undef HAVE_SETRESGID_DECL +#undef HAVE_SHADOW_H +#undef HAVE_MEMSET +#undef HAVE_STRCASECMP #undef HAVE_STRUCT_DIRENT64 #undef HAVE_TRUNCATED_SALT #undef BROKEN_NISPLUS_INCLUDE_FILES @@ -182,6 +197,7 @@ #undef HAVE_UX_UT_SYSLEN #undef PUTUTLINE_RETURNS_UTMP #undef COMPILER_SUPPORTS_LL +#undef HAVE_YP_GET_DEFAULT_DOMAIN #undef USE_SPINLOCKS #undef SPARC_SPINLOCKS #undef INTEL_SPINLOCKS @@ -947,6 +963,9 @@ /* Define if you have the <sys/vfs.h> header file. */ #undef HAVE_SYS_VFS_H +/* Define if you have the <sys/wait.h> header file. */ +#undef HAVE_SYS_WAIT_H + /* Define if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H @@ -1003,3 +1022,4 @@ /* Define if you have working AF_LOCAL sockets */ #undef HAVE_WORKING_AF_LOCAL + |