s3: Lift the smbd_messaging_context from reload_printers

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4937c62024d196cf345a541d97623ead4058751b..85ade8f8003c12f300debc48d00518d0dcbf5cd0 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5755,7 +5755,7 @@ int get_client_fd(void);
 struct event_context *smbd_event_context(void);
 struct messaging_context *smbd_messaging_context(void);
 struct memcache *smbd_memcache(void);
 struct event_context *smbd_event_context(void);
 struct messaging_context *smbd_messaging_context(void);
 struct memcache *smbd_memcache(void);

-void reload_printers(void);
+void reload_printers(struct messaging_context *msg_ctx);

 bool reload_services(bool test);
 void exit_server(const char *const explanation);
 void exit_server_cleanly(const char *const explanation);
 bool reload_services(bool test);
 void exit_server(const char *const explanation);
 void exit_server_cleanly(const char *const explanation);

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 36db09f810e4738491188954508e39a8691cfe44..2715c676e6710226d5ed96f019c39fdf031adca7 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2237,7 +2237,7 @@ void check_reload(time_t t)
                        || (t-last_printer_reload_time  < 0) ) 
                {
                        DEBUG( 3,( "Printcap cache time expired.\n"));
                        || (t-last_printer_reload_time  < 0) ) 
                {
                        DEBUG( 3,( "Printcap cache time expired.\n"));

-                       reload_printers();
+                       reload_printers(smbd_messaging_context());

                        last_printer_reload_time = t;
                }
        }
                        last_printer_reload_time = t;
                }
        }

diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c
index 4a499daf25d3dbeab7a4d9c8bcb7b8f3b14cd6b7..b2b296454b194ca8a9bea1c32798746291981142 100644 (file)
--- a/source3/smbd/server_reload.c
+++ b/source3/smbd/server_reload.c
@@ -29,7 +29,7 @@
 /****************************************************************************
  Reload printers
 **************************************************************************/
 /****************************************************************************
  Reload printers
 **************************************************************************/

-void reload_printers(void)
+void reload_printers(struct messaging_context *msg_ctx)

 {
        struct auth_serversupplied_info *server_info = NULL;
        struct spoolss_PrinterInfo2 *pinfo2 = NULL;
 {
        struct auth_serversupplied_info *server_info = NULL;
        struct spoolss_PrinterInfo2 *pinfo2 = NULL;


@@ -63,18 +63,18 @@ void reload_printers(void)
                        DEBUG(3, ("removing stale printer %s\n", pname));
 
                        if (is_printer_published(server_info, server_info,
                        DEBUG(3, ("removing stale printer %s\n", pname));
 
                        if (is_printer_published(server_info, server_info,

-                                                smbd_messaging_context(),
+                                                msg_ctx,

                                                 NULL, lp_servicename(snum),
                                                 NULL, &pinfo2)) {
                                nt_printer_publish(server_info,
                                                   server_info,
                                                 NULL, lp_servicename(snum),
                                                 NULL, &pinfo2)) {
                                nt_printer_publish(server_info,
                                                   server_info,

-                                                  smbd_messaging_context(),
+                                                  msg_ctx,

                                                   pinfo2,
                                                   DSPRINT_UNPUBLISH);
                                TALLOC_FREE(pinfo2);
                        }
                                                   pinfo2,
                                                   DSPRINT_UNPUBLISH);
                                TALLOC_FREE(pinfo2);
                        }

-                       nt_printer_remove(server_info, server_info,
-                                         smbd_messaging_context(), pname);
+                       nt_printer_remove(server_info, server_info, msg_ctx,
+                                         pname);

                        lp_killservice(snum);
                }
        }
                        lp_killservice(snum);
                }
        }


@@ -110,7 +110,7 @@ bool reload_services(bool test)
 
        ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
 
 
        ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
 

-       reload_printers();
+       reload_printers(smbd_messaging_context());

 
        /* perhaps the config filename is now set */
        if (!test)
 
        /* perhaps the config filename is now set */
        if (!test)