diff options
| author | Andreas Schneider <asn@samba.org> | 2010-04-26 17:38:56 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-04 19:37:39 +0200 |
| commit | 6683b0d4b6908e54af501701bd20a12990e3e77f (patch) | |
| tree | ede58e0b757a8d517e89c0d785fdf2fcdc994fe1 /source3/rpc_server | |
| parent | efb1aea909fc088cc08b6d892d7dd1031fb79fdf (diff) | |
| download | samba-6683b0d4b6908e54af501701bd20a12990e3e77f.tar.gz samba-6683b0d4b6908e54af501701bd20a12990e3e77f.tar.bz2 samba-6683b0d4b6908e54af501701bd20a12990e3e77f.zip | |
s3-lib: Create a sec_desc_merge and sec_desc_merge_buf function.
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |