s3: Lift the smbd_messaging_context from winreg_printer_opendriver
authorVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 07:32:12 +0000 (09:32 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 8 Aug 2010 14:03:16 +0000 (16:03 +0200)
source3/rpc_server/srv_spoolss_util.c

index d609281ba12b0ffd954fbf8218b82a097b9c88c8..c4c612a729672766cdea30d8aef7e5ca5a791442 100644 (file)
@@ -1068,6 +1068,7 @@ static WERROR winreg_printer_write_multi_sz(TALLOC_CTX *mem_ctx,
 
 static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx,
                                        struct auth_serversupplied_info *server_info,
+                                       struct messaging_context *msg_ctx,
                                        const char *drivername,
                                        const char *architecture,
                                        uint32_t version,
@@ -1089,7 +1090,7 @@ static WERROR winreg_printer_opendriver(TALLOC_CTX *mem_ctx,
 
        result = winreg_printer_openkey(mem_ctx,
                                        server_info,
-                                       smbd_messaging_context(),
+                                       msg_ctx,
                                        winreg_pipe,
                                        key_name,
                                        drivername,
@@ -3769,6 +3770,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx,
 
        result = winreg_printer_opendriver(tmp_ctx,
                                           server_info,
+                                          smbd_messaging_context(),
                                           info8.driver_name,
                                           info8.architecture,
                                           info8.version,
@@ -3995,6 +3997,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                /* look for Win2k first and then for NT4 */
                result = winreg_printer_opendriver(tmp_ctx,
                                                   server_info,
+                                                  smbd_messaging_context(),
                                                   driver_name,
                                                   architecture,
                                                   3,
@@ -4005,6 +4008,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                if (!W_ERROR_IS_OK(result)) {
                        result = winreg_printer_opendriver(tmp_ctx,
                                                           server_info,
+                                                          smbd_messaging_context(),
                                                           driver_name,
                                                           architecture,
                                                           2,
@@ -4017,6 +4021,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                /* ok normal case */
                result = winreg_printer_opendriver(tmp_ctx,
                                                   server_info,
+                                                  smbd_messaging_context(),
                                                   driver_name,
                                                   architecture,
                                                   driver_version,
@@ -4253,6 +4258,7 @@ WERROR winreg_del_driver(TALLOC_CTX *mem_ctx,
        /* test that the key exists */
        result = winreg_printer_opendriver(tmp_ctx,
                                           server_info,
+                                          smbd_messaging_context(),
                                           info8->driver_name,
                                           info8->architecture,
                                           version,
@@ -4345,6 +4351,7 @@ WERROR winreg_get_driver_list(TALLOC_CTX *mem_ctx,
         * parent of all drivers for this architecture and version */
        result = winreg_printer_opendriver(tmp_ctx,
                                           server_info,
+                                          smbd_messaging_context(),
                                           NULL,
                                           architecture,
                                           version,