summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-11-23 10:58:49 +0100
committerMichael Adam <obnox@samba.org>2012-11-30 17:17:20 +0100
commitf67f469ce101e48301de790b5c31f8d4e712e0ea (patch)
tree8cfe7d1dc22ae43bcf5c3f264707b5213095b1d7 /source4
parent5aa7dbe546ff18e521e72c0af713a2509201e00d (diff)
downloadsamba-f67f469ce101e48301de790b5c31f8d4e712e0ea.tar.gz
samba-f67f469ce101e48301de790b5c31f8d4e712e0ea.tar.bz2
samba-f67f469ce101e48301de790b5c31f8d4e712e0ea.zip
s4:dsdb/descriptor: the old nTSecurityDescriptor is always expected there on modify
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/descriptor.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/descriptor.c b/source4/dsdb/samdb/ldb_modules/descriptor.c
index 4b4704b664..96bc356485 100644
--- a/source4/dsdb/samdb/ldb_modules/descriptor.c
+++ b/source4/dsdb/samdb/ldb_modules/descriptor.c
@@ -714,6 +714,9 @@ static int descriptor_modify(struct ldb_module *module, struct ldb_request *req)
}
old_sd = ldb_msg_find_ldb_val(current_res->msgs[0], "nTSecurityDescriptor");
+ if (old_sd == NULL) {
+ return ldb_operr(ldb);
+ }
sd = get_new_descriptor(module, dn, req,
objectclass, parent_sd,