From: Andreas Schneider <asn@samba.org>
Date: Tue, 6 Sep 2011 12:09:47 +0000 (+0200)
Subject: s3-spoolss: Fix bug #8351 forms migration.
X-Git-Tag: samba-3.6.1~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e63be362c3ece75f4934da68b7a34000bfa0342e;p=thirdparty%2Fsamba.git

s3-spoolss: Fix bug #8351 forms migration.

Don't fail if the form already exists (or is builtin now).

Signed-off-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit a272dcf1754bd31ab585bf5b40b5b7f59be27467)
---

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 9320448fd4a..e927a233a1c 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -73,6 +73,10 @@ NTSTATUS printing_tdb_migrate_form(TALLOC_CTX *mem_ctx,
 	result = winreg_printer_addform1(mem_ctx,
 					 b,
 					 &f1);
+	if (W_ERROR_EQUAL(result, WERR_FILE_EXISTS)) {
+		/* Don't migrate form if it already exists. */
+		result = WERR_OK;
+	}
 	if (!W_ERROR_IS_OK(result)) {
 		return werror_to_ntstatus(result);
 	}