r23779: Change from v2 or later to v3 or later.

[kai/samba.git] / source3 / printing / printing.c

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 2e259a8f510bf8f307a4acafae63a899a4c49667..de2e4150d227150d0e36eef9aa6f7bb53b6405b3 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -178,7 +178,7 @@ static int get_queue_status(const char* sharename, print_status_struct *);
  Initialise the printing backend. Called once at startup before the fork().
 ****************************************************************************/
 
-BOOL print_backend_init(void)
+BOOL print_backend_init(struct messaging_context *msg_ctx)
 {
        const char *sversion = "INFO/version";
        pstring printing_path;
@@ -215,7 +215,7 @@ BOOL print_backend_init(void)
        close_all_print_db(); /* Don't leave any open. */
 
        /* do NT print initialization... */
-       return nt_printing_init();
+       return nt_printing_init(msg_ctx);
 }
 
 /****************************************************************************
@@ -1348,16 +1348,18 @@ static void print_queue_update_with_lock( const char *sharename,
 /****************************************************************************
 this is the receive function of the background lpq updater
 ****************************************************************************/
-static void print_queue_receive(int msg_type, struct server_id src,
-                               void *buf, size_t msglen,
-                               void *private_data)
+static void print_queue_receive(struct messaging_context *msg,
+                               void *private_data,
+                               uint32_t msg_type,
+                               struct server_id server_id,
+                               DATA_BLOB *data)
 {
        fstring sharename;
        pstring lpqcommand, lprmcommand;
        int printing_type;
        size_t len;
 
-       len = tdb_unpack( (uint8 *)buf, msglen, "fdPP",
+       len = tdb_unpack( (uint8 *)data->data, data->length, "fdPP",
                sharename,
                &printing_type,
                lpqcommand,
@@ -1394,15 +1396,15 @@ void start_background_queue(void)
                /* Child. */
                DEBUG(5,("start_background_queue: background LPQ thread started\n"));
 
-               claim_connection( NULL, "smbd lpq backend", 0, False, 
+               claim_connection( NULL, "smbd lpq backend",
                        FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_PRINT_GENERAL);
 
                if (!locking_init(0)) {
                        exit(1);
                }
 
-               message_register(MSG_PRINTER_UPDATE, print_queue_receive,
-                                NULL);
+               messaging_register(smbd_messaging_context(), NULL,
+                                  MSG_PRINTER_UPDATE, print_queue_receive);
                
                DEBUG(5,("start_background_queue: background LPQ thread waiting for messages\n"));
                while (1) {
@@ -1424,11 +1426,12 @@ void start_background_queue(void)
                        /* now check for messages */
                        
                        DEBUG(10,("start_background_queue: background LPQ thread got a message\n"));
-                       message_dispatch();
+                       message_dispatch(smbd_messaging_context());
 
                        /* process any pending print change notify messages */
 
-                       print_notify_send_messages(0);
+                       print_notify_send_messages(smbd_messaging_context(),
+                                                  0);
                }
        }
 }
@@ -1534,8 +1537,9 @@ static void print_queue_update(int snum, BOOL force)
 
        /* finally send the message */
        
-       message_send_pid(pid_to_procid(background_lpq_updater_pid),
-                MSG_PRINTER_UPDATE, buffer, len, False);
+       messaging_send_buf(smbd_messaging_context(),
+                          pid_to_procid(background_lpq_updater_pid),
+                          MSG_PRINTER_UPDATE, (uint8 *)buffer, len);
 
        SAFE_FREE( buffer );