diff options
| author | Günther Deschner <gd@samba.org> | 2009-11-20 16:34:00 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-11-23 11:44:43 +0100 |
| commit | d464151f3b47c675664f464b1645ca85de663655 (patch) | |
| tree | 45826328415c6d76e2a282658234c81bcf9b946d /source3/rpc_server | |
| parent | 366946f29b58a6efa7acbfe2a74b2ddbad4d32a2 (diff) | |
| download | samba-d464151f3b47c675664f464b1645ca85de663655.tar.gz samba-d464151f3b47c675664f464b1645ca85de663655.tar.bz2 samba-d464151f3b47c675664f464b1645ca85de663655.zip | |
s3-spoolss: fix spoolss_EnumPrinterKey client and server code.
Guenther
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 682a59b5a8..525e972a6b 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -9335,7 +9335,7 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p, WERROR result = WERR_BADFILE; int i; const char **array = NULL; - + DATA_BLOB blob; DEBUG(4,("_spoolss_EnumPrinterKey\n")); @@ -9364,7 +9364,9 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p, goto done; } - *r->out.needed = 4; + /* two byte termination (a multisz) */ + + *r->out.needed = 2; array = talloc_zero_array(r->out.key_buffer, const char *, num_keys + 1); if (!array) { @@ -9373,6 +9375,10 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p, } for (i=0; i < num_keys; i++) { + + DEBUG(10,("_spoolss_EnumPrinterKey: adding keyname: %s\n", + keynames[i])); + array[i] = talloc_strdup(array, keynames[i]); if (!array[i]) { result = WERR_NOMEM; @@ -9389,12 +9395,21 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p, result = WERR_OK; - *r->out.key_buffer = array; + if (!push_reg_multi_sz(p->mem_ctx, &blob, array)) { + result = WERR_NOMEM; + goto done; + } + + if (r->in.offered == blob.length) { + memcpy(r->out.key_buffer, blob.data, blob.length); + } done: if (!W_ERROR_IS_OK(result)) { TALLOC_FREE(array); - ZERO_STRUCTP(r->out.key_buffer); + if (!W_ERROR_EQUAL(result, WERR_MORE_DATA)) { + *r->out.needed = 0; + } } free_a_printer(&printer, 2); |