git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
120d472
)
s3:idmap_ad: untangle two assignments from checks
author
Michael Adam
<obnox@samba.org>
Tue, 22 Jun 2010 12:13:55 +0000
(14:13 +0200)
committer
Michael Adam
<obnox@samba.org>
Wed, 23 Jun 2010 10:40:40 +0000
(12:40 +0200)
source3/winbindd/idmap_ad.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/idmap_ad.c
b/source3/winbindd/idmap_ad.c
index 0df74f068634e9cf3e0f5ea36a6382aa8290eb2e..d2581d1a9e90032fdb6cec1dd374d189140afc78 100644
(file)
--- 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;
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;
}
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;
DEBUG(0, ("Out of memory!\n"));
talloc_free(ctx);
return NT_STATUS_NO_MEMORY;