summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-11 00:29:18 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-11 01:06:35 +0200
commit1f73f3b1ca561f8cad680459e0ef418d90b2e955 (patch)
tree68acdeb7b8d94beef0a30e54ebf3e8cf846af56f /source4/dsdb/samdb
parent7552dd8d1e5f844fbf71580f1a34d50dcb4f3fbc (diff)
downloadsamba-1f73f3b1ca561f8cad680459e0ef418d90b2e955.tar.gz
samba-1f73f3b1ca561f8cad680459e0ef418d90b2e955.tar.bz2
samba-1f73f3b1ca561f8cad680459e0ef418d90b2e955.zip
dsdb modules: Split ridalloc out of common helpers, because of dependency loops.
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c1
-rw-r--r--source4/dsdb/samdb/ldb_modules/subtree_delete.c1
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build15
3 files changed, 12 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index c67f2d06d6..bf804fd54c 100644
--- 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 3817d225a8..91d22c984e 100644
--- 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 b59fce3624..399105332a 100644
--- 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'
)