s3build: added NMBDSOCKETDIR to dynconfig

this is needed for the s3 top level build

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 228cbbcfa8f7d72097ae5b738f1044160447f40c..45b7b737208ae5902be1abb4a1094e65e20b70cf 100644 (file)
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -85,6 +85,7 @@ DEFINE_DYN_CONFIG_PARAM(NCALRPCDIR)
 DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
 DEFINE_DYN_CONFIG_PARAM(LOCALEDIR)
+DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR)
 
 /* these are not in s3 */
 DEFINE_DYN_CONFIG_PARAM(DATADIR)

diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 579f45b3f1628aa0d5cbfc682c0ebf401d90a3d2..64d399109e6a9f413ea7f214b2a05cf497bd8757 100644 (file)
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -48,6 +48,7 @@ DEFINE_DYN_CONFIG_PROTO(PIDDIR)
 DEFINE_DYN_CONFIG_PROTO(NCALRPCDIR)
 DEFINE_DYN_CONFIG_PROTO(SMB_PASSWD_FILE)
 DEFINE_DYN_CONFIG_PROTO(PRIVATE_DIR)
+DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR)
 
 /* these are not in s3 */
 DEFINE_DYN_CONFIG_PROTO(DATADIR)

diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 45f79368f9ec8b608261ee8e60c33d95579974f0..f815e81a2d325c86db08b89a8bf24794ccb56809 100755 (executable)
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -44,6 +44,7 @@ dyn_cflags = {
     'STATEDIR'                       : '${LOCALSTATEDIR}',
     'CACHEDIR'                       : '${LOCKDIR}',
     'SMB_PASSWD_FILE'                : '${PRIVATEDIR}/smbpasswd',
+    'NMBDSOCKETDIR'                  : '${LOCALSTATEDIR}/nmbd',
     }
 
 # changes for when FHS is enabled
@@ -62,7 +63,7 @@ dyn_cflags_fhs = {
     'WINBINDD_SOCKET_DIR'            : '${LOCALSTATEDIR}/run/samba/winbindd',
     'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
     'NTP_SIGND_SOCKET_DIR'           : '${LOCALSTATEDIR}/run/samba/ntp_signd',
-    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
+    'NCALRPCDIR'                     : '${LOCALSTATEDIR}/run/samba/ncalrpc',
     'PYTHONARCHDIR'                  : '${PYTHONARCHDIR}',
     'MODULESDIR'                     : '${LIBDIR}/samba',
     'LIBEXECDIR'                     : '${MODULESDIR}',
@@ -70,6 +71,7 @@ dyn_cflags_fhs = {
     'PKGCONFIGDIR'                   : '${LIBDIR}/pkgconfig',
     'SWATDIR'                        : '${DATADIR}/swat',
     'CODEPAGEDIR'                    : '${DATADIR}/samba',
+    'NMBDSOCKETDIR'                  : '${LOCALSTATEDIR}/run/samba/nmbd',
     }
 
 def get_varname(v):