summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-02-09 16:12:20 -0800
committerTim Prouty <tprouty@samba.org>2009-02-09 16:12:20 -0800
commit1d65b7a742eede647c893bac04f3a695e66228f5 (patch)
tree655bc83405339c6260a3adc7978e918adbf27a45 /source3
parentecc53d0312dbe0af85ae490e4f4953e1ad4906fb (diff)
downloadsamba-1d65b7a742eede647c893bac04f3a695e66228f5.tar.gz
samba-1d65b7a742eede647c893bac04f3a695e66228f5.tar.bz2
samba-1d65b7a742eede647c893bac04f3a695e66228f5.zip
s3 spoolss: arch needs to be set before it's passed to get_version_id.
7717ad688099860fa0989ed3582435404fd6d4fa left arch unitialized. Guenther, please check.
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index bbbf414e11..a0b689c8a4 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -2019,6 +2019,9 @@ WERROR _spoolss_DeletePrinterDriver(pipes_struct *p,
return WERR_ACCESS_DENIED;
}
+ driver = CONST_DISCARD(char *, r->in.driver);
+ arch = CONST_DISCARD(char *, r->in.architecture);
+
/* check that we have a valid driver name first */
if ((version=get_version_id(arch)) == -1)
@@ -2027,9 +2030,6 @@ WERROR _spoolss_DeletePrinterDriver(pipes_struct *p,
ZERO_STRUCT(info);
ZERO_STRUCT(info_win2k);
- driver = CONST_DISCARD(char *, r->in.driver);
- arch = CONST_DISCARD(char *, r->in.architecture);
-
if (!W_ERROR_IS_OK(get_a_printer_driver(&info, 3, driver, arch, version)))
{
/* try for Win2k driver if "Windows NT x86" */