From a9dc2c81adfca17cb3248a58b23b564ac4ff27b1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 6 Sep 2011 14:09:47 +0200 Subject: s3-spoolss: Fix bug #8351 forms migration. Don't fail if the form already exists (or is builtin now). Signed-off-by: Andreas Schneider Autobuild-User: Jeremy Allison Autobuild-Date: Fri Sep 9 03:21:42 CEST 2011 on sn-devel-104 --- source3/printing/nt_printing_migrate.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3') diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c index 44800014e8..616d7af3d6 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); } -- cgit