[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  e66ceb6 s3: Use autotools to set the winbind socket directory.
      from  ffbd1ed s3:smb2_server: grant credits in async interim responses (bug #8357)

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


- Log -----------------------------------------------------------------
commit e66ceb6566b532ea7f191dd2a0ed661f7086609e
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 9 11:33:47 2011 +0100

    s3: Use autotools to set the winbind socket directory.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Wed Nov  9 13:31:27 CET 2011 on sn-devel-104

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

Summary of changes:
 dynconfig/config.m4 |   31 +++++++++++++++++++++++++++++++
 source3/Makefile.in |   12 +++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index 4e95991..e7a7228 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -212,6 +212,37 @@ AC_ARG_WITH(privileged-socket-dir,
 
 WINBINDD_SOCKET_DIR="${SOCKET_DIR}/winbindd"
 WINBINDD_PRIVILEGED_SOCKET_DIR="${PRIVILEGED_SOCKET_DIR}/winbindd_privileged"
+
+AC_ARG_WITH(winbind-socket-dir,
+[AS_HELP_STRING([--with-winbind-socket-dir=DIR],
+ [winbnd socket directory ($localstatedir/run/winbindd)])],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-winbind-socket-dir called without argument - will use default])
+  ;;
+  * )
+    WINBINDD_SOCKET_DIR="$withval"
+  ;;
+  esac])
+
+AC_ARG_WITH(winbind-privileged-socket-dir,
+[AS_HELP_STRING([--with-winbind-privileged-socket-dir=DIR],
+ [winbind privileged socket directory ($localstatedir/lib/winbindd)])],
+[ case "$withval" in
+  yes|no)
+  #
+  # Just in case anybody calls it without argument
+  #
+    AC_MSG_WARN([--with-winbind-privileged-socket-dir called without argument - will use default])
+  ;;
+  * )
+    WINBINDD_PRIVILEGED_SOCKET_DIR="$withval"
+  ;;
+  esac])
+
 NMBDSOCKETDIR="${SOCKET_DIR}/nmbd"
 NTP_SIGND_SOCKET_DIR="${SOCKET_DIR}/ntp_signd"
 NCALRPCDIR="${SOCKET_DIR}/ncalrpc"
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 66530c7..fbf1710 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -43,8 +43,8 @@ CACHEDIR=@CACHEDIR@
 LOGFILEBASE=@LOGFILEBASE@
 SOCKET_DIR=@SOCKET_DIR@
 PRIVILEGED_SOCKET_DIR=@PRIVILEGED_SOCKET_DIR@
-#WINBINDD_SOCKET_DIR=@WINBINDD_SOCKET_DIR@
-#WINBINDD_PRIVILEGED_SOCKET_DIR=@WINBINDD_PRIVILEGED_SOCKET_DIR@
+WINBINDD_SOCKET_DIR=@WINBINDD_SOCKET_DIR@
+WINBINDD_PRIVILEGED_SOCKET_DIR=@WINBINDD_PRIVILEGED_SOCKET_DIR@
 NMBDSOCKETDIR=@NMBDSOCKETDIR@
 #NTP_SIGND_SOCKET_DIR=@NTP_SIGND_SOCKET_DIR@
 NCALRPCDIR=@NCALRPCDIR@
@@ -199,6 +199,8 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
 	-DCACHEDIR=\"$(CACHEDIR)\" \
 	-DSTATEDIR=\"$(STATEDIR)\" \
 	-DNMBDSOCKETDIR=\"$(NMBDSOCKETDIR)\" \
+	-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" \
+	-DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(WINBINDD_PRIVILEGED_SOCKET_DIR)\" \
 	-DLOCALEDIR=\"$(LOCALEDIR)\" \
 	-DDATADIR=\"$(DATADIR)\" \
 	-DSETUPDIR=\"$(SETUPDIR)\"
@@ -3218,7 +3220,7 @@ installdirs::
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \
 		$(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \
 		$(VARDIR) $(PRIVATE_DIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \
-		$(NMBDSOCKETDIR) \
+		$(NMBDSOCKETDIR) $(WINBINDD_SOCKET_DIR) $(WINBINDD_PRIVILEGED_SOCKET_DIR) \
 		$(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR)
 
 installservers:: all installdirs
@@ -3315,8 +3317,8 @@ showlayout::
 	@echo " LOGFILEBASE:           $(LOGFILEBASE)"
 	@echo " SOCKET_DIR:            $(SOCKET_DIR)"
 	@echo " PRIVILEGED_SOCKET_DIR: $(PRIVILEGED_SOCKET_DIR)"
-#	@echo " WINBINDD_SOCKET_DIR:   $(WINBINDD_SOCKET_DIR)"
-#	@echo " WINBINDD_PRIVILEGED_SOCKET_DIR: $(WINBINDD_PRIVILEGED_SOCKET_DIR)"
+	@echo " WINBINDD_SOCKET_DIR:   $(WINBINDD_SOCKET_DIR)"
+	@echo " WINBINDD_PRIVILEGED_SOCKET_DIR: $(WINBINDD_PRIVILEGED_SOCKET_DIR)"
 	@echo " NMBDSOCKETDIR:         $(NMBDSOCKETDIR)"
 #	@echo " NTP_SIGND_SOCKET_DIR:  $(NTP_SIGND_SOCKET_DIR)"
 	@echo " NCALRPCDIR:            $(NCALRPCDIR)"


-- 
Samba Shared Repository