From 95ee01bb3047eb65de2a6812e003450d068e677e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Feb 2010 21:12:17 +1100 Subject: s4-config: add dyn_SBINDIR --- source4/dynconfig/config.mk | 1 + source4/dynconfig/dynconfig.c | 3 +++ source4/dynconfig/dynconfig.h | 1 + 3 files changed, 5 insertions(+) (limited to 'source4/dynconfig') 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; -- cgit