diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-19 14:54:30 +1000 |
| commit | 5631ebaf78fee35880aafe29578b8925c655e5f4 (patch) | |
| tree | 8a9bceb40f3f4839dc1cc8a5ac38982536911d7f /source4/dsdb/samdb | |
| parent | fe95409de76cf64bb65dbc9ce1ed2ddf9774a896 (diff) | |
| parent | b33f4541f6157163f9b22af8607ecefe3953638f (diff) | |
| download | samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.gz samba-5631ebaf78fee35880aafe29578b8925c655e5f4.tar.bz2 samba-5631ebaf78fee35880aafe29578b8925c655e5f4.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit a6146cc14ba950b1911094b1525c7d06b50ecec6)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 1 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/tests/samba3sam.py | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/samdb.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c index 706b7b18b7..968b19c038 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -125,6 +125,7 @@ static int schema_fsmo_init(struct ldb_module *module) "schema_fsmo_init: dsdb_schema load failed: %s", error_string); talloc_free(mem_ctx); + return ret; } /* dsdb_set_schema() steal schema into the ldb_context */ diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py index 7c408d0436..428e6b4d4b 100644 --- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py +++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py @@ -47,7 +47,7 @@ class MapBaseTestCase(TestCaseInTempDir): ldb.add({"dn": "@PARTITION", "partition": [s4.basedn + ":" + s4.url, s3.basedn + ":" + s3.url], - "replicateEntries": ["@SUBCLASSES", "@ATTRIBUTES", "@INDEXLIST"]}) + "replicateEntries": ["@ATTRIBUTES", "@INDEXLIST"]}) def setUp(self): super(MapBaseTestCase, self).setUp() diff --git a/source4/dsdb/samdb/samdb.h b/source4/dsdb/samdb/samdb.h index 3e92671fa0..f24a75fd8f 100644 --- a/source4/dsdb/samdb/samdb.h +++ b/source4/dsdb/samdb/samdb.h @@ -31,6 +31,7 @@ struct event_context; #include "librpc/gen_ndr/security.h" #include "lib/ldb/include/ldb.h" +#include "lib/ldb-samba/ldif_handlers.h" #include "librpc/gen_ndr/samr.h" #include "librpc/gen_ndr/drsuapi.h" #include "librpc/gen_ndr/drsblobs.h" |