s4-samldb: Do not allow deletion of objects with RID < 1000

[mat/samba.git] / dynconfig / dynconfig.c

diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 9fd7108da4fd592199a43c01ace7fb2b669fd8c8..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,20 +104,8 @@ 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 */
-
-/* these are not used in s3 */
-#ifdef WINBINDD_PRIVILEGED_SOCKET_DIR
 DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
-#endif
-#ifdef NTP_SIGND_SOCKET_DIR
 DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
-#endif
-#ifdef PYTHONDIR
 DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
-#endif
-#ifdef PYTHONARCHDIR
 DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
-#endif
-#ifdef SCRIPTSBINDIR
 DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
-#endif