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

[abartlet at samba.org]

Author: abartlet
Date: 2007-11-14 03:52:39 +0000 (Wed, 14 Nov 2007)
New Revision: 25949

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

Log:
Make error messages clearer and more correct.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
   branches/SAMBA_4_0/source/dsdb/samdb/samdb.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	2007-11-14 03:51:02 UTC (rev 25948)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c	2007-11-14 03:52:39 UTC (rev 25949)
@@ -475,7 +475,7 @@
 	/* build the new msg */
 	msg2 = ldb_msg_copy(mem_ctx, msg);
 	if (!msg2) {
-		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_group_object: ldb_msg_copy failed!\n");
+		ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_user_or_computer_object: ldb_msg_copy failed!\n");
 		talloc_free(mem_ctx);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
@@ -523,7 +523,7 @@
 	ret = samdb_search_for_parent_domain(module->ldb, mem_ctx, msg2->dn, &dom_dn, &errstr);
 	if (ret != LDB_SUCCESS) {
 		ldb_asprintf_errstring(module->ldb,
-				       "samldb_fill_group_object: %s", errstr);
+				       "samldb_fill_user_or_computer_object: %s", errstr);
 		return ret;
 	}
 

Modified: branches/SAMBA_4_0/source/dsdb/samdb/samdb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2007-11-14 03:51:02 UTC (rev 25948)
+++ branches/SAMBA_4_0/source/dsdb/samdb/samdb.c	2007-11-14 03:52:39 UTC (rev 25949)
@@ -1521,15 +1521,16 @@
 	}
 
 	if (ret != LDB_SUCCESS) {
-		*errstring = talloc_asprintf(mem_ctx, "Error searching for parent domain of %s: %s",
-					      ldb_dn_get_linearized(sdn),
-					      ldb_errstring(ldb));
+		*errstring = talloc_asprintf(mem_ctx, "Error searching for parent domain of %s, failed searching for %s: %s",
+					     ldb_dn_get_linearized(dn),
+					     ldb_dn_get_linearized(sdn),
+					     ldb_errstring(ldb));
 		talloc_free(local_ctx);
 		return ret;
 	}
 	if (res->count != 1) {
 		*errstring = talloc_asprintf(mem_ctx, "Invalid dn (%s), not child of a domain object",
-					     ldb_dn_get_linearized(sdn));
+					     ldb_dn_get_linearized(dn));
 		talloc_free(local_ctx);
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}