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

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 5f672787187a58848571c78a29ec058891d599d5..af9d7350a752d1011268ad4efb243a3aa9cb087c 100644 (file)
--- 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 4d24001fcb88b0a4685fd8b0c2679f430a95315e..2a45f1f35c7e63a191887995c41dd13d28cf3381 100644 (file)
--- 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)