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

[abartlet at samba.org]

Author: abartlet
Date: 2006-03-07 03:30:59 +0000 (Tue, 07 Mar 2006)
New Revision: 13909

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

Log:
Make this code clearer.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.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-03-07 03:24:29 UTC (rev 13908)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-03-07 03:30:59 UTC (rev 13909)
@@ -561,7 +561,8 @@
 	}
 
 	/* If the original caller did anything with pwdLastSet then skip this.  It could be an incoming samsync */
-	if ((attribute = ldb_msg_find_element(msg, "pwdLastSet")) == NULL ) {
+	attribute = ldb_msg_find_element(msg, "pwdLastSet");
+	if (attribute == NULL) {
 		/* Update the password last set time */
 		unix_to_nt_time(&now_nt, now);
 		CHECK_RET(ldb_msg_add_empty(modify_msg, "pwdLastSet", LDB_FLAG_MOD_REPLACE));
@@ -569,7 +570,8 @@
 	}
 
 	/* If the original caller did anything with "msDS-KeyVersionNumber" then skip this.  It could be an incoming samsync */
-	if ((attribute = ldb_msg_find_element(msg, "msDS-KeyVersionNumber")) == NULL ) {
+	attribute = ldb_msg_find_element(msg, "msDS-KeyVersionNumber");
+	if (attribute == NULL) {
 		if (kvno == 0) {
 			CHECK_RET(ldb_msg_add_empty(modify_msg, "msDS-KeyVersionNumber",
 						    LDB_FLAG_MOD_REPLACE));