summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-17 21:12:17 +1100
committerStefan Metzmacher <metze@samba.org>2010-02-23 13:48:19 +0100
commit95ee01bb3047eb65de2a6812e003450d068e677e (patch)
tree86821e747c8743b212155a7c0994523a1aab6421
parent13e2f5f971eeaa7b342baeaee55ff52b089ac881 (diff)
downloadsamba-95ee01bb3047eb65de2a6812e003450d068e677e.tar.gz
samba-95ee01bb3047eb65de2a6812e003450d068e677e.tar.bz2
samba-95ee01bb3047eb65de2a6812e003450d068e677e.zip
s4-config: add dyn_SBINDIR
-rw-r--r--source4/dynconfig/config.mk1
-rw-r--r--source4/dynconfig/dynconfig.c3
-rw-r--r--source4/dynconfig/dynconfig.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk
index d800004e5d..7db288d22e 100644
--- a/source4/dynconfig/config.mk
+++ b/source4/dynconfig/config.mk
@@ -10,6 +10,7 @@ pkgconfigdir = $(libdir)/pkgconfig
LMHOSTSFILE4 = $(sysconfdir)/lmhosts
$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIG4FILE)\" -DBINDIR=\"$(bindir)\" \
+ -DSBINDIR=\"$(sbindir)\" \
-DLMHOSTSFILE=\"$(LMHOSTSFILE4)\" \
-DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
-DLOGFILEBASE=\"$(logfilebase)\" \
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 5af69bfe6b..3edf2bbf09 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -43,6 +43,9 @@
/** Directory with generic binaries */
_PUBLIC_ const char *dyn_BINDIR = BINDIR;
+/** Directory with root use binaries */
+_PUBLIC_ const char *dyn_SBINDIR = SBINDIR;
+
/**< Location of smb.conf file. **/
_PUBLIC_ const char *dyn_CONFIGFILE = CONFIGFILE;
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index 1bba1f07db..c8d2766f4c 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -25,6 +25,7 @@
**/
extern const char *dyn_BINDIR;
+extern const char *dyn_SBINDIR;
extern const char *dyn_CONFIGFILE;
extern const char *dyn_NCALRPCDIR;
extern const char *dyn_LOGFILEBASE;