diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-01-31 00:48:57 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:37 -0500 |
commit | b70009649a23ee8f0e88c1b9935e739537f4a960 (patch) | |
tree | e720a3d9862dea024fbce7b28f4a2873ab2530ce /source4/main.mk | |
parent | b98a5bf92222e37eb62422f65ecc048511a8f256 (diff) | |
download | samba-b70009649a23ee8f0e88c1b9935e739537f4a960.tar.gz samba-b70009649a23ee8f0e88c1b9935e739537f4a960.tar.bz2 samba-b70009649a23ee8f0e88c1b9935e739537f4a960.zip |
r13244: Allow control of the location of the Samba3-compatible winbindd pipe
in Samba4. This allows us to start winbindd by default, including in
'make test'.
This is via a new 'winbindd socket directory' parameter for utilities
linked against loadparm, as well as a --with-winbindd-socket-dir
option to configure (setting the default and the value for simple
clients).
I hope to add basic winbindd tests, to ensure continued correct
operation, but at least now I don't have to manually change my 'server
services' line.
The other problem with the hard-coded /tmp/.winbind is that RedHat has
moved this in Fedora (to /var/run I think). For this reason, this
functionality should probably be ported to Samba3 as well.
The default for Samba4 is PREFIX/var/run/winbind_pipe.
I have also re-added the paranoia checks from Samba3 for correct
permissions on the socket directory.
Andrew Bartlett
(This used to be commit 8866aa06ffc3896094c878e9c07b40c03826d9a7)
Diffstat (limited to 'source4/main.mk')
-rw-r--r-- | source4/main.mk | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/source4/main.mk b/source4/main.mk index 59dffb4841..d1a1c3ab2e 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -43,21 +43,22 @@ everything: all showlayout: @echo 'Samba will be installed into:' - @echo ' basedir: $(BASEDIR)' - @echo ' bindir: $(BINDIR)' - @echo ' sbindir: $(SBINDIR)' - @echo ' libdir: $(LIBDIR)' + @echo ' basedir: $(BASEDIR)' + @echo ' bindir: $(BINDIR)' + @echo ' sbindir: $(SBINDIR)' + @echo ' libdir: $(LIBDIR)' @echo ' modulesdir: $(MODULESDIR)' @echo ' includedir: $(INCLUDEDIR)' - @echo ' vardir: $(VARDIR)' + @echo ' vardir: $(VARDIR)' @echo ' privatedir: $(PRIVATEDIR)' - @echo ' piddir: $(PIDDIR)' - @echo ' lockdir: $(LOCKDIR)' - @echo ' logfilebase: $(LOGFILEBASE)' - @echo ' setupdir: $(SETUPDIR)' - @echo ' jsdir: $(JSDIR)' - @echo ' swatdir: $(SWATDIR)' - @echo ' mandir: $(MANDIR)' + @echo ' piddir: $(PIDDIR)' + @echo ' lockdir: $(LOCKDIR)' + @echo ' logfilebase: $(LOGFILEBASE)' + @echo ' setupdir: $(SETUPDIR)' + @echo ' jsdir: $(JSDIR)' + @echo ' swatdir: $(SWATDIR)' + @echo ' mandir: $(MANDIR)' + @echo ' winbinddir: $(WINBINDDIR)' showflags: @echo 'Samba will be compiled with flags:' @@ -84,7 +85,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \ - -DSETUPDIR=\"$(SETUPDIR)\" + -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" install: showlayout installbin installdat installswat installmisc installlib \ installheader installpc |