summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-06-22 14:13:55 +0200
committerMichael Adam <obnox@samba.org>2010-08-14 02:10:56 +0200
commit9897647584f042e7227f3fdbf5a9a5b91a9ce83e (patch)
treeeeb956004e645537c621aaad415ba7c8047f1385
parent264910b06f71ed76df8ce432d320c33ec9dac42f (diff)
downloadsamba-9897647584f042e7227f3fdbf5a9a5b91a9ce83e.tar.gz
samba-9897647584f042e7227f3fdbf5a9a5b91a9ce83e.tar.bz2
samba-9897647584f042e7227f3fdbf5a9a5b91a9ce83e.zip
s3:idmap_ad: untangle two assignments from checks
-rw-r--r--source3/winbindd/idmap_ad.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 782578e2e3..a690fb2b36 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -202,12 +202,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;