diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-29 15:51:24 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-29 15:51:24 +0200 |
| commit | b302d3273a3b9e6acc1ff90bbca02fbe2ceb1160 (patch) | |
| tree | 5201509b5f932788feeeee2ec6acface46581d34 /source4/dynconfig | |
| parent | 1e7dc5675280d567db1b6a243d48c5617dba5872 (diff) | |
| parent | 617ef56aa3378c384026b72871af5a7253b8df33 (diff) | |
| download | samba-b302d3273a3b9e6acc1ff90bbca02fbe2ceb1160.tar.gz samba-b302d3273a3b9e6acc1ff90bbca02fbe2ceb1160.tar.bz2 samba-b302d3273a3b9e6acc1ff90bbca02fbe2ceb1160.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
(This used to be commit 3947327f8c4ca530d99bc5ac3d1f6f54727f477a)
Diffstat (limited to 'source4/dynconfig')
| -rw-r--r-- | source4/dynconfig/config.mk | 3 | ||||
| -rw-r--r-- | source4/dynconfig/dynconfig.c | 3 | ||||
| -rw-r--r-- | source4/dynconfig/dynconfig.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/source4/dynconfig/config.mk b/source4/dynconfig/config.mk index 5f2887f8b6..a353ba1214 100644 --- a/source4/dynconfig/config.mk +++ b/source4/dynconfig/config.mk @@ -19,5 +19,6 @@ $(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_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 6dbbf872d9..ef5c40d698 100644 --- a/source4/dynconfig/dynconfig.c +++ b/source4/dynconfig/dynconfig.c @@ -84,3 +84,6 @@ _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 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 ac54db63d6..e77c13bab3 100644 --- a/source4/dynconfig/dynconfig.h +++ b/source4/dynconfig/dynconfig.h @@ -38,3 +38,4 @@ 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_NTP_SIGND_SOCKET_DIR; |