sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-printing: remove tdb migration invalid printer name checks

Browse Source 
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
This commit is contained in:
David Disseldorp 2011-07-05 15:04:02 +02:00 committed by Günther Deschner
parent cfc3b6e5f7
commit e5955903fd
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/printing/nt_printing_migrate_internal.c
View File

@ -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)) {