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>

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 9320448fd4a799b512debb49be77683f6e412edc..e927a233a1c16f54cd2bb5728fa04db9cefc501b 100644 (file)
--- 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);
        }