From 94a8482261526c7bb3ae15194bf3939978b324b6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 23 Apr 2010 14:45:48 +0200 Subject: s3-spoolss: Fixed winreg_delete_printer_key if key is NULL or emtpy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source3/rpc_server/srv_spoolss_util.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index d41edc0317..fdcb62cf38 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -1700,13 +1700,17 @@ WERROR winreg_delete_printer_key(TALLOC_CTX *mem_ctx, rpccli_winreg_CloseKey(winreg_pipe, tmp_ctx, &key_hnd, NULL); } - keyname = talloc_asprintf(tmp_ctx, - "%s\\%s", - path, - key); - if (keyname == NULL) { - result = WERR_NOMEM; - goto done; + if (key == NULL || key[0] == '\0') { + keyname = path; + } else { + keyname = talloc_asprintf(tmp_ctx, + "%s\\%s", + path, + key); + if (keyname == NULL) { + result = WERR_NOMEM; + goto done; + } } result = winreg_printer_delete_subkeys(tmp_ctx, -- cgit