diff options
| author | Gerald Carter <jerry@samba.org> | 2002-08-16 15:36:37 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-08-16 15:36:37 +0000 |
| commit | 4ed429481c6aa2517b8b1615f95900d7db372cd6 (patch) | |
| tree | 2cf8802fff6846a328065b3b468112101a9207a9 /source3/registry/reg_printing.c | |
| parent | b84315e2d583ad4bf06b5e43c3c1046a751326b6 (diff) | |
| download | samba-4ed429481c6aa2517b8b1615f95900d7db372cd6.tar.gz samba-4ed429481c6aa2517b8b1615f95900d7db372cd6.tar.bz2 samba-4ed429481c6aa2517b8b1615f95900d7db372cd6.zip | |
Fairly large change to printing code.
* removed support for PHANTOM_DEVMODE printer data
* s/NT_PRINTER_PARAM/REGISTRY_VALUE/g - This was a good bit
of work. Everything seems stable, but is not complete.
* support for printer data keys other than PrinterDriverData
in the store and fetch routines. Still needs to be plugged
into the XxxPrinterDataEx() calls.
Tested against NT4.0 & 2k. Like I said, it's not done, but doesn't
crash so it shouldn't upset anyone (unless you're trying to build
a Samba printer server off of HEAD). More work to come. Should
settle by Monday.
jerry
(This used to be commit 7ba7c04c0e961618c82c2112b9627af114c6cc42)
Diffstat (limited to 'source3/registry/reg_printing.c')
| -rw-r--r-- | source3/registry/reg_printing.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c index 3fd3680489..8f53fe9ea5 100644 --- a/source3/registry/reg_printing.c +++ b/source3/registry/reg_printing.c @@ -492,7 +492,7 @@ static int print_subpath_printers( char *key, REGSUBKEY_CTR *subkeys ) free_a_printer( &printer, 2 ); - regsubkey_ctr_addkey( subkeys, "PrinterDriverData" ); + regsubkey_ctr_addkey( subkeys, SPOOL_PRINTERDATA_KEY ); } /* no other subkeys below here */ @@ -620,7 +620,7 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val ) /* here should be no more path components here */ - if ( new_path || strcmp(base, "PrinterDriverData") ) + if ( new_path || strcmp(base, SPOOL_PRINTERDATA_KEY) ) goto done; /* now enumerate the PrinterDriverData key */ @@ -632,10 +632,12 @@ static int print_subpath_values_printers( char *key, REGVAL_CTR *val ) /* iterate over all printer data and fill the regval container */ +#if 0 /* JERRY */ for ( i=0; get_specific_param_by_index(*printer, 2, i, valuename, &data, &type, &data_len); i++ ) { regval_ctr_addvalue( val, valuename, type, data, data_len ); } +#endif free_a_printer( &printer, 2 ); |