summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-08 17:19:23 +0100
committerGünther Deschner <gd@samba.org>2011-02-08 18:11:48 +0100
commit8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7 (patch)
tree9cc92b8083fbfb14c5f3c5ba88bc5a9774b092e8
parent9e6d61fb8571683ddf02a7796e569ee8e4da907e (diff)
downloadsamba-8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7.tar.gz
samba-8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7.tar.bz2
samba-8b64d0607bc3b5e3182d8a879a7fa382dbdf0fc7.zip
s3-spoolss: Dont wipe out all drivers when only one should be deleted.
Great catch from Bjoern Baumbach <bb@sernet.de> ! Andreas, Simo, please check. We now have a torture test (rpc.spoolss.driver.driver.multiple_drivers) for this. Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Tue Feb 8 18:11:48 CET 2011 on sn-devel-104
-rw-r--r--source3/rpc_server/srv_spoolss_util.c5
1 files 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;