diff options
author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:28:53 -0500 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:28:53 -0500 |
commit | 65229e966119f0b1537d258854a54105f32ae399 (patch) | |
tree | c6be94324703d914228290a8354021c2691f3ebe /source/registry/reg_printing.c | |
parent | 95e77b14b5440a9ced8fdf6dc803b90c9518b8e0 (diff) | |
download | samba-65229e966119f0b1537d258854a54105f32ae399.tar.gz |
[GLUE] Rsync SAMBA_3_0 SVN r25598 in order to create the v3-0-test branch.samba-misc-tags/initial-v3-0-test
Diffstat (limited to 'source/registry/reg_printing.c')
-rw-r--r-- | source/registry/reg_printing.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/registry/reg_printing.c b/source/registry/reg_printing.c index f33d0ab7555..10cfce604ef 100644 --- a/source/registry/reg_printing.c +++ b/source/registry/reg_printing.c @@ -449,11 +449,8 @@ static void fill_in_printer_values( NT_PRINTER_INFO_LEVEL_2 *info2, REGVAL_CTR * /* stream the printer security descriptor */ - 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 ) ) { + if ( info2->secdesc_buf && info2->secdesc_buf->len ) { + if ( sec_io_desc("sec_desc", &info2->secdesc_buf->sec, &prs, 0 ) ) { offset = prs_offset( &prs ); regval_ctr_addvalue( values, "Security", REG_BINARY, prs_data_p(&prs), offset ); } @@ -481,7 +478,7 @@ static int key_printers_fetch_values( const char *key, REGVAL_CTR *values ) /* top level key values stored in the registry has no values */ if ( !printers_key ) { - /* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' key */ + /* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' ket */ return regdb_fetch_values( KEY_WINNT_PRINTERS, values ); } @@ -1242,7 +1239,7 @@ REGISTRY_OPS printing_ops = { regprint_fetch_reg_values, regprint_store_reg_keys, regprint_store_reg_values, - NULL, NULL, NULL + NULL }; |