diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-06-13 19:33:42 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-07-24 16:29:15 +0200 |
| commit | ca98d816cc898ed66a0aa065de65938bd4b71c1a (patch) | |
| tree | 34bda802eae7b2f5395568181927db0074296165 /dynconfig | |
| parent | 077dfd0a89a854c21b91b0f871d034fd9fe82a9a (diff) | |
| download | samba-ca98d816cc898ed66a0aa065de65938bd4b71c1a.tar.gz | |
dynconfig: Remove last s3 markers now we have just one build system
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jul 24 16:29:15 CEST 2013 on sn-devel-104
Diffstat (limited to 'dynconfig')
| -rw-r--r-- | dynconfig/dynconfig.c | 2 | ||||
| -rw-r--r-- | dynconfig/dynconfig.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c index 5f672787187..af9d7350a75 100644 --- a/dynconfig/dynconfig.c +++ b/dynconfig/dynconfig.c @@ -83,7 +83,6 @@ const char *set_dyn_##name(const char *newpath) \ return dyn_##name;\ } -/* these are in common with s3 */ DEFINE_DYN_CONFIG_PARAM(SBINDIR) DEFINE_DYN_CONFIG_PARAM(BINDIR) DEFINE_DYN_CONFIG_PARAM(CONFIGFILE) /**< Location of smb.conf file. **/ @@ -105,7 +104,6 @@ DEFINE_DYN_CONFIG_PARAM(NMBDSOCKETDIR) DEFINE_DYN_CONFIG_PARAM(DATADIR) DEFINE_DYN_CONFIG_PARAM(SETUPDIR) DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */ - DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR) DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR) DEFINE_DYN_CONFIG_PARAM(PYTHONDIR) diff --git a/dynconfig/dynconfig.h b/dynconfig/dynconfig.h index 4d24001fcb8..2a45f1f35c7 100644 --- a/dynconfig/dynconfig.h +++ b/dynconfig/dynconfig.h @@ -30,7 +30,6 @@ const char *get_dyn_##name(void); \ const char *set_dyn_##name(const char *newpath); \ bool is_default_dyn_##name(void); -/* these are in common with s3 */ DEFINE_DYN_CONFIG_PROTO(SBINDIR) DEFINE_DYN_CONFIG_PROTO(BINDIR) DEFINE_DYN_CONFIG_PROTO(CONFIGFILE) /**< Location of smb.conf file. **/ @@ -49,8 +48,6 @@ DEFINE_DYN_CONFIG_PROTO(SMB_PASSWD_FILE) DEFINE_DYN_CONFIG_PROTO(PRIVATE_DIR) DEFINE_DYN_CONFIG_PROTO(LOCALEDIR) DEFINE_DYN_CONFIG_PROTO(NMBDSOCKETDIR) - -/* these are not in s3 */ DEFINE_DYN_CONFIG_PROTO(DATADIR) DEFINE_DYN_CONFIG_PROTO(SETUPDIR) DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR) |