From 80cda2e807ee32e3a1e3f93097310798fa4a3814 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 8 Aug 2010 09:27:04 +0200 Subject: s3: Lift the smbd_messaging_context from nt_printing_tdb_migrate --- source3/printing/nt_printing_migrate.c | 4 ++-- source3/printing/nt_printing_migrate.h | 2 +- source3/smbd/process.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c index aaf1d4f752..7b37926486 100644 --- a/source3/printing/nt_printing_migrate.c +++ b/source3/printing/nt_printing_migrate.c @@ -585,7 +585,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -bool nt_printing_tdb_migrate(void) +bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx) { const char *drivers_path = state_path("ntdrivers.tdb"); const char *printers_path = state_path("ntprinters.tdb"); @@ -613,7 +613,7 @@ bool nt_printing_tdb_migrate(void) status = rpc_pipe_open_internal(tmp_ctx, &ndr_table_spoolss.syntax_id, server_info, - smbd_messaging_context(), + msg_ctx, &spoolss_pipe); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Couldn't open internal spoolss pipe: %s\n", diff --git a/source3/printing/nt_printing_migrate.h b/source3/printing/nt_printing_migrate.h index fcaeb616fe..9ab2fa7dae 100644 --- a/source3/printing/nt_printing_migrate.h +++ b/source3/printing/nt_printing_migrate.h @@ -21,6 +21,6 @@ #ifndef _NT_PRINTING_MIGRATE_H_ #define _NT_PRINTING_MIGRATE_H_ -bool nt_printing_tdb_migrate(void); +bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx); #endif /* _NT_PRINTING_MIGRATE_H_ */ diff --git a/source3/smbd/process.c b/source3/smbd/process.c index d8ed563e1c..36db09f810 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -2860,7 +2860,7 @@ fail: static bool spoolss_init_cb(void *ptr) { - return nt_printing_tdb_migrate(); + return nt_printing_tdb_migrate(smbd_messaging_context()); } /**************************************************************************** -- cgit