svn commit: samba r12894 - in branches/SAMBA_4_0/source/libnet: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-13 04:36:58 +0000 (Fri, 13 Jan 2006)
New Revision: 12894

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

Log:
Add more detail to error messages.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c	2006-01-13 04:30:18 UTC (rev 12893)
+++ branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c	2006-01-13 04:36:58 UTC (rev 12894)
@@ -228,6 +228,12 @@
 			   ldap_encode_ndr_dom_sid(mem_ctx, dom_sid_add_rid(mem_ctx, state->dom_sid[database], rid))); 
 
 	if (ret == -1) {
+		*error_string = talloc_asprintf(mem_ctx, "gendb_search for user %s failed: %s", 
+						dom_sid_string(mem_ctx, 
+							       dom_sid_add_rid(mem_ctx, 
+									       state->dom_sid[database], 
+									       rid)),
+						ldb_errstring(state->sam_ldb));
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	} else if (ret == 0) {
 		add = True;
@@ -346,15 +352,17 @@
 
 		ret = samdb_add(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
-			*error_string = talloc_asprintf(mem_ctx, "Failed to create user record %s",
-							ldb_dn_linearize(mem_ctx, msg->dn));
+			*error_string = talloc_asprintf(mem_ctx, "Failed to create user record %s: %s",
+							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
 	} else {
 		ret = samdb_replace(state->sam_ldb, mem_ctx, msg);
 		if (ret != 0) {
-			*error_string = talloc_asprintf(mem_ctx, "Failed to modify user record %s",
-							ldb_dn_linearize(mem_ctx, msg->dn));
+			*error_string = talloc_asprintf(mem_ctx, "Failed to modify user record %s: %s",
+							ldb_dn_linearize(mem_ctx, msg->dn),
+							ldb_errstring(state->sam_ldb));
 			return NT_STATUS_INTERNAL_DB_CORRUPTION;
 		}
 	}