s3: Lift the smbd_messaging_context from winreg_get_driver

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 29d5bd3e05fd6acd71dbea42cd264e79ad428bba..d12f16814566a324aabc13ef98f25b1cd5e65af3 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1601,17 +1601,20 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
 
                if (!strequal("Windows NT x86", r->architecture)) {
                        werr = winreg_get_driver(mem_ctx, server_info,
+                                                smbd_messaging_context(),
                                                 "Windows NT x86",
                                                 r->driver_name,
                                                 DRIVER_ANY_VERSION,
                                                 &driver);
                } else if (r->version == 2) {
                        werr = winreg_get_driver(mem_ctx, server_info,
+                                                smbd_messaging_context(),
                                                 "Windows NT x86",
                                                 r->driver_name,
                                                 3, &driver);
                } else if (r->version == 3) {
                        werr = winreg_get_driver(mem_ctx, server_info,
+                                                smbd_messaging_context(),
                                                 "Windows NT x86",
                                                 r->driver_name,
                                                 2, &driver);
@@ -1819,6 +1822,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
                driver = NULL;
 
                result = winreg_get_driver(mem_ctx, server_info,
+                                          smbd_messaging_context(),
                                           info->architecture, drivers[i],
                                           version, &driver);
                if (!W_ERROR_IS_OK(result)) {

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 04208d526736e2cd1a1d54ac70bab08cc7596aeb..43ae480d24aadedca94dd45d540e3d0b76840a65 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1839,7 +1839,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p,
        if ((version = get_version_id(r->in.architecture)) == -1)
                return WERR_INVALID_ENVIRONMENT;
 
-       status = winreg_get_driver(p->mem_ctx, p->server_info,
+       status = winreg_get_driver(p->mem_ctx, p->server_info, p->msg_ctx,
                                   r->in.architecture, r->in.driver,
                                   version, &info);
        if (!W_ERROR_IS_OK(status)) {
@@ -1849,6 +1849,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p,
                        version = 3;
 
                        status = winreg_get_driver(p->mem_ctx, p->server_info,
+                                                  p->msg_ctx,
                                                   r->in.architecture,
                                                   r->in.driver,
                                                   version, &info);
@@ -1872,6 +1873,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p,
 
        if (version == 2) {
                status = winreg_get_driver(p->mem_ctx, p->server_info,
+                                          p->msg_ctx,
                                           r->in.architecture,
                                           r->in.driver, 3, &info_win2k);
                if (W_ERROR_IS_OK(status)) {
@@ -1936,8 +1938,8 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p,
                version = r->in.version;
 
        status = winreg_get_driver(p->mem_ctx, p->server_info,
-                                  r->in.architecture, r->in.driver,
-                                  version, &info);
+                                  p->msg_ctx, r->in.architecture,
+                                  r->in.driver, version, &info);
        if (!W_ERROR_IS_OK(status)) {
                status = WERR_UNKNOWN_PRINTER_DRIVER;
 
@@ -1953,7 +1955,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p,
                /* try for Win2k driver if "Windows NT x86" */
 
                version = 3;
-               status = winreg_get_driver(info, p->server_info,
+               status = winreg_get_driver(info, p->server_info, p->msg_ctx,
                                           r->in.architecture,
                                           r->in.driver,
                                           version, &info);
@@ -1996,7 +1998,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p,
        /* also check for W32X86/3 if necessary; maybe we already have? */
 
        if ( (version == 2) && ((r->in.delete_flags & DPD_DELETE_SPECIFIC_VERSION) != DPD_DELETE_SPECIFIC_VERSION)  ) {
-               status = winreg_get_driver(info, p->server_info,
+               status = winreg_get_driver(info, p->server_info, p->msg_ctx,
                                           r->in.architecture,
                                           r->in.driver, 3, &info_win2k);
                if (W_ERROR_IS_OK(status)) {
@@ -4990,7 +4992,9 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
                return WERR_INVALID_PRINTER_NAME;
        }
 
-       result = winreg_get_driver(mem_ctx, server_info, architecture,
+       result = winreg_get_driver(mem_ctx, server_info,
+                                  smbd_messaging_context(),
+                                  architecture,
                                   pinfo2->drivername, version, &driver);
 
        DEBUG(8,("construct_printer_driver_info_level: status: %s\n",
@@ -5008,7 +5012,9 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
 
                /* Yes - try again with a WinNT driver. */
                version = 2;
-               result = winreg_get_driver(mem_ctx, server_info, architecture,
+               result = winreg_get_driver(mem_ctx, server_info,
+                                          smbd_messaging_context(),
+                                          architecture,
                                           pinfo2->drivername,
                                           version, &driver);
                DEBUG(8,("construct_printer_driver_level: status: %s\n",
@@ -6736,6 +6742,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx,
                        DEBUG(5, ("\tdriver: [%s]\n", drivers[i]));
 
                        result = winreg_get_driver(mem_ctx, server_info,
+                                                  smbd_messaging_context(),
                                                   architecture, drivers[i],
                                                   version, &driver);
                        if (!W_ERROR_IS_OK(result)) {

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index ac32fbc4549fb849a1532d668e399777b64df96d..668fec7bb104717402643c482539e9362ef28a28 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -3993,6 +3993,7 @@ done:
 
 WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                         struct auth_serversupplied_info *server_info,
+                        struct messaging_context *msg_ctx,
                         const char *architecture,
                         const char *driver_name,
                         uint32_t driver_version,
@@ -4022,7 +4023,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(),
+                                                  msg_ctx,
                                                   driver_name,
                                                   architecture,
                                                   3,
@@ -4033,7 +4034,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(),
+                                                          msg_ctx,
                                                           driver_name,
                                                           architecture,
                                                           2,
@@ -4046,7 +4047,7 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                /* ok normal case */
                result = winreg_printer_opendriver(tmp_ctx,
                                                   server_info,
-                                                  smbd_messaging_context(),
+                                                  msg_ctx,
                                                   driver_name,
                                                   architecture,
                                                   driver_version,

diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 6dfdc25da6e07f842d1e71a2c9012eea3a4b9719..ef2d8be518f3e22ba965f5d9a6a936e2cae687d2 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -536,6 +536,7 @@ WERROR winreg_add_driver(TALLOC_CTX *mem_ctx,
 
 WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
                         struct auth_serversupplied_info *server_info,
+                        struct messaging_context *msg_ctx,
                         const char *architecture,
                         const char *driver_name,
                         uint32_t driver_version,