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>
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Sep  9 03:21:42 CEST 2011 on sn-devel-104

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 44800014e8487c6c60ca4b82a5efaac3e18341b8..616d7af3d61b5b80a272c99adf6d357a221f3878 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);
        }