diff options
| author | Gerald Carter <jerry@samba.org> | 2003-12-11 22:30:05 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-12-11 22:30:05 +0000 |
| commit | 9eed49362eae131531eb6f01af7a85facb91af12 (patch) | |
| tree | 0c2e109ea34ed700ce48de20eddcba9af816522f | |
| parent | c09325ca6a227161e591bdc6379a82162af74df4 (diff) | |
| download | samba-9eed49362eae131531eb6f01af7a85facb91af12.tar.gz | |
more final touches on 3.0.1; sync from 3.0 tree
| -rw-r--r-- | WHATSNEW.txt | 4 | ||||
| -rwxr-xr-x | source/client/mount.cifs.c | 4 | ||||
| -rw-r--r-- | source/configure.in | 23 |
3 files changed, 8 insertions, 23 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 53d1bb6a4c1..2a299ecc265 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -18,6 +18,10 @@ details: 1) Fix uninitialized variable in passdb.c. 2) Fix formal parameter type in get_static() in nsswitch/wins.c. +3) Fix problem mounting directories when mount.cifs is installed + with the setuid on. +4) Fix bug that prevent --mandir from overriding the defaults + given in the --with-fhs macro. Changes since 3.0.1rc1 diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c index 43b20e9d502..71639d6f343 100755 --- a/source/client/mount.cifs.c +++ b/source/client/mount.cifs.c @@ -490,10 +490,10 @@ int main(int argc, char ** argv) } if((getuid() != 0) && (geteuid() == 0)) { - if((statbuf.st_uid == getuid()) && (S_IRWXU == statbuf.st_mode & S_IRWXU)) { + if((statbuf.st_uid == getuid()) && (S_IRWXU == (statbuf.st_mode & S_IRWXU))) { printf("setuid mount allowed\n"); } else { - printf("mount error: permission denied, not superuser and cifs.mount not installed SUID\n"); + printf("mount error: permission denied or not superuser and cifs.mount not installed SUID\n"); return -1; } } diff --git a/source/configure.in b/source/configure.in index 15defbe8f12..d70060af3aa 100644 --- a/source/configure.in +++ b/source/configure.in @@ -28,7 +28,6 @@ AC_ARG_WITH(fhs, logfilebase="\${VARDIR}" lockdir="\${VARDIR}/locks" piddir="\${VARDIR}/locks" - mandir="\${prefix}/man" privatedir="\${prefix}/private" swatdir="\${prefix}/swat") @@ -81,23 +80,6 @@ AC_ARG_WITH(piddir, esac]) ################################################# -# set pid directory location -AC_ARG_WITH(piddir, -[ --with-mandir=DIR Where to put man pages ($ac_default_prefix/man)], -[ case "$withval" in - yes|no) - # - # Just in case anybody calls it without argument - # - AC_MSG_WARN([--with-mandir called without argument - will use default]) - ;; - * ) - piddir="$withval" - ;; - esac]) - - -################################################# # set SWAT directory location AC_ARG_WITH(swatdir, [ --with-swatdir=DIR Where to put SWAT files ($ac_default_prefix/swat)], @@ -167,7 +149,6 @@ done AC_SUBST(configdir) AC_SUBST(lockdir) AC_SUBST(piddir) -AC_SUBST(mandir) AC_SUBST(logfilebase) AC_SUBST(privatedir) AC_SUBST(swatdir) @@ -2721,8 +2702,8 @@ if test x"$with_ads_support" != x"no"; then exit(0); exit(1); }], - samba_cv_HAVE_MEMORY_KEYTAB=no, - samba_cv_HAVE_MEMORY_KEYTAB=yes)]) + samba_cv_HAVE_MEMORY_KEYTAB=yes, + samba_cv_HAVE_MEMORY_KEYTAB=no)]) if test x"$samba_cv_HAVE_MEMORY_KEYTAB" = x"yes"; then AC_DEFINE(HAVE_MEMORY_KEYTAB,1, |