From: Michael Adam <obnox@samba.org>
Date: Tue, 22 Jun 2010 12:13:55 +0000 (+0200)
Subject: s3:idmap_ad: untangle two assignments from checks
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=f5b66ea630331a0bc87d8757790d989fb413de3a

s3:idmap_ad: untangle two assignments from checks
---

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 0df74f068634..d2581d1a9e90 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -197,12 +197,14 @@ static NTSTATUS idmap_ad_initialize(struct idmap_domain *dom,
 	char *config_option;
 	const char *schema_mode = NULL;	
 
-	if ( (ctx = TALLOC_ZERO_P(dom, struct idmap_ad_context)) == NULL ) {
+	ctx = TALLOC_ZERO_P(dom, struct idmap_ad_context);
+	if (ctx == NULL) {
 		DEBUG(0, ("Out of memory!\n"));
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	if ( (config_option = talloc_asprintf(ctx, "idmap config %s", dom->name)) == NULL ) {
+	config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
+	if (config_option == NULL) {
 		DEBUG(0, ("Out of memory!\n"));
 		talloc_free(ctx);
 		return NT_STATUS_NO_MEMORY;