[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  77e6efa s3:configure: remove unused --with-rootsbindir configure option
       via  5be934e s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
       via  ded32a3 s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets (cherry picked from commit c558775713e505cfc1db5af417cc7b792dfc310e)
      from  21b30d5 Add NT_STATUS_IO_REPARSE_TAG_NOT_HANDLED

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 77e6efa45432daaabdad1b62739c41c5b2315f3d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Jun 24 22:04:51 2011 +0200

    s3:configure: remove unused --with-rootsbindir configure option
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Fri Jun 24 23:57:20 CEST 2011 on sn-devel-104

commit 5be934eac2b4f0fdc4f67e273f88f1af9aecffdb
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 14 15:00:32 2011 +1000

    s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
    
    This is consistent with the new ncalrpc socket directory, also added
    in this release.
    
    Andrew Bartlett
    
    Signed-off-by: Andrew Tridgell <tridge at samba.org>
    
    The last 2 patches address bug #8230 (Move .nmbd socket directory to non-hidden
    name PREFIX/var/nmbd).
    (cherry picked from commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit ded32a34f4d43e598044508d7322ba527d167af8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jun 14 14:56:30 2011 +1000

    s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets
    (cherry picked from commit c558775713e505cfc1db5af417cc7b792dfc310e)
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in               |    1 -
 source3/m4/check_path.m4          |   22 ++--------------------
 source3/script/mkbuildoptions.awk |    2 ++
 3 files changed, 4 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b37f315..299a9ec 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -121,7 +121,6 @@ BASEDIR= @prefix@
 BINDIR = @bindir@
 # sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode.
 SBINDIR = @sbindir@
-ROOTSBINDIR = @rootsbindir@
 LIBDIR = @libdir@
 MODULESDIR = @modulesdir@
 INCLUDEDIR=@includedir@
diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index f04e6f8..1d65846 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -15,11 +15,10 @@ AC_LIBREPLACE_LOCATION_CHECKS
 # ones...
 AC_PREFIX_DEFAULT(/usr/local/samba)
 
-rootsbindir="\${SBINDIR}"
 lockdir="\${VARDIR}/locks"
 piddir="\${VARDIR}/locks"
 ncalrpcdir="\${VARDIR}/ncalrpc"
-nmbdsocketdir="${lockdir}/.nmbd"
+nmbdsocketdir="\${VARDIR}/nmbd"
 test "${mandir}" || mandir="\${prefix}/man"
 logfilebase="\${VARDIR}"
 privatedir="\${prefix}/private"
@@ -71,22 +70,6 @@ AC_ARG_WITH(privatedir,
   esac])
 
 #################################################
-# set root sbin directory location
-AC_ARG_WITH(rootsbindir,
-[AS_HELP_STRING([--with-rootsbindir=DIR], [Which directory to use for root sbin ($ac_default_prefix/sbin)])],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-rootsbindir called without argument - will use default])
-  ;;
-  * )
-    rootsbindir="$withval"
-    ;;
-  esac])
-
-#################################################
 # set lock directory location
 AC_ARG_WITH(lockdir,
 [AS_HELP_STRING([--with-lockdir=DIR], [Where to put lock files ($ac_default_prefix/var/locks)])],
@@ -169,7 +152,7 @@ AC_ARG_WITH(ncalrpcdir,
 #################################################
 # set nmbd socket directory location
 AC_ARG_WITH(nmbdsocketdir,
-[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory (${lockdir}/.nmbd)])],
+[AS_HELP_STRING([--with-nmbdsocketdir=DIR], [Where to put the nmbd socket directory ($ac_default_prefix/var/nmbd)])],
 [ case "$withval" in
   yes|no)
   #
@@ -325,7 +308,6 @@ AC_SUBST(sbindir)
 AC_SUBST(codepagedir)
 AC_SUBST(statedir)
 AC_SUBST(cachedir)
-AC_SUBST(rootsbindir)
 AC_SUBST(pammodulesdir)
 AC_SUBST(modulesdir)
 AC_SUBST(localedir)
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 0b1b2ef..122489e 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions.awk
@@ -96,6 +96,8 @@ BEGIN {
 
 	print "       output(screen,\"   SMB_PASSWD_FILE: %s\\n\",get_dyn_SMB_PASSWD_FILE());";
 	print "       output(screen,\"   PRIVATE_DIR: %s\\n\",get_dyn_PRIVATE_DIR());";
+	print "       output(screen,\"   NCALRPCDIR: %s\\n\",get_dyn_NCALRPCDIR());";
+	print "       output(screen,\"   NMBDSOCKETDIR: %s\\n\",get_dyn_NMBDSOCKETDIR());";
 	print "";
 
 


-- 
Samba Shared Repository