Author: metze Date: 2006-08-05 06:35:32 +0000 (Sat, 05 Aug 2006) New Revision: 17415
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17415 Log: 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 Modified: branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c 2006-08-05 06:20:55 UTC (rev 17414) +++ branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c 2006-08-05 06:35:32 UTC (rev 17415) @@ -245,11 +245,8 @@ { 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,12 +267,7 @@ { 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) { return -1; @@ -286,7 +278,7 @@ 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;
