s3: Lift the smbd_messaging_context from nt_printing_tdb_migrate

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index aaf1d4f752d32bd6a26cc5925fb487c54b878ab4..7b37926486d1886742c2f85fa9c954127f06173e 100644 (file)
--- 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 fcaeb616fef39a5748401cf1cd2f58aaa0f9281f..9ab2fa7daeb76aaa134ee0e85c69b976ef44c1b9 100644 (file)
--- 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 d8ed563e1c16c3e9fa6c1a0735541c1afe5ee633..36db09f810e4738491188954508e39a8691cfe44 100644 (file)
--- 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());
 }
 
 /****************************************************************************