summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-17 15:21:06 +0100
committerGünther Deschner <gd@samba.org>2009-03-17 18:39:29 +0100
commit96998f03584608e3cb30a61120d497b45d0af001 (patch)
treec764e096da7b3822ee23890e5c9548f429432720
parentd759f9961a30c5dc9920f620b783ffa58daf9b03 (diff)
downloadsamba-96998f03584608e3cb30a61120d497b45d0af001.tar.gz
samba-96998f03584608e3cb30a61120d497b45d0af001.tar.bz2
samba-96998f03584608e3cb30a61120d497b45d0af001.zip
s3-spoolss/registry: use marshall_sec_desc in fill_in_printer_values().
Guenther
-rw-r--r--source3/registry/reg_backend_printing.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c
index 192bc78e09..aa7b8ae49c 100644
--- a/source3/registry/reg_backend_printing.c
+++ b/source3/registry/reg_backend_printing.c
@@ -458,14 +458,19 @@ static void fill_in_printer_values( NT_PRINTER_INFO_LEVEL_2 *info2, REGVAL_CTR *
prs_set_offset( &prs, 0 );
/* stream the printer security descriptor */
-
- if ( info2->secdesc_buf &&
- info2->secdesc_buf->sd &&
- info2->secdesc_buf->sd_size )
+
+ if (info2->secdesc_buf &&
+ info2->secdesc_buf->sd &&
+ info2->secdesc_buf->sd_size)
{
- if ( sec_io_desc("sec_desc", &info2->secdesc_buf->sd, &prs, 0 ) ) {
- offset = prs_offset( &prs );
- regval_ctr_addvalue( values, "Security", REG_BINARY, prs_data_p(&prs), offset );
+ NTSTATUS status;
+ DATA_BLOB blob;
+
+ status = marshall_sec_desc(values, info2->secdesc_buf->sd,
+ &blob.data, &blob.length);
+ if (NT_STATUS_IS_OK(status)) {
+ regval_ctr_addvalue(values, "Security", REG_BINARY,
+ (const char *)blob.data, blob.length);
}
}