From: Michael Adam <obnox@samba.org>
Date: Tue, 5 Jan 2010 17:22:25 +0000 (+0100)
Subject: s3:pdb_ldap:init_sam_from_ldap: untangle an assignment from the check
X-Git-Tag: release-4-0-0alpha11~181
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=71e3de6c9fa50ce0035092da6b1a27017ee1bb56

s3:pdb_ldap:init_sam_from_ldap: untangle an assignment from the check

to enhance readability and denbuggability.

Michael
---

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 90ac8e5ffa7..1ab21e1b4d7 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -915,9 +915,9 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
 
 		pwHistLen = MIN(pwHistLen, MAX_PW_HISTORY_LEN);
 
-		if ((pwhist = TALLOC_ARRAY(ctx, uint8,
-					pwHistLen * PW_HISTORY_ENTRY_LEN)) ==
-				NULL){
+		pwhist = TALLOC_ARRAY(ctx, uint8,
+				      pwHistLen * PW_HISTORY_ENTRY_LEN);
+		if (pwhist == NULL) {
 			DEBUG(0, ("init_sam_from_ldap: talloc failed!\n"));
 			goto fn_exit;
 		}