summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-06-28 22:02:58 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-06-28 22:02:58 +1000
commit03f51df57065e15cce091da4c63dbfb94670fe9c (patch)
treec18e260e144111f6e248bb338452b7e76ec5a267
parent234413fbd9664dc217ed8c029be33fc7aa260d3a (diff)
downloadsamba-03f51df57065e15cce091da4c63dbfb94670fe9c.tar.gz
samba-03f51df57065e15cce091da4c63dbfb94670fe9c.tar.bz2
samba-03f51df57065e15cce091da4c63dbfb94670fe9c.zip
dynconfig changes for 'winbind privileged dir' changes.
(This used to be commit 7e20919d5ba9244362503e450273938a7cc94796)
-rw-r--r--source4/dynconfig/config.mk4
-rw-r--r--source4/dynconfig/dynconfig.c3
-rw-r--r--source4/dynconfig/dynconfig.h1
3 files changed, 7 insertions, 1 deletions
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index a353ba1214..4956fda519 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -19,6 +19,8 @@ $(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=
-DPRIVATE_DIR=\"$(privatedir)\" \
-DMODULESDIR=\"$(modulesdir)\" -DJSDIR=\"$(JSDIR)\" \
-DTORTUREDIR=\"$(TORTUREDIR)\" \
- -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \
+ -DSETUPDIR=\"$(SETUPDIR)\" \
+ -DWINBINDD_PRIVILEGED_SOCKET_DIR=\"$(winbindd_privileged_socket_dir)\" \
+ -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" \
-DNTP_SIGND_SOCKET_DIR=\"$(ntp_signd_socket_dir)\"
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index ef5c40d698..507570318d 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -85,5 +85,8 @@ _PUBLIC_ const char *dyn_JSDIR = JSDIR;
/** Where to find the winbindd socket */
_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
+/** Where to find the winbindd privileged socket */
+_PUBLIC_ const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR = WINBINDD_PRIVILEGED_SOCKET_DIR;
+
/** Where to find the NTP signing deamon socket */
_PUBLIC_ const char *dyn_NTP_SIGND_SOCKET_DIR = NTP_SIGND_SOCKET_DIR;
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index e77c13bab3..1bba1f07db 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -38,4 +38,5 @@ extern const char *dyn_SWATDIR;
extern const char *dyn_JSDIR;
extern const char *dyn_SETUPDIR;
extern const char *dyn_WINBINDD_SOCKET_DIR;
+extern const char *dyn_WINBINDD_PRIVILEGED_SOCKET_DIR;
extern const char *dyn_NTP_SIGND_SOCKET_DIR;