[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Tue Dec 7 08:06:02 MST 2010


The branch, master has been updated
       via  055a3e0 s4:libnet_samsync_ldb.c - simplify a talloc steal call
       via  a07d208 s4:libnet_samsync_ldb.c - introduce an error message on failed domain synchronisation
      from  d911897 s3:registry: improve debug messages about regdb refcount changes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 055a3e0fae1c59567057239d5d6e3f20cf962c33
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Dec 7 14:58:52 2010 +0100

    s4:libnet_samsync_ldb.c - simplify a talloc steal call
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Tue Dec  7 16:05:30 CET 2010 on sn-devel-104

commit a07d20821ac9d09831bac10eca91ae8cb7b5106f
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Dec 7 14:57:17 2010 +0100

    s4:libnet_samsync_ldb.c - introduce an error message on failed domain synchronisation

-----------------------------------------------------------------------

Summary of changes:
 source4/libnet/libnet_samsync_ldb.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 9626341..07e085e 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -222,9 +222,12 @@ static NTSTATUS samsync_ldb_handle_domain(TALLOC_CTX *mem_ctx,
 	/* TODO: Account lockout, password properties */
 	
 	ret = dsdb_replace(state->sam_ldb, msg, 0);
-
-	if (ret) {
-		return NT_STATUS_INTERNAL_ERROR;
+	if (ret != LDB_SUCCESS) {
+		*error_string = talloc_asprintf(mem_ctx,
+						"Failed to modify domain record %s: %s",
+						ldb_dn_get_linearized(msg->dn),
+						ldb_errstring(state->sam_ldb));
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 	return NT_STATUS_OK;
 }
@@ -308,8 +311,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 			
 			/* Try to put things in the same location as the remote server */
 		} else if (add) {
-			msg->dn = remote_msgs[0]->dn;
-			talloc_steal(msg, remote_msgs[0]->dn);
+			msg->dn = talloc_steal(msg, remote_msgs[0]->dn);
 		}
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list