summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-04-26 17:38:56 +0200
committerGünther Deschner <gd@samba.org>2010-05-04 19:37:39 +0200
commit6683b0d4b6908e54af501701bd20a12990e3e77f (patch)
treeede58e0b757a8d517e89c0d785fdf2fcdc994fe1 /source3/printing
parentefb1aea909fc088cc08b6d892d7dd1031fb79fdf (diff)
downloadsamba-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/printing')
-rw-r--r--source3/printing/nt_printing.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index ba667c3251..9ac74d63fd 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -402,7 +402,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key,
return 0;
}
- if ( !(sd_store = sec_desc_merge( ctx, sd_new, sd_orig )) ) {
+ if ( !(sd_store = sec_desc_merge_buf( ctx, sd_new, sd_orig )) ) {
DEBUG(0,("sec_desc_upg_fn: Failed to update sec_desc for %s\n", key.dptr ));
return 0;
}