diff options
| author | Günther Deschner <gd@samba.org> | 2016-09-01 19:55:40 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-09-07 16:26:48 +0200 |
| commit | d58fb556d9ac778dfe45e109d1d843f6f0254bdb (patch) | |
| tree | fd42eac6fc0d7ba1ce49ca323a0ded317bee7ef9 /source3/rpc_server | |
| parent | 398903202574284f810e954341a05e9bd4916c72 (diff) | |
| download | samba-d58fb556d9ac778dfe45e109d1d843f6f0254bdb.tar.gz | |
s3-spoolss: fix _spoolss_GetPrinterDataEx by moving the keyname lengthcheck.
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Wed Sep 7 03:00:14 CEST 2016 on sn-devel-144
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12245
(cherry picked from commit d8b57e3828eac084ad302a90b33c35ff4e918e5a)
Autobuild-User(v4-5-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-5-test): Wed Sep 7 16:26:48 CEST 2016 on sn-devel-144
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 2778ba8ca87..e30c70b4b3f 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -9729,12 +9729,6 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, goto done; } - /* check to see if the keyname is valid */ - if (!strlen(r->in.key_name)) { - result = WERR_INVALID_PARAM; - goto done; - } - /* Is the handle to a printer or to the server? */ if (Printer->printer_type == SPLHND_SERVER) { @@ -9765,6 +9759,12 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, goto done; } + /* check to see if the keyname is valid */ + if (!strlen(r->in.key_name)) { + result = WERR_INVALID_PARAM; + goto done; + } + if (!get_printer_snum(p, r->in.handle, &snum, NULL)) { result = WERR_BADFID; goto done; |