diff options
| -rw-r--r-- | source3/acconfig.h | 1 | ||||
| -rwxr-xr-x | source3/configure | 152 | ||||
| -rw-r--r-- | source3/configure.in | 9 | ||||
| -rw-r--r-- | source3/include/config.h.in | 4 | ||||
| -rw-r--r-- | source3/include/includes.h | 51 | ||||
| -rw-r--r-- | source3/include/local.h | 5 | ||||
| -rw-r--r-- | source3/include/proto.h | 12 | ||||
| -rw-r--r-- | source3/lib/system.c | 17 |
8 files changed, 85 insertions, 166 deletions
diff --git a/source3/acconfig.h b/source3/acconfig.h index 8c07a14624..18271d0990 100644 --- a/source3/acconfig.h +++ b/source3/acconfig.h @@ -32,7 +32,6 @@ #undef OSF1 #undef NEXT2 #undef RELIANTUNIX -#undef HAVE_SHARED_MMAP #undef HAVE_MMAP #undef HAVE_FCNTL_LOCK #undef HAVE_FTRUNCATE_EXTEND diff --git a/source3/configure b/source3/configure index 788046ef4e..efae90233f 100755 --- a/source3/configure +++ b/source3/configure @@ -4988,7 +4988,7 @@ else fi done -for ac_func in srandom random srand rand setenv usleep mmap64 strcasecmp fcvt fcvtl +for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:4995: checking for $ac_func" >&5 @@ -9483,14 +9483,14 @@ fi fi -echo $ac_n "checking for shared mmap""... $ac_c" 1>&6 -echo "configure:9488: checking for shared mmap" >&5 -if eval "test \"`echo '$''{'samba_cv_HAVE_SHARED_MMAP'+set}'`\" = set"; then +echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +echo "configure:9488: checking for working mmap" >&5 +if eval "test \"`echo '$''{'samba_cv_HAVE_MMAP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then - samba_cv_HAVE_SHARED_MMAP=cross + samba_cv_HAVE_MMAP=cross else cat > conftest.$ac_ext <<EOF #line 9497 "configure" @@ -9499,24 +9499,20 @@ else EOF if { (eval echo configure:9501: \"$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 + samba_cv_HAVE_MMAP=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - samba_cv_HAVE_SHARED_MMAP=no + samba_cv_HAVE_MMAP=no fi rm -fr conftest* fi fi -echo "$ac_t""$samba_cv_HAVE_SHARED_MMAP" 1>&6 -if test x"$samba_cv_HAVE_SHARED_MMAP" = x"yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_SHARED_MMAP 1 -EOF - +echo "$ac_t""$samba_cv_HAVE_MMAP" 1>&6 +if test x"$samba_cv_HAVE_MMAP" = x"yes"; then cat >> confdefs.h <<\EOF #define HAVE_MMAP 1 EOF @@ -9524,7 +9520,7 @@ EOF fi echo $ac_n "checking for ftruncate needs root""... $ac_c" 1>&6 -echo "configure:9528: checking for ftruncate needs root" >&5 +echo "configure:9524: checking for ftruncate needs root" >&5 if eval "test \"`echo '$''{'samba_cv_FTRUNCATE_NEEDS_ROOT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9533,11 +9529,11 @@ if test "$cross_compiling" = yes; then samba_cv_FTRUNCATE_NEEDS_ROOT=cross else cat > conftest.$ac_ext <<EOF -#line 9537 "configure" +#line 9533 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/ftruncroot.c" EOF -if { (eval echo configure:9541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_FTRUNCATE_NEEDS_ROOT=yes else @@ -9560,7 +9556,7 @@ EOF fi echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6 -echo "configure:9564: checking for fcntl locking" >&5 +echo "configure:9560: checking for fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9569,11 +9565,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_FCNTL_LOCK=cross else cat > conftest.$ac_ext <<EOF -#line 9573 "configure" +#line 9569 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/fcntl_lock.c" EOF -if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9573: \"$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 @@ -9596,7 +9592,7 @@ EOF fi echo $ac_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking""... $ac_c" 1>&6 -echo "configure:9600: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 +echo "configure:9596: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_FCNTL64_LOCKS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9605,11 +9601,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross else cat > conftest.$ac_ext <<EOF -#line 9609 "configure" +#line 9605 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/fcntl_lock64.c" EOF -if { (eval echo configure:9613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes else @@ -9634,7 +9630,7 @@ else echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6 -echo "configure:9638: checking for 64 bit fcntl locking" >&5 +echo "configure:9634: checking for 64 bit fcntl locking" >&5 if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9643,7 +9639,7 @@ else samba_cv_HAVE_STRUCT_FLOCK64=cross else cat > conftest.$ac_ext <<EOF -#line 9647 "configure" +#line 9643 "configure" #include "confdefs.h" #if defined(HAVE_UNISTD_H) @@ -9667,7 +9663,7 @@ exit(1); #endif } EOF -if { (eval echo configure:9671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9667: \"$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 @@ -9692,7 +9688,7 @@ EOF fi echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6 -echo "configure:9696: checking for a crypt that needs truncated salt" >&5 +echo "configure:9692: 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 @@ -9701,11 +9697,11 @@ if test "$cross_compiling" = yes; then samba_cv_HAVE_TRUNCATED_SALT=cross else cat > conftest.$ac_ext <<EOF -#line 9705 "configure" +#line 9701 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/crypttest.c" EOF -if { (eval echo configure:9709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9705: \"$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 @@ -9728,13 +9724,13 @@ EOF fi echo $ac_n "checking for broken nisplus include files""... $ac_c" 1>&6 -echo "configure:9732: checking for broken nisplus include files" >&5 +echo "configure:9728: checking for broken nisplus include files" >&5 if eval "test \"`echo '$''{'samba_cv_BROKEN_NISPLUS_INCLUDE_FILES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9738 "configure" +#line 9734 "configure" #include "confdefs.h" #include <sys/acl.h> #if defined(HAVE_RPCSVC_NIS_H) @@ -9744,7 +9740,7 @@ int main() { return 0; ; return 0; } EOF -if { (eval echo configure:9748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no else @@ -9768,7 +9764,7 @@ fi ################################################# # check for smbwrapper support echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6 -echo "configure:9772: checking whether to use smbwrapper" >&5 +echo "configure:9768: 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" @@ -9812,7 +9808,7 @@ fi ################################################# # check for the AFS filesystem echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6 -echo "configure:9816: checking whether to use AFS" >&5 +echo "configure:9812: 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" @@ -9838,7 +9834,7 @@ fi ################################################# # check for the DFS auth system echo $ac_n "checking whether to use DFS auth""... $ac_c" 1>&6 -echo "configure:9842: checking whether to use DFS auth" >&5 +echo "configure:9838: 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" @@ -9863,7 +9859,7 @@ fi ################################################# # check for Kerberos IV auth system echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6 -echo "configure:9867: checking whether to use Kerberos IV" >&5 +echo "configure:9863: 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" @@ -9873,7 +9869,7 @@ if test "${with_krb4+set}" = set; then EOF echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -echo "configure:9877: checking for dn_expand in -lresolv" >&5 +echo "configure:9873: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -9881,7 +9877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 9885 "configure" +#line 9881 "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 @@ -9892,7 +9888,7 @@ int main() { dn_expand() ; return 0; } EOF -if { (eval echo configure:9896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9892: \"$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 @@ -9931,7 +9927,7 @@ fi ################################################# # check for Kerberos 5 auth system echo $ac_n "checking whether to use Kerberos 5""... $ac_c" 1>&6 -echo "configure:9935: checking whether to use Kerberos 5" >&5 +echo "configure:9931: checking whether to use Kerberos 5" >&5 # Check whether --with-krb5 or --without-krb5 was given. if test "${with_krb5+set}" = set; then withval="$with_krb5" @@ -9952,7 +9948,7 @@ fi ################################################# # check for automount support echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6 -echo "configure:9956: checking whether to use AUTOMOUNT" >&5 +echo "configure:9952: 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" @@ -9977,7 +9973,7 @@ fi ################################################# # check for smbmount support echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6 -echo "configure:9981: checking whether to use SMBMOUNT" >&5 +echo "configure:9977: 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" @@ -10006,7 +10002,7 @@ fi ################################################# # check for a PAM password database echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6 -echo "configure:10010: checking whether to use PAM password database" >&5 +echo "configure:10006: checking whether to use PAM password database" >&5 # Check whether --with-pam or --without-pam was given. if test "${with_pam+set}" = set; then withval="$with_pam" @@ -10033,7 +10029,7 @@ fi ################################################# # check for a LDAP password database echo $ac_n "checking whether to use LDAP password database""... $ac_c" 1>&6 -echo "configure:10037: checking whether to use LDAP password database" >&5 +echo "configure:10033: 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" @@ -10059,7 +10055,7 @@ fi ################################################# # check for a NISPLUS password database echo $ac_n "checking whether to use NISPLUS password database""... $ac_c" 1>&6 -echo "configure:10063: checking whether to use NISPLUS password database" >&5 +echo "configure:10059: 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" @@ -10084,7 +10080,7 @@ fi ################################################# # check for a NISPLUS_HOME support echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6 -echo "configure:10088: checking whether to use NISPLUS_HOME" >&5 +echo "configure:10084: 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" @@ -10109,7 +10105,7 @@ fi ################################################# # check for the secure socket layer echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6 -echo "configure:10113: checking whether to use SSL" >&5 +echo "configure:10109: 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" @@ -10168,7 +10164,7 @@ fi ################################################# # check for syslog logging echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6 -echo "configure:10172: checking whether to use syslog logging" >&5 +echo "configure:10168: 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" @@ -10193,7 +10189,7 @@ fi ################################################# # check for a shared memory profiling support echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6 -echo "configure:10197: checking whether to use profiling" >&5 +echo "configure:10193: 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" @@ -10219,7 +10215,7 @@ fi ################################################# # check for experimental netatalk resource fork support echo $ac_n "checking whether to support netatalk""... $ac_c" 1>&6 -echo "configure:10223: checking whether to support netatalk" >&5 +echo "configure:10219: 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" @@ -10246,7 +10242,7 @@ fi QUOTAOBJS=smbd/noquotas.o echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6 -echo "configure:10250: checking whether to support disk-quotas" >&5 +echo "configure:10246: 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" @@ -10270,7 +10266,7 @@ fi # check for experimental utmp accounting echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6 -echo "configure:10274: checking whether to support utmp accounting" >&5 +echo "configure:10270: 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" @@ -10296,7 +10292,7 @@ fi # check for MS Dfs support echo $ac_n "checking whether to support MS Dfs""... $ac_c" 1>&6 -echo "configure:10300: checking whether to support MS Dfs" >&5 +echo "configure:10296: checking whether to support MS Dfs" >&5 # Check whether --with-msdfs or --without-msdfs was given. if test "${with_msdfs+set}" = set; then withval="$with_msdfs" @@ -10396,14 +10392,14 @@ fi ################################################# # these tests are taken from the GNU fileutils package echo "checking how to get filesystem space usage" 1>&6 -echo "configure:10400: checking how to get filesystem space usage" >&5 +echo "configure:10396: 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:10407: checking statvfs64 function (SVR4)" >&5 +echo "configure:10403: 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 @@ -10411,7 +10407,7 @@ else fu_cv_sys_stat_statvfs64=cross else cat > conftest.$ac_ext <<EOF -#line 10415 "configure" +#line 10411 "configure" #include "confdefs.h" #if defined(HAVE_UNISTD_H) @@ -10425,7 +10421,7 @@ else exit (statvfs64 (".", &fsd)); } EOF -if { (eval echo configure:10429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10425: \"$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 @@ -10458,12 +10454,12 @@ fi if test $space = no; then # SVR4 echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6 -echo "configure:10462: checking statvfs function (SVR4)" >&5 +echo "configure:10458: 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 10467 "configure" +#line 10463 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statvfs.h> @@ -10471,7 +10467,7 @@ int main() { struct statvfs fsd; statvfs (0, &fsd); ; return 0; } EOF -if { (eval echo configure:10475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10471: \"$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 @@ -10496,7 +10492,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:10500: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:10496: 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 @@ -10504,7 +10500,7 @@ else fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext <<EOF -#line 10508 "configure" +#line 10504 "configure" #include "confdefs.h" #include <sys/param.h> @@ -10517,7 +10513,7 @@ else exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:10521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10517: \"$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 @@ -10544,7 +10540,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:10548: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:10544: 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 @@ -10552,7 +10548,7 @@ else fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <<EOF -#line 10556 "configure" +#line 10552 "configure" #include "confdefs.h" #ifdef HAVE_SYS_PARAM_H @@ -10571,7 +10567,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:10575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10571: \"$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 @@ -10598,7 +10594,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:10602: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:10598: 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 @@ -10606,7 +10602,7 @@ else fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext <<EOF -#line 10610 "configure" +#line 10606 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/statfs.h> @@ -10616,7 +10612,7 @@ else exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:10620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10616: \"$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 @@ -10643,7 +10639,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:10647: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:10643: 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 @@ -10651,7 +10647,7 @@ else fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext <<EOF -#line 10655 "configure" +#line 10651 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -10667,7 +10663,7 @@ else exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:10671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10667: \"$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 @@ -10694,7 +10690,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:10698: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:10694: 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 @@ -10702,7 +10698,7 @@ else fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext <<EOF -#line 10706 "configure" +#line 10702 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef HAVE_SYS_PARAM_H @@ -10722,7 +10718,7 @@ else exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:10726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10722: \"$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 @@ -10756,7 +10752,7 @@ fi # echo "checking if large file support can be enabled" cat > conftest.$ac_ext <<EOF -#line 10760 "configure" +#line 10756 "configure" #include "confdefs.h" #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8))) @@ -10769,7 +10765,7 @@ int main() { int i ; return 0; } EOF -if { (eval echo configure:10773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes else @@ -10794,11 +10790,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 10798 "configure" +#line 10794 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:10802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10798: \"$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 6ac7120ab6..fa76bd13d1 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -366,7 +366,7 @@ AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf) AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate stat64 fstat64) AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64) AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid yp_get_default_domain getpwanam) -AC_CHECK_FUNCS(srandom random srand rand setenv usleep mmap64 strcasecmp fcvt fcvtl) +AC_CHECK_FUNCS(srandom random srand rand setenv usleep strcasecmp fcvt fcvtl) # syscall() is needed for smbwrapper. AC_CHECK_FUNCS(syscall) @@ -978,11 +978,10 @@ fi fi -AC_CACHE_CHECK([for shared mmap],samba_cv_HAVE_SHARED_MMAP,[ +AC_CACHE_CHECK([for working mmap],samba_cv_HAVE_MMAP,[ AC_TRY_RUN([#include "${srcdir-.}/tests/shared_mmap.c"], - samba_cv_HAVE_SHARED_MMAP=yes,samba_cv_HAVE_SHARED_MMAP=no,samba_cv_HAVE_SHARED_MMAP=cross)]) -if test x"$samba_cv_HAVE_SHARED_MMAP" = x"yes"; then - AC_DEFINE(HAVE_SHARED_MMAP) + samba_cv_HAVE_MMAP=yes,samba_cv_HAVE_MMAP=no,samba_cv_HAVE_MMAP=cross)]) +if test x"$samba_cv_HAVE_MMAP" = x"yes"; then AC_DEFINE(HAVE_MMAP) fi diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 96f827d5b9..cdad2b82b3 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -98,7 +98,6 @@ #undef OSF1 #undef NEXT2 #undef RELIANTUNIX -#undef HAVE_SHARED_MMAP #undef HAVE_MMAP #undef HAVE_FCNTL_LOCK #undef HAVE_FTRUNCATE_EXTEND @@ -538,9 +537,6 @@ /* Define if you have the mktime function. */ #undef HAVE_MKTIME -/* Define if you have the mmap64 function. */ -#undef HAVE_MMAP64 - /* Define if you have the open64 function. */ #undef HAVE_OPEN64 diff --git a/source3/include/includes.h b/source3/include/includes.h index 5bc4797cb4..e19295834a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -60,20 +60,6 @@ #endif #endif /* RELIANTUNIX */ -#ifdef HAVE_SYSV_IPC -#define USE_SYSV_IPC -#endif - -#ifdef HAVE_SHARED_MMAP -#define USE_SHARED_MMAP -#endif - - -/* if we have both SYSV IPC and shared mmap then we need to choose */ -#if (defined(USE_SYSV_IPC) && defined(USE_SHARED_MMAP)) -# undef USE_SHARED_MMAP -#endif - #include <sys/types.h> #ifdef TIME_WITH_SYS_TIME @@ -264,29 +250,6 @@ #include <sys/mman.h> #endif -#ifdef HAVE_SYSV_IPC -#include <sys/ipc.h> -#include <sys/shm.h> -#include <sys/sem.h> - -/* - * The following is needed if compiling - * with gcc on SGI IRIX 6.5.x systems as - * the structure packing for system calls is - * different between IRIX cc and gcc. - */ - -#ifdef NEED_SGI_SEMUN_HACK -union semun_hack { - int val; - struct semid_ds *buf; - unsigned short *array; - char __dummy[5]; -}; -#define semun semun_hack -#endif /* NEED_SGI_SEMUN_HACK */ -#endif /* HAVE_SYSV_IPC */ - #ifdef HAVE_NET_IF_H #include <net/if.h> #endif @@ -748,24 +711,10 @@ typedef struct smb_wpasswd { #define SIGCLD SIGCHLD #endif -#if (defined(HAVE_SYSV_IPC) || defined(HAVE_SHARED_MMAP)) -#define FAST_SHARE_MODES 1 -#endif - #ifndef MAP_FILE #define MAP_FILE 0 #endif -#ifdef HAVE_SYSV_IPC -#ifndef HAVE_UNION_SEMUN -union semun { - int val; - struct semid_ds *buf; - unsigned short *array; -}; -#endif -#endif - #if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP)) #define USE_SMBPASS_DB 1 #endif diff --git a/source3/include/local.h b/source3/include/local.h index bd75d4e385..81212f9988 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -118,11 +118,6 @@ /* the size of the uid cache used to reduce valid user checks */ #define UID_CACHE_SIZE 4 -/* if mmap is enabled, then this is the maximum size of file to use - the mmap code on. We don't want to mmap huge files as virtual - address spaces are limited */ -#define MAX_MMAP_SIZE (100*0x100000) - /* the following control timings of various actions. Don't change them unless you know what you are doing. These are all in seconds */ #define DEFAULT_SMBD_TIMEOUT (60*60*24*7) diff --git a/source3/include/proto.h b/source3/include/proto.h index 27711f2ed4..9d1c158cef 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -195,6 +195,13 @@ int smbrun(char *cmd,char *outfile,BOOL shared); /*The following definitions come from lib/snprintf.c */ +/*The following definitions come from lib/substitute.c */ + +void standard_sub_basic(char *str); +void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); +void standard_sub(connection_struct *conn, char *str); +void standard_sub_snum(int snum, char *str); + /*The following definitions come from lib/system.c */ int sys_select(int maxfd, fd_set *fds,struct timeval *tval); @@ -210,7 +217,6 @@ SMB_OFF_T sys_ftell(FILE *fp); int sys_creat(const char *path, mode_t mode); int sys_open(const char *path, int oflag, mode_t mode); FILE *sys_fopen(const char *path, const char *type); -void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, SMB_OFF_T offset); SMB_STRUCT_DIRENT *sys_readdir(DIR *dirp); int sys_waitpid(pid_t pid,int *status,int options); char *sys_getwd(char *s); @@ -313,10 +319,6 @@ BOOL is_ipaddress(const char *str); uint32 interpret_addr(char *str); struct in_addr *interpret_addr2(char *str); BOOL zero_ip(struct in_addr ip); -void standard_sub_basic(char *str); -void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, char *str); -void standard_sub(connection_struct *conn, char *str); -void standard_sub_snum(int snum, char *str); BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask); struct hostent *Get_Hostbyname(const char *name); BOOL process_exists(pid_t pid); diff --git a/source3/lib/system.c b/source3/lib/system.c index 3354ee0bbc..539f21d49c 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -323,23 +323,6 @@ FILE *sys_fopen(const char *path, const char *type) #endif } -#if defined(HAVE_MMAP) - -/******************************************************************* - An mmap() wrapper that will deal with 64 bit filesizes. -********************************************************************/ - -void *sys_mmap(void *addr, size_t len, int prot, int flags, int fd, SMB_OFF_T offset) -{ -#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_MMAP64) - return mmap64(addr, len, prot, flags, fd, offset); -#else - return mmap(addr, len, prot, flags, fd, offset); -#endif -} - -#endif /* HAVE_MMAP */ - /******************************************************************* A readdir wrapper that will deal with 64 bit filesizes. ********************************************************************/ |