git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8134926
)
s4:dsdb/descriptor: remove some unnecessary nesting
author
Stefan Metzmacher
<metze@samba.org>
Fri, 23 Nov 2012 08:20:50 +0000
(09:20 +0100)
committer
Michael Adam
<obnox@samba.org>
Fri, 30 Nov 2012 16:17:20 +0000
(17:17 +0100)
sd == NULL is checked before.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
source4/dsdb/samdb/ldb_modules/descriptor.c
patch
|
blob
|
history
diff --git
a/source4/dsdb/samdb/ldb_modules/descriptor.c
b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 21a559f678669f9d3ab9d04c280b3a4d53e16ca5..9a4f3d3e04775ef5d183184546c70b9061874cda 100644
(file)
--- a/
source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/
source4/dsdb/samdb/ldb_modules/descriptor.c
@@
-583,16
+583,14
@@
static int descriptor_add(struct ldb_module *module, struct ldb_request *req)
if (msg == NULL) {
return ldb_oom(ldb);
}
- if (sd != NULL) {
- if (sd_element != NULL) {
- sd_element->values[0] = *sd;
- } else {
- ret = ldb_msg_add_steal_value(msg,
- "nTSecurityDescriptor",
- sd);
- if (ret != LDB_SUCCESS) {
- return ret;
- }
+ if (sd_element != NULL) {
+ sd_element->values[0] = *sd;
+ } else {
+ ret = ldb_msg_add_steal_value(msg,
+ "nTSecurityDescriptor",
+ sd);
+ if (ret != LDB_SUCCESS) {
+ return ret;
}
}