The branch, v3-6-test has been updated
via a272dcf s3-spoolss: Fix bug #8351 forms migration.
from 1168f77 s3:libsmb: check the wct of the incoming SMBnegprot
responses
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit a272dcf1754bd31ab585bf5b40b5b7f59be27467
Author: Andreas Schneider <a...@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 <a...@samba.org>
-----------------------------------------------------------------------
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 9320448..e927a23 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
