summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-19 02:08:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:39 -0500
commit139e43bf9c0ddcb7122882db1cd8c569a71bafad (patch)
tree44cf3990ac7b2d8ad6315c725f1c254aa0505a2d
parentd2d5d71f34800fa74132a4f013b80eae3c9d6124 (diff)
downloadsamba-139e43bf9c0ddcb7122882db1cd8c569a71bafad.tar.gz
samba-139e43bf9c0ddcb7122882db1cd8c569a71bafad.tar.bz2
samba-139e43bf9c0ddcb7122882db1cd8c569a71bafad.zip
r8568: change missing templates to warnings, so that provisioning with an existing db
doesn't print lots of fatal errors (This used to be commit d8d47bb18fbb467e253e99c4281578d6e4762de3)
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 0c43b8dc06..04acbeaedf 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -336,7 +336,7 @@ static int samldb_copy_template(struct ldb_module *module, struct ldb_message *m
/* pull the template record */
ret = ldb_search(module->ldb, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res);
if (ret != 1) {
- ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb: ERROR: template '%s' matched %d records\n", filter, ret);
+ ldb_debug(module->ldb, LDB_DEBUG_WARNING, "samldb: ERROR: template '%s' matched %d records\n", filter, ret);
return -1;
}
t = res[0];
@@ -395,7 +395,7 @@ static struct ldb_message *samldb_fill_group_object(struct ldb_module *module, c
}
if (samldb_copy_template(module, msg2, "(&(name=TemplateGroup)(objectclass=groupTemplate))") != 0) {
- ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_group_object: Error copying template!\n");
+ ldb_debug(module->ldb, LDB_DEBUG_WARNING, "samldb_fill_group_object: Error copying template!\n");
return NULL;
}
@@ -475,7 +475,7 @@ static struct ldb_message *samldb_fill_user_or_computer_object(struct ldb_module
}
if (samldb_copy_template(module, msg2, "(&(name=TemplateUser)(objectclass=userTemplate))") != 0) {
- ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_user_or_computer_object: Error copying template!\n");
+ ldb_debug(module->ldb, LDB_DEBUG_WARNING, "samldb_fill_user_or_computer_object: Error copying template!\n");
return NULL;
}