summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-15 16:28:05 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-18 15:09:46 +1100
commit3a5b199752a925e52a207ab0547a2a77c31ab097 (patch)
tree6613629ccc474985703c3d5a8a7fac67e3ca07b7
parent600c726f51099e607b06a257dc04af95ac06b2c2 (diff)
downloadsamba-3a5b199752a925e52a207ab0547a2a77c31ab097.tar.gz
samba-3a5b199752a925e52a207ab0547a2a77c31ab097.tar.bz2
samba-3a5b199752a925e52a207ab0547a2a77c31ab097.zip
s3build: added NMBDSOCKETDIR to dynconfig
this is needed for the s3 top level build Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/dynconfig/dynconfig.c1
-rw-r--r--source4/dynconfig/dynconfig.h1
-rwxr-xr-xsource4/dynconfig/wscript4
3 files changed, 5 insertions, 1 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 228cbbcfa8..45b7b73720 100644
--- 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 579f45b3f1..64d399109e 100644
--- 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 45f79368f9..f815e81a2d 100755
--- 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):