diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-08-05 06:35:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:23 -0500 |
| commit | 0f6c285fa80a4bcbf700a107f8103ce299f18ae9 (patch) | |
| tree | 7a013b3fc1ca9a73cf6991bf642de408a2016b0a | |
| parent | 3455998edc03268b7b73c80cf1630127e5a3f8df (diff) | |
| download | samba-0f6c285fa80a4bcbf700a107f8103ce299f18ae9.tar.gz samba-0f6c285fa80a4bcbf700a107f8103ce299f18ae9.tar.xz samba-0f6c285fa80a4bcbf700a107f8103ce299f18ae9.zip | |
r17415: the ldif handlers can't do search as this now blocks foerever
because the handlers are called within the async callbacks
in side the main search.
Also it makes no sense to give the sddl encoder the sid of the primary
domain when we need a description of a real security_descriptor,
this only makes sense for the defaultSecurityDescriptor...
metze
(This used to be commit 92f133f1ef1cd4064c9b328244d3be3351c5bab9)
| -rw-r--r-- | source4/lib/ldb/samba/ldif_handlers.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source4/lib/ldb/samba/ldif_handlers.c b/source4/lib/ldb/samba/ldif_handlers.c index 8228f6e51a2..69b3c2ae2a6 100644 --- a/source4/lib/ldb/samba/ldif_handlers.c +++ b/source4/lib/ldb/samba/ldif_handlers.c @@ -245,11 +245,8 @@ static int ldif_read_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ctx { struct security_descriptor *sd; NTSTATUS status; - const struct dom_sid *domain_sid = samdb_domain_sid(ldb); - if (domain_sid == NULL) { - return ldb_handler_copy(ldb, mem_ctx, in, out); - } - sd = sddl_decode(mem_ctx, (const char *)in->data, domain_sid); + + sd = sddl_decode(mem_ctx, (const char *)in->data, NULL); if (sd == NULL) { return -1; } @@ -270,11 +267,6 @@ static int ldif_write_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ct { struct security_descriptor *sd; NTSTATUS status; - const struct dom_sid *domain_sid = samdb_domain_sid(ldb); - - if (domain_sid == NULL) { - return ldb_handler_copy(ldb, mem_ctx, in, out); - } sd = talloc(mem_ctx, struct security_descriptor); if (sd == NULL) { @@ -286,7 +278,7 @@ static int ldif_write_ntSecurityDescriptor(struct ldb_context *ldb, void *mem_ct talloc_free(sd); return -1; } - out->data = (uint8_t *)sddl_encode(mem_ctx, sd, domain_sid); + out->data = (uint8_t *)sddl_encode(mem_ctx, sd, NULL); talloc_free(sd); if (out->data == NULL) { return -1; |