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/printing/nt_printing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/printing') 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; } -- cgit