summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-09-06 14:09:47 +0200
committerJeremy Allison <jra@samba.org>2011-09-09 03:21:42 +0200
commita9dc2c81adfca17cb3248a58b23b564ac4ff27b1 (patch)
tree469ef68542b34de3ea3a062d95f5a1c882c88f44 /source3
parentb8aa4e513cc205b04dadf5f6d1ce3d937b427574 (diff)
downloadsamba-a9dc2c81adfca17cb3248a58b23b564ac4ff27b1.tar.gz
samba-a9dc2c81adfca17cb3248a58b23b564ac4ff27b1.tar.bz2
samba-a9dc2c81adfca17cb3248a58b23b564ac4ff27b1.zip
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
Diffstat (limited to 'source3')
-rw-r--r--source3/printing/nt_printing_migrate.c4
1 files changed, 4 insertions, 0 deletions
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);
}