The branch, master has been updated
via 1d65b7a742eede647c893bac04f3a695e66228f5 (commit)
from ecc53d0312dbe0af85ae490e4f4953e1ad4906fb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1d65b7a742eede647c893bac04f3a695e66228f5
Author: Tim Prouty <[email protected]>
Date: Mon Feb 9 16:12:20 2009 -0800
s3 spoolss: arch needs to be set before it's passed to get_version_id.
7717ad688099860fa0989ed3582435404fd6d4fa left arch unitialized.
Guenther, please check.
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index bbbf414..a0b689c 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" */
--
Samba Shared Repository
