From f5b66ea630331a0bc87d8757790d989fb413de3a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 22 Jun 2010 14:13:55 +0200 Subject: [PATCH] s3:idmap_ad: untangle two assignments from checks --- source3/winbindd/idmap_ad.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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; -- 2.34.1