s3-spoolss: Fixed return values of winreg_printer_deleteform1.
authorAndreas Schneider <asn@samba.org>
Fri, 9 Apr 2010 07:26:24 +0000 (09:26 +0200)
committerGünther Deschner <gd@samba.org>
Fri, 23 Apr 2010 14:07:04 +0000 (16:07 +0200)
Signed-off-by: Günther Deschner <gd@samba.org>
source3/rpc_server/srv_spoolss_util.c

index efe3dd4e97b86b5a3481e3d21bad8df2895904cd..00a9820962adf39424ab0c1a03aaf808cde36489 100644 (file)
@@ -1522,6 +1522,11 @@ WERROR winreg_printer_deleteform1(TALLOC_CTX *mem_ctx,
                                           wvalue,
                                           &result);
        if (!NT_STATUS_IS_OK(status)) {
+               /* If the value doesn't exist, return WERR_INVALID_FORM_NAME */
+               if (W_ERROR_EQUAL(result, WERR_BADFILE)) {
+                       result = WERR_INVALID_FORM_NAME;
+                       goto done;
+               }
                DEBUG(0, ("winreg_printer_delteform1: Could not delete value %s: %s\n",
                          wvalue.name, nt_errstr(status)));
                if (!W_ERROR_IS_OK(result)) {