summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2011-07-05 15:04:02 +0200
committerGünther Deschner <gd@samba.org>2011-07-07 19:15:34 +0200
commite5955903fdc5ed6f8660b72db0716d4da25c711c (patch)
tree934e0a3c2193218dc4280e24d75d69b41deff9c9
parentcfc3b6e5f79f253e83dfbd13d47b671deb5801b3 (diff)
downloadsamba-e5955903fdc5ed6f8660b72db0716d4da25c711c.tar.gz
samba-e5955903fdc5ed6f8660b72db0716d4da25c711c.tar.bz2
samba-e5955903fdc5ed6f8660b72db0716d4da25c711c.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
-rw-r--r--source3/printing/nt_printing_migrate_internal.c11
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 1bd61588fc..33002e00c1 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)) {