From e5955903fdc5ed6f8660b72db0716d4da25c711c Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 5 Jul 2011 15:04:02 +0200 Subject: s3-printing: remove tdb migration invalid printer name checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Autobuild-User: Günther Deschner Autobuild-Date: Thu Jul 7 19:15:34 CEST 2011 on sn-devel-104 --- source3/printing/nt_printing_migrate_internal.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'source3/printing/nt_printing_migrate_internal.c') diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c index 1bd61588fc2..33002e00c1b 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)) { -- cgit v1.2.1