summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@suse.de>2011-06-15 14:59:49 +0200
committerGünther Deschner <gd@samba.org>2011-06-30 10:54:23 +0200
commitc9e3f6ab02bdc354a9b656f62744ee66fe9e9e67 (patch)
treeb43f7372ea5586c37532da29c845404426f2e59d /source3/printing
parenta36ce0735ff6cad8124bd63a056a71d9495b238c (diff)
downloadsamba-c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67.tar.gz
samba-c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67.tar.bz2
samba-c9e3f6ab02bdc354a9b656f62744ee66fe9e9e67.zip
s3-printing: skip migration of non-existent printers
Skip tdb migration of printer and security descriptor entries which refer to non-existent printers. Signed-off-by: Günther Deschner <gd@samba.org> Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Thu Jun 30 10:54:23 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing_migrate.c26
1 files changed, 18 insertions, 8 deletions
diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index 0cc151918a..79145852e7 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -459,10 +459,6 @@ static NTSTATUS migrate_secdesc(TALLOC_CTX *mem_ctx,
key_name, nt_errstr(status)));
return status;
}
- if (W_ERROR_EQUAL(WERR_INVALID_PRINTER_NAME, result)) {
- DEBUG(3, ("Ignoring missing printer %s\n", key_name));
- return NT_STATUS_OK;
- }
if (!W_ERROR_IS_OK(result)) {
DEBUG(2, ("OpenPrinter(%s) failed: %s\n",
key_name, win_errstr(result)));
@@ -588,13 +584,20 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
}
if (strncmp((const char *) kbuf.dptr, PRINTERS_PREFIX, strlen(PRINTERS_PREFIX)) == 0) {
+ const char *printer_name = (const char *)(kbuf.dptr
+ + strlen(PRINTERS_PREFIX));
status = migrate_printer(mem_ctx,
pipe_hnd,
- (const char *) kbuf.dptr + strlen(PRINTERS_PREFIX),
+ printer_name,
dbuf.dptr,
dbuf.dsize);
SAFE_FREE(dbuf.dptr);
- if (!NT_STATUS_IS_OK(status)) {
+ /* 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)) {
tdb_close(tdb);
return status;
}
@@ -602,13 +605,20 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
}
if (strncmp((const char *) kbuf.dptr, SECDESC_PREFIX, strlen(SECDESC_PREFIX)) == 0) {
+ const char *secdesc_name = (const char *)(kbuf.dptr
+ + strlen(SECDESC_PREFIX));
status = migrate_secdesc(mem_ctx,
pipe_hnd,
- (const char *) kbuf.dptr + strlen(SECDESC_PREFIX),
+ secdesc_name,
dbuf.dptr,
dbuf.dsize);
SAFE_FREE(dbuf.dptr);
- if (!NT_STATUS_IS_OK(status)) {
+ /* 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 "
+ "secdesc: %s\n", secdesc_name));
+ } else if (!NT_STATUS_IS_OK(status)) {
tdb_close(tdb);
return status;
}