diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-12-04 05:32:23 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:08 +0100 |
| commit | 19b00d57f4ea0826bce1b615f23f6e182fdd14af (patch) | |
| tree | 92f1419bf3d1270a051f090475dc7416dfa3c314 | |
| parent | 9bdc1194dadd91aa6368549e6e99ec6d33dd8948 (diff) | |
| download | samba-19b00d57f4ea0826bce1b615f23f6e182fdd14af.tar.gz samba-19b00d57f4ea0826bce1b615f23f6e182fdd14af.tar.bz2 samba-19b00d57f4ea0826bce1b615f23f6e182fdd14af.zip | |
r26284: Rather than just debug, push the error back up the stack as the error
string, if we fail to load the schema.
Andrew Bartlett
(This used to be commit 1dc771f903dd613a4d6494f7fd45d35c4d282a33)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c index b10e3ac203..28853f3e34 100644 --- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -54,7 +54,7 @@ static int schema_fsmo_init(struct ldb_module *module) }; if (dsdb_get_schema(module->ldb)) { - return ldb_next_init(module); + return ldb_next_init(module); } schema_dn = samdb_schema_dn(module->ldb); @@ -96,9 +96,9 @@ static int schema_fsmo_init(struct ldb_module *module) talloc_free(mem_ctx); return ldb_next_init(module); } else if (ret != LDB_SUCCESS) { - ldb_debug_set(module->ldb, LDB_DEBUG_FATAL, - "schema_fsmo_init: failed to search the schema head: %d:%s", - ret, ldb_strerror(ret)); + ldb_asprintf_errstring(module->ldb, + "schema_fsmo_init: failed to search the schema head: %s", + ldb_errstring(module->ldb)); talloc_free(mem_ctx); return ret; } @@ -151,9 +151,9 @@ static int schema_fsmo_init(struct ldb_module *module) "(objectClass=attributeSchema)", NULL, &a_res); if (ret != LDB_SUCCESS) { - ldb_debug_set(module->ldb, LDB_DEBUG_FATAL, - "schema_fsmo_init: failed to search attributeSchema objects: %d:%s", - ret, ldb_strerror(ret)); + ldb_asprintf_errstring(module->ldb, + "schema_fsmo_init: failed to search attributeSchema objects: %s", + ldb_errstring(module->ldb)); talloc_free(mem_ctx); return ret; } @@ -190,9 +190,9 @@ static int schema_fsmo_init(struct ldb_module *module) "(objectClass=classSchema)", NULL, &c_res); if (ret != LDB_SUCCESS) { - ldb_debug_set(module->ldb, LDB_DEBUG_FATAL, - "schema_fsmo_init: failed to search classSchema objects: %d:%s", - ret, ldb_strerror(ret)); + ldb_asprintf_errstring(module->ldb, + "schema_fsmo_init: failed to search classSchema objects: %s", + ldb_errstring(module->ldb)); talloc_free(mem_ctx); return ret; } |