From 6683b0d4b6908e54af501701bd20a12990e3e77f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 26 Apr 2010 17:38:56 +0200 Subject: s3-lib: Create a sec_desc_merge and sec_desc_merge_buf function. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source3/rpc_server/srv_spoolss_nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/rpc_server/srv_spoolss_nt.c') diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index db6a6d784a..f96a147a27 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5465,7 +5465,7 @@ static WERROR update_printer_sec(struct policy_handle *handle, } } - new_secdesc_ctr = sec_desc_merge(p->mem_ctx, secdesc_ctr, old_secdesc_ctr); + new_secdesc_ctr = sec_desc_merge_buf(p->mem_ctx, secdesc_ctr, old_secdesc_ctr); if (!new_secdesc_ctr) { result = WERR_NOMEM; goto done; -- cgit