diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
| commit | f47093baf0a91c717297ebcbd1d3416d788ba6aa (patch) | |
| tree | e1033c9b06c5067c8bbae54ab26c49050db0886e /source4/dsdb/samdb/ldb_modules/schema_fsmo.c | |
| parent | fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b (diff) | |
| parent | 0efa783849ff4bd449cdcc5f643f0101d48746bb (diff) | |
| download | samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.gz samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.bz2 samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/schema_fsmo.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c index 559c91bd2d..f9dd131fd4 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -59,6 +59,7 @@ static int schema_fsmo_init(struct ldb_module *module) schema_dn = samdb_schema_dn(module->ldb); if (!schema_dn) { + ldb_reset_err_string(module->ldb); ldb_debug(module->ldb, LDB_DEBUG_WARNING, "schema_fsmo_init: no schema dn present: (skip schema loading)\n"); return ldb_next_init(module); @@ -91,6 +92,7 @@ static int schema_fsmo_init(struct ldb_module *module) NULL, schema_attrs, &schema_res); if (ret == LDB_ERR_NO_SUCH_OBJECT) { + ldb_reset_err_string(module->ldb); ldb_debug(module->ldb, LDB_DEBUG_WARNING, "schema_fsmo_init: no schema head present: (skip schema loading)\n"); talloc_free(mem_ctx); |