sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s3: Use autotools to set the winbind socket directory.

Browse Source 
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Wed Nov  9 13:31:27 CET 2011 on sn-devel-104
This commit is contained in:
Andreas Schneider 2011-11-09 11:33:47 +01:00 committed by Andreas Schneider
parent ffbd1ed279
commit e66ceb6566
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dynconfig/config.m4
View File

@ -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"

12
source3/Makefile.in
View File

@ -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)"