dsdb modules: Split ridalloc out of common helpers, because of dependency loops.

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index c67f2d06d679c6edcff64b7a446e482dee85cdef..bf804fd54c96987f3475a47b3615d8411972a631 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -34,6 +34,7 @@
 #include "ldb_module.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/samdb/ldb_modules/ridalloc.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "../lib/util/util_ldb.h"

diff --git a/source4/dsdb/samdb/ldb_modules/subtree_delete.c b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
index 3817d225a84b2b93cb01ba2b8ee0c463715ab56d..91d22c984e4609c47ff4baf3d9692923f730d942 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/subtree_delete.c
+++ b/source4/dsdb/samdb/ldb_modules/subtree_delete.c
@@ -35,6 +35,7 @@
 #include <ldb.h>
 #include <ldb_module.h>
 #include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/common/util.h"
 
 
 static int subtree_delete(struct ldb_module *module, struct ldb_request *req)

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index b59fce3624c0c4e91737dfaafbf19cbb648f7e75..399105332aeaf4417322167724b6ac2930370faa 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -1,11 +1,16 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
-       source='util.c ridalloc.c acl_util.c',
+       source='util.c acl_util.c',
        autoproto='util_proto.h',
-       deps='ldb LIBNDR SAMDB_SCHEMA MESSAGING'
+       deps='ldb LIBNDR SAMDB_SCHEMA'
        )
 
+bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
+       source='ridalloc.c',
+       autoproto='ridalloc.h',
+       deps='MESSAGING',
+       )
 
 bld.SAMBA_MODULE('ldb_samba_dsdb',
        source='samba_dsdb.c',
@@ -93,7 +98,7 @@ bld.SAMBA_MODULE('ldb_samldb',
        subsystem='ldb',
        init_function='LDB_MODULE(samldb)',
        internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-       deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
+       deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
        )
 
 
@@ -111,7 +116,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sid)',
        internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-       deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA'
+       deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
        )
 
 
@@ -320,7 +325,7 @@ bld.SAMBA_MODULE('ldb_acl',
        subsystem='ldb',
        init_function='LDB_MODULE(acl)',
        internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-       deps='talloc LIBEVENTS LIBSECURITY SAMDB'
+       deps='talloc LIBEVENTS LIBSECURITY SAMDB DSDB_MODULE_HELPERS'
        )