svn commit: samba r19308 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules libnet

[abartlet at samba.org]

Author: abartlet
Date: 2006-10-16 01:19:01 +0000 (Mon, 16 Oct 2006)
New Revision: 19308

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

Log:
Merge samsync fixes from SAMBA_4_0_RELEASE

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
   branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-10-16 01:09:10 UTC (rev 19307)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-10-16 01:19:01 UTC (rev 19308)
@@ -102,7 +102,7 @@
 	
 	sambaPassword = ldb_msg_find_attr_as_string(msg, "sambaPassword", NULL);
 	if (sambaPassword == NULL) { /* impossible, what happened ?! */
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
 
 	if (is_mod) {
@@ -634,6 +634,20 @@
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
 
+	if (sambaAttr && sambaAttr->num_values == 0) {
+		ldb_set_errstring(module->ldb, "sambaPassword must have a value!\n");
+		return LDB_ERR_CONSTRAINT_VIOLATION;
+	}
+
+	if (ntAttr && (ntAttr->num_values == 0)) {
+		ldb_set_errstring(module->ldb, "lmPwdHash must have a value!\n");
+		return LDB_ERR_CONSTRAINT_VIOLATION;
+	}
+	if (lmAttr && (lmAttr->num_values == 0)) {
+		ldb_set_errstring(module->ldb, "lmPwdHash must have a value!\n");
+		return LDB_ERR_CONSTRAINT_VIOLATION;
+	}
+
 	h = ph_init_handle(req, module, PH_ADD);
 	if (!h) {
 		return LDB_ERR_OPERATIONS_ERROR;

Modified: branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c	2006-10-16 01:09:10 UTC (rev 19307)
+++ branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c	2006-10-16 01:19:01 UTC (rev 19308)
@@ -128,11 +128,14 @@
 	}
 
 	if (database == SAM_DATABASE_DOMAIN) {
+		const struct ldb_dn *partitions_basedn;
 		const char *domain_attrs[] =  {"nETBIOSName", "nCName", NULL};
 		struct ldb_message **msgs_domain;
 		int ret_domain;
 
-		ret_domain = gendb_search(state->sam_ldb, mem_ctx, NULL, &msgs_domain, domain_attrs,
+		partitions_basedn = samdb_partitions_dn(state->sam_ldb, mem_ctx);
+
+		ret_domain = gendb_search(state->sam_ldb, mem_ctx, partitions_basedn, &msgs_domain, domain_attrs,
 					  "(&(&(nETBIOSName=%s)(objectclass=crossRef))(ncName=*))", 
 					  domain_name);
 		if (ret_domain == -1) {
@@ -354,21 +357,23 @@
 		return NT_STATUS_NO_MEMORY; 
 	} 
 	
-	/* Passwords.  Ensure there is no plaintext stored against
-	 * this entry, as we only have hashes */
-	samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
-			     "sambaPassword"); 
+	if (!add) {
+		/* Passwords.  Ensure there is no plaintext stored against
+		 * this entry, as we only have hashes */
+		samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
+				     "sambaPassword"); 
+	}
 	if (user->lm_password_present) {
 		samdb_msg_add_hash(state->sam_ldb, mem_ctx, msg,  
 				   "lmPwdHash", &user->lmpassword);
-	} else {
+	} else if (!add) {
 		samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
 				     "lmPwdHash"); 
 	}
 	if (user->nt_password_present) {
 		samdb_msg_add_hash(state->sam_ldb, mem_ctx, msg,  
 				   "ntPwdHash", &user->ntpassword);
-	} else {
+	} else if (!add) {
 		samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg,  
 				     "ntPwdHash"); 
 	}