svn commit: samba r8568 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .

tridge at samba.org tridge at samba.org
Tue Jul 19 02:08:39 GMT 2005


Author: tridge
Date: 2005-07-19 02:08:38 +0000 (Tue, 19 Jul 2005)
New Revision: 8568

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8568

Log:
change missing templates to warnings, so that provisioning with an existing db
doesn't print lots of fatal errors

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c	2005-07-19 01:33:38 UTC (rev 8567)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c	2005-07-19 02:08:38 UTC (rev 8568)
@@ -336,7 +336,7 @@
 	/* 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 @@
 	}
 
 	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 @@
 	}
 
 	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;
 	}
 



More information about the samba-cvs mailing list