git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c61c93
)
s3:winbind:idmap_tdb2_set_mapping: untangle assignment from check
author
Michael Adam
<obnox@samba.org>
Tue, 18 May 2010 13:25:53 +0000
(15:25 +0200)
committer
Michael Adam
<obnox@samba.org>
Thu, 20 May 2010 07:18:59 +0000
(09:18 +0200)
source3/winbindd/idmap_tdb2.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/idmap_tdb2.c
b/source3/winbindd/idmap_tdb2.c
index 0925b841ee227be36208b9d50e3406124b8d1989..f39969d1f84e295342b57be9e56ac4f83943ed25 100644
(file)
--- a/
source3/winbindd/idmap_tdb2.c
+++ b/
source3/winbindd/idmap_tdb2.c
@@
-906,7
+906,8
@@
static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain *dom, const struct id
goto done;
}
goto done;
}
- if (!(ksidstr = sid_string_talloc(ctx, map->sid))) {
+ ksidstr = sid_string_talloc(ctx, map->sid);
+ if (ksidstr == NULL) {
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
goto done;
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
goto done;