From 8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 8 Feb 2011 17:19:23 +0100 Subject: s3-spoolss: Dont wipe out all drivers when only one should be deleted. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Great catch from Bjoern Baumbach ! Andreas, Simo, please check. We now have a torture test (rpc.spoolss.driver.driver.multiple_drivers) for this. Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue Feb 8 18:11:48 CET 2011 on sn-devel-104 --- source3/rpc_server/srv_spoolss_util.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 56407119b5..dc861f8810 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -4126,9 +4126,10 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx, } key_name = talloc_asprintf(tmp_ctx, - "%s\\Environments\\%s\\Drivers\\Version-%u", + "%s\\Environments\\%s\\Drivers\\Version-%u\\%s", TOP_LEVEL_CONTROL_KEY, - info8->architecture, version); + info8->architecture, version, + info8->driver_name); if (key_name == NULL) { result = WERR_NOMEM; goto done; -- cgit