s3: Lift the smbd_messaging_context from enumprinters_level2
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 12:10:11 +0000 (14:10 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 14:03:21 +0000 (16:03 +0200)
source3/rpc_server/srv_spoolss_nt.c

index fa1ce86c73538c1bcf876e95f1f97f8ff21b0f4c..2ae4aa004ca398436bdeba1e8984bbf8546d938d 100644 (file)
@@ -4071,14 +4071,14 @@ static WERROR enumprinters_level1(TALLOC_CTX *mem_ctx,
 
 static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
                                  struct auth_serversupplied_info *server_info,
+                                 struct messaging_context *msg_ctx,
                                  uint32_t flags,
                                  const char *servername,
                                  union spoolss_PrinterInfo **info,
                                  uint32_t *count)
 {
        if (flags & PRINTER_ENUM_LOCAL) {
-               return enum_all_printers_info_2(mem_ctx, server_info,
-                                               smbd_messaging_context(),
+               return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx,
                                                info, count);
        }
 
@@ -4087,8 +4087,7 @@ static WERROR enumprinters_level2(TALLOC_CTX *mem_ctx,
                        return WERR_INVALID_NAME;
                }
 
-               return enum_all_printers_info_2(mem_ctx, server_info,
-                                               smbd_messaging_context(),
+               return enum_all_printers_info_2(mem_ctx, server_info, msg_ctx,
                                                info, count);
        }
 
@@ -4189,7 +4188,7 @@ WERROR _spoolss_EnumPrinters(struct pipes_struct *p,
                break;
        case 2:
                result = enumprinters_level2(p->mem_ctx, p->server_info,
-                                            r->in.flags, name,
+                                            p->msg_ctx, r->in.flags, name,
                                             r->out.info, r->out.count);
                break;
        case 4: