summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-10 17:02:10 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-10 23:39:47 +0200
commit33c4b85058f21ab9865bc7cf1b49b7bd38e0275d (patch)
tree2abf2c439f8156893ebb87620b2c14f8c6b88082
parent8f6ca4859c4d377974fa61a3de10d6304b562986 (diff)
downloadsamba-33c4b85058f21ab9865bc7cf1b49b7bd38e0275d.tar.gz
samba-33c4b85058f21ab9865bc7cf1b49b7bd38e0275d.tar.bz2
samba-33c4b85058f21ab9865bc7cf1b49b7bd38e0275d.zip
dsdb: Move attr_in_list to SAMDB_COMMON to avoid circular dependency between SAMDB_COMMON and DSDB_MODULE_HELPERS.
-rw-r--r--source4/dsdb/common/util.c13
-rw-r--r--source4/dsdb/common/util.h2
-rw-r--r--source4/dsdb/samdb/ldb_modules/util.c12
-rw-r--r--source4/dsdb/wscript_build2
4 files changed, 15 insertions, 14 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 71215212fc..0a002197f5 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -42,7 +42,6 @@
#include "lib/util/tsort.h"
#include "dsdb/common/util.h"
#include "lib/socket/socket.h"
-#include "dsdb/samdb/ldb_modules/util.h"
#include "librpc/gen_ndr/irpc.h"
/*
@@ -4253,3 +4252,15 @@ bool dsdb_attr_in_parse_tree(struct ldb_parse_tree *tree,
return false;
}
+bool is_attr_in_list(const char * const * attrs, const char *attr)
+{
+ unsigned int i;
+
+ for (i = 0; attrs[i]; i++) {
+ if (ldb_attr_cmp(attrs[i], attr) == 0)
+ return true;
+ }
+
+ return false;
+}
+
diff --git a/source4/dsdb/common/util.h b/source4/dsdb/common/util.h
index 7ae46ae887..7dabef8d87 100644
--- a/source4/dsdb/common/util.h
+++ b/source4/dsdb/common/util.h
@@ -34,3 +34,5 @@
#define DSDB_TREE_DELETE 0x0100
#define DSDB_SEARCH_ONE_ONLY 0x0200 /* give an error unless 1 record */
#define DSDB_SEARCH_SHOW_RECYCLED 0x0400
+
+bool is_attr_in_list(const char * const * attrs, const char *attr);
diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c
index 74825a5a4b..569c967e95 100644
--- a/source4/dsdb/samdb/ldb_modules/util.c
+++ b/source4/dsdb/samdb/ldb_modules/util.c
@@ -954,18 +954,6 @@ int dsdb_recyclebin_enabled(struct ldb_module *module, bool *enabled)
return LDB_SUCCESS;
}
-bool is_attr_in_list(const char * const * attrs, const char *attr)
-{
- unsigned int i;
-
- for (i = 0; attrs[i]; i++) {
- if (ldb_attr_cmp(attrs[i], attr) == 0)
- return true;
- }
-
- return false;
-}
-
int dsdb_msg_constrainted_update_int32(struct ldb_module *module,
struct ldb_message *msg,
const char *attr,
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 784d93bcd4..6a521fb2aa 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB',
bld.SAMBA_SUBSYSTEM('SAMDB_COMMON',
source='common/util.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c',
autoproto='common/proto.h',
- deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH DSDB_MODULE_HELPERS'
+ deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH'
)