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/dynconfig.c | |
parent | b98a5bf92222e37eb62422f65ecc048511a8f256 (diff) | |
download | samba-b70009649a23ee8f0e88c1b9935e739537f4a960.tar.gz samba-b70009649a23ee8f0e88c1b9935e739537f4a960.tar.xz 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/dynconfig.c')
-rw-r--r-- | source4/dynconfig.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source4/dynconfig.c b/source4/dynconfig.c index 70f17d0b483..742c96df2a2 100644 --- a/source4/dynconfig.c +++ b/source4/dynconfig.c @@ -80,6 +80,13 @@ const char *dyn_PRIVATE_DIR = PRIVATE_DIR; /** SWAT data file (images, etc) directory */ const char *dyn_SWATDIR = SWATDIR; +/** SETUP files (source files used by the provision) */ const char *dyn_SETUPDIR = SETUPDIR; +/** EJS Javascript library includes */ const char *dyn_JSDIR = JSDIR; + +/** Where to find the winbindd socket */ + +const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR; + |