[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  a9dc2c8 s3-spoolss: Fix bug #8351 forms migration.
      from  b8aa4e5 s4-s3-upgrade do not convert min password length as a time

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a9dc2c81adfca17cb3248a58b23b564ac4ff27b1
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Sep 6 14:09:47 2011 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/nt_printing_migrate.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

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);
 	}


-- 
Samba Shared Repository