[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  833fdb5 s3-autconf Move nmbd socket directory to PREFIX/var/nmbd
       via  c558775 s3-buildoptions Show compiled-in location of the new ncaclrpc and nmbd sockets
      from  a2fa00e s3:docs: fix the example in the idmap_autorid manpage to use "idmap config * : rangesize"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 833fdb5b3693a7c9111bb98e5bc9a29d29be9d1d
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).

commit c558775713e505cfc1db5af417cc7b792dfc310e
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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index f04e6f8..65db076 100644
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -19,7 +19,7 @@ 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"
@@ -169,7 +169,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)
   #
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk
index 1955a80..9a82da2 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