s3: Lift the server_messaging_context from construct_notify_jobs_info
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 15:29:12 +0000 (17:29 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 16:09:38 +0000 (18:09 +0200)
source3/rpc_server/srv_spoolss_nt.c

index fb68fd26b7bbca78e6b9cc0c5264d5b9b329b63f..94c3249f77aa13e7620fc3a01812ea625961bba5 100644 (file)
@@ -3158,7 +3158,8 @@ static bool construct_notify_printer_info(struct messaging_context *msg_ctx,
  *
  ********************************************************************/
 
-static bool construct_notify_jobs_info(print_queue_struct *queue,
+static bool construct_notify_jobs_info(struct messaging_context *msg_ctx,
+                                      print_queue_struct *queue,
                                       struct spoolss_NotifyInfo *info,
                                       struct spoolss_PrinterInfo2 *pinfo2,
                                       int snum,
@@ -3196,9 +3197,8 @@ static bool construct_notify_jobs_info(print_queue_struct *queue,
                current_data=&(info->notifies[info->count]);
 
                construct_info_data(current_data, type, field, id);
-               notify_info_data_table[j].fn(server_messaging_context(),
-                                            snum, current_data, queue,
-                                            pinfo2, mem_ctx);
+               notify_info_data_table[j].fn(msg_ctx, snum, current_data,
+                                            queue, pinfo2, mem_ctx);
                info->count++;
        }
 
@@ -3393,7 +3393,8 @@ static WERROR printer_notify_info(struct pipes_struct *p,
                                                   &status);
 
                        for (j=0; j<count; j++) {
-                               construct_notify_jobs_info(&queue[j], info,
+                               construct_notify_jobs_info(p->msg_ctx,
+                                                          &queue[j], info,
                                                           pinfo2, snum,
                                                           &option_type,
                                                           queue[j].job,