diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2012-04-04 22:24:16 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-11 06:31:51 +0200 |
| commit | 0c44d46f24ef69598eaef281bcb82f943655d0bc (patch) | |
| tree | 6219094ce16ab0e5332ddcf50a3bec11a731e891 /source4/dsdb/samdb/ldb_modules/objectclass.c | |
| parent | 83062125e60dd097a1a151fb35467fe55a356780 (diff) | |
| download | samba-0c44d46f24ef69598eaef281bcb82f943655d0bc.tar.gz samba-0c44d46f24ef69598eaef281bcb82f943655d0bc.tar.bz2 samba-0c44d46f24ef69598eaef281bcb82f943655d0bc.zip | |
s4:dsdb/samdb/ldb_modules/schema.c - move "get_last_structural_class()" into "util.c"
And remove this helper module - it does not have much sense keeping it.
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Apr 11 06:31:51 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/objectclass.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectclass.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c index 033330c86c..d431367b5a 100644 --- a/source4/dsdb/samdb/ldb_modules/objectclass.c +++ b/source4/dsdb/samdb/ldb_modules/objectclass.c @@ -44,7 +44,6 @@ #include "auth/auth.h" #include "param/param.h" #include "../libds/common/flags.h" -#include "dsdb/samdb/ldb_modules/schema.h" #include "dsdb/samdb/ldb_modules/util.h" struct oc_context { @@ -469,8 +468,8 @@ static int objectclass_do_add(struct oc_context *ac) * Get the new top-most structural object class and check for * unrelated structural classes */ - objectclass = get_last_structural_class(ac->schema, - objectclass_element); + objectclass = dsdb_get_last_structural_class(ac->schema, + objectclass_element); if (objectclass == NULL) { ldb_asprintf_errstring(ldb, "Failed to find a structural class for %s", @@ -954,7 +953,8 @@ static int objectclass_do_mod(struct oc_context *ac) * Get the new top-most structural object class and check for * unrelated structural classes */ - objectclass = get_last_structural_class(ac->schema, oc_el_entry); + objectclass = dsdb_get_last_structural_class(ac->schema, + oc_el_entry); if (objectclass == NULL) { ldb_set_errstring(ldb, "objectclass: cannot delete all structural objectclasses!"); @@ -1130,7 +1130,8 @@ static int objectclass_do_rename2(struct oc_context *ac) /* existing entry without a valid object class? */ return ldb_operr(ldb); } - objectclass = get_last_structural_class(ac->schema, oc_el_entry); + objectclass = dsdb_get_last_structural_class(ac->schema, + oc_el_entry); if (objectclass == NULL) { /* existing entry without a valid object class? */ return ldb_operr(ldb); |