Attachment 6857 Details for Bug 8351 – patch

[patch] patch

0002-s3-spoolss-Fix-bug-8351-forms-migration.patch (text/plain), 995 bytes, created by Andreas Schneider on 2011-09-06 12:23:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2011-09-06 12:23:45 UTC

Size: 995 bytes

patch

obsolete

>From 478b299caa73d08857a7910c341e28d3ab63150d Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 6 Sep 2011 14:09:47 +0200
>Subject: [PATCH 2/2] 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>
>---
> source3/printing/nt_printing_migrate.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
>index 4480001..616d7af 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);
> 	}
>-- 
>1.7.6.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 8351: 6754 | 6755 | 6857