summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-11-09 11:33:47 +0100
committerAndreas Schneider <asn@cryptomilk.org>2011-11-09 13:31:27 +0100
commite66ceb6566b532ea7f191dd2a0ed661f7086609e (patch)
tree34c39a1c6d4562136ef3ffebebf153c4d3c9621f
parentffbd1ed2797616226a7987efd4b4dd4275c8c9d0 (diff)
downloadsamba-e66ceb6566b532ea7f191dd2a0ed661f7086609e.tar.gz
samba-e66ceb6566b532ea7f191dd2a0ed661f7086609e.tar.bz2
samba-e66ceb6566b532ea7f191dd2a0ed661f7086609e.zip
s3: Use autotools to set the winbind socket directory.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org> Autobuild-Date: Wed Nov 9 13:31:27 CET 2011 on sn-devel-104
-rw-r--r--dynconfig/config.m431
-rw-r--r--source3/Makefile.in12
2 files changed, 38 insertions, 5 deletions
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index 4e95991dac..e7a7228e8a 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 66530c770b..fbf17105d4 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)"