diff options
| author | David Disseldorp <ddiss@suse.de> | 2011-07-05 15:04:02 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-07-26 21:53:19 +0200 |
| commit | a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6 (patch) | |
| tree | 648d4f668d36553e2323f7d4ddce8fce5941bb8d | |
| parent | be923773f5f56c036decafee11b95d52656fe1fd (diff) | |
| download | samba-a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6.tar.gz samba-a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6.tar.xz samba-a395d86d83d86e52b29fd0e10f5fc2f29e2d6ac6.zip | |
s3-printing: remove tdb migration invalid printer name checks
WERR_INVALID_PRINTER_NAME only needed to be handled when printing tdb
migration used spoolss, with winreg such errors are no longer possible.
Signed-off-by: Günther Deschner <gd@samba.org>
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Jul 7 19:15:34 CEST 2011 on sn-devel-104
(cherry picked from commit e5955903fdc5ed6f8660b72db0716d4da25c711c)
(cherry picked from commit 1822df19e764bce37a4b2c7e212a2bb0c61d1d13)
| -rw-r--r-- | source3/printing/nt_printing_migrate_internal.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c index 84b0c314e0d..5d8edc75f85 100644 --- a/source3/printing/nt_printing_migrate_internal.c +++ b/source3/printing/nt_printing_migrate_internal.c @@ -132,12 +132,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, dbuf.dptr, dbuf.dsize); SAFE_FREE(dbuf.dptr); - /* currently no WERR_INVALID_PRINTER_NAME equivalent */ - if (NT_STATUS_EQUAL(status, - werror_to_ntstatus(WERR_INVALID_PRINTER_NAME))) { - DEBUG(2, ("Skipping migration for non-existent " - "printer: %s\n", printer_name)); - } else if (!NT_STATUS_IS_OK(status)) { + if (!NT_STATUS_IS_OK(status)) { tdb_close(tdb); return status; } @@ -164,9 +159,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, dbuf.dptr, dbuf.dsize); SAFE_FREE(dbuf.dptr); - /* currently no WERR_INVALID_PRINTER_NAME equivalent */ - if (NT_STATUS_EQUAL(status, werror_to_ntstatus(WERR_INVALID_PRINTER_NAME)) || - NT_STATUS_EQUAL(status, werror_to_ntstatus(WERR_BADFILE))) { + if (NT_STATUS_EQUAL(status, werror_to_ntstatus(WERR_BADFILE))) { DEBUG(2, ("Skipping secdesc migration for non-existent " "printer: %s\n", secdesc_name)); } else if (!NT_STATUS_IS_OK(status)) { |