diff options
| -rw-r--r-- | source3/printing/nt_printing.c | 18 | ||||
| -rw-r--r-- | source3/printing/nt_printing_ads.c | 10 | ||||
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 146 |
3 files changed, 87 insertions, 87 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index bff91b47fb..1887a61119 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1196,7 +1196,7 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx, continue; } - result = winreg_get_printer(mem_ctx, session_info, msg_ctx, + result = winreg_get_printer_internal(mem_ctx, session_info, msg_ctx, lp_servicename(snum), &pinfo2); if (!W_ERROR_IS_OK(result)) { @@ -1222,18 +1222,18 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx, "Windows NT x86" version 2 or 3 left */ if (!strequal("Windows NT x86", r->architecture)) { - werr = winreg_get_driver(mem_ctx, session_info, msg_ctx, + werr = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, "Windows NT x86", r->driver_name, DRIVER_ANY_VERSION, &driver); } else if (r->version == 2) { - werr = winreg_get_driver(mem_ctx, session_info, msg_ctx, + werr = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, "Windows NT x86", r->driver_name, 3, &driver); } else if (r->version == 3) { - werr = winreg_get_driver(mem_ctx, session_info, msg_ctx, + werr = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, "Windows NT x86", r->driver_name, 2, &driver); @@ -1424,7 +1424,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx, /* get the list of drivers */ - result = winreg_get_driver_list(mem_ctx, session_info, msg_ctx, + result = winreg_get_driver_list_internal(mem_ctx, session_info, msg_ctx, info->architecture, version, &num_drivers, &drivers); if (!W_ERROR_IS_OK(result)) { @@ -1441,7 +1441,7 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx, driver = NULL; - result = winreg_get_driver(mem_ctx, session_info, msg_ctx, + result = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, info->architecture, drivers[i], version, &driver); if (!W_ERROR_IS_OK(result)) { @@ -1737,7 +1737,7 @@ bool print_access_check(const struct auth_serversupplied_info *session_info, return False; } - result = winreg_get_printer_secdesc(mem_ctx, + result = winreg_get_printer_secdesc_internal(mem_ctx, get_session_info_system(), msg_ctx, pname, @@ -1813,7 +1813,7 @@ bool print_time_access_check(const struct auth_serversupplied_info *session_info struct tm *t; uint32 mins; - result = winreg_get_printer(NULL, session_info, msg_ctx, + result = winreg_get_printer_internal(NULL, session_info, msg_ctx, servicename, &pinfo2); if (!W_ERROR_IS_OK(result)) { return False; @@ -1846,7 +1846,7 @@ void nt_printer_remove(TALLOC_CTX *mem_ctx, { WERROR result; - result = winreg_delete_printer_key(mem_ctx, session_info, msg_ctx, + result = winreg_delete_printer_key_internal(mem_ctx, session_info, msg_ctx, printer, ""); if (!W_ERROR_IS_OK(result)) { DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s", diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c index a438f9b411..c5e3f99fb6 100644 --- a/source3/printing/nt_printing_ads.c +++ b/source3/printing/nt_printing_ads.c @@ -74,7 +74,7 @@ static void store_printer_guid(struct messaging_context *msg_ctx, goto done; } - result = winreg_set_printer_dataex(tmp_ctx, session_info, msg_ctx, + result = winreg_set_printer_dataex_internal(tmp_ctx, session_info, msg_ctx, printer, SPOOL_DSSPOOLER_KEY, "objectGUID", REG_SZ, blob.data, blob.length); @@ -275,7 +275,7 @@ WERROR nt_printer_publish(TALLOC_CTX *mem_ctx, sinfo2->attributes = pinfo2->attributes; - win_rc = winreg_update_printer(mem_ctx, session_info, msg_ctx, + win_rc = winreg_update_printer_internal(mem_ctx, session_info, msg_ctx, pinfo2->sharename, info2_mask, sinfo2, NULL, NULL); if (!W_ERROR_IS_OK(win_rc)) { @@ -365,7 +365,7 @@ WERROR check_published_printers(struct messaging_context *msg_ctx) continue; } - result = winreg_get_printer(tmp_ctx, session_info, msg_ctx, + result = winreg_get_printer_internal(tmp_ctx, session_info, msg_ctx, lp_servicename(snum), &pinfo2); if (!W_ERROR_IS_OK(result)) { @@ -400,7 +400,7 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, WERROR result; NTSTATUS status; - result = winreg_get_printer(mem_ctx, session_info, msg_ctx, + result = winreg_get_printer_internal(mem_ctx, session_info, msg_ctx, printer, &pinfo2); if (!W_ERROR_IS_OK(result)) { return false; @@ -417,7 +417,7 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, /* fetching printer guids really ought to be a separate function. */ - result = winreg_get_printer_dataex(mem_ctx, session_info, msg_ctx, + result = winreg_get_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer, SPOOL_DSSPOOLER_KEY, "objectGUID", &type, &data, &data_size); diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index 6f68255d15..19a7d78673 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -466,7 +466,7 @@ static WERROR delete_printer_handle(struct pipes_struct *p, struct policy_handle /* this does not need a become root since the access check has been done on the handle already */ - result = winreg_delete_printer_key(p->mem_ctx, + result = winreg_delete_printer_key_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, Printer->sharename, @@ -688,7 +688,7 @@ static WERROR set_printer_hnd_name(TALLOC_CTX *mem_ctx, continue; } - result = winreg_get_printer(mem_ctx, + result = winreg_get_printer_internal(mem_ctx, session_info, msg_ctx, sname, @@ -1575,7 +1575,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg, continue; } - result = winreg_get_printer(tmp_ctx, session_info, msg, + result = winreg_get_printer_internal(tmp_ctx, session_info, msg, lp_const_servicename(snum), &pinfo2); @@ -1594,7 +1594,7 @@ void do_drv_upgrade_printer(struct messaging_context *msg, DEBUG(6,("Updating printer [%s]\n", pinfo2->printername)); /* all we care about currently is the change_id */ - result = winreg_printer_update_changeid(tmp_ctx, + result = winreg_printer_update_changeid_internal(tmp_ctx, session_info, msg, pinfo2->printername); @@ -1932,7 +1932,7 @@ WERROR _spoolss_OpenPrinterEx(struct pipes_struct *p, DEBUG(4,("Setting printer access = %s\n", (r->in.access_mask == PRINTER_ACCESS_ADMINISTER) ? "PRINTER_ACCESS_ADMINISTER" : "PRINTER_ACCESS_USE" )); - winreg_create_printer(p->mem_ctx, + winreg_create_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -2023,7 +2023,7 @@ WERROR _spoolss_DeletePrinter(struct pipes_struct *p, } if (get_printer_snum(p, r->in.handle, &snum, NULL)) { - winreg_delete_printer_key(p->mem_ctx, + winreg_delete_printer_key_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -2098,7 +2098,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, + status = winreg_get_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.architecture, r->in.driver, @@ -2109,7 +2109,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, if ( version == 2 ) { version = 3; - status = winreg_get_driver(p->mem_ctx, + status = winreg_get_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.architecture, @@ -2137,7 +2137,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, } if (version == 2) { - status = winreg_get_driver(p->mem_ctx, + status = winreg_get_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.architecture, @@ -2146,7 +2146,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, /* if we get to here, we now have 2 driver info structures to remove */ /* remove the Win2k driver first*/ - status = winreg_del_driver(p->mem_ctx, + status = winreg_del_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, info_win2k, 3); @@ -2159,7 +2159,7 @@ WERROR _spoolss_DeletePrinterDriver(struct pipes_struct *p, } } - status = winreg_del_driver(p->mem_ctx, + status = winreg_del_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, info, version); @@ -2206,7 +2206,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, if (r->in.delete_flags & DPD_DELETE_SPECIFIC_VERSION) version = r->in.version; - status = winreg_get_driver(p->mem_ctx, + status = winreg_get_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.architecture, @@ -2228,7 +2228,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, /* try for Win2k driver if "Windows NT x86" */ version = 3; - status = winreg_get_driver(info, + status = winreg_get_driver_internal(info, get_session_info_system(), p->msg_ctx, r->in.architecture, @@ -2279,7 +2279,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, + status = winreg_get_driver_internal(info, get_session_info_system(), p->msg_ctx, r->in.architecture, @@ -2301,7 +2301,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, /* if we get to here, we now have 2 driver info structures to remove */ /* remove the Win2k driver first*/ - status = winreg_del_driver(info, + status = winreg_del_driver_internal(info, get_session_info_system(), p->msg_ctx, info_win2k, @@ -2325,7 +2325,7 @@ WERROR _spoolss_DeletePrinterDriverEx(struct pipes_struct *p, } } - status = winreg_del_driver(info, + status = winreg_del_driver_internal(info, get_session_info_system(), p->msg_ctx, info, @@ -3616,7 +3616,7 @@ static WERROR printserver_notify_info(struct pipes_struct *p, } /* Maybe we should use the SYSTEM session_info here... */ - result = winreg_get_printer(mem_ctx, + result = winreg_get_printer_internal(mem_ctx, get_session_info_system(), p->msg_ctx, lp_servicename(snum), @@ -3704,7 +3704,7 @@ static WERROR printer_notify_info(struct pipes_struct *p, } /* Maybe we should use the SYSTEM session_info here... */ - result = winreg_get_printer(mem_ctx, + result = winreg_get_printer_internal(mem_ctx, get_session_info_system(), p->msg_ctx, lp_servicename(snum), &pinfo2); @@ -3953,7 +3953,7 @@ static WERROR construct_printer_info0(TALLOC_CTX *mem_ctx, r->high_part_total_bytes = 0x0; /* ChangeID in milliseconds*/ - winreg_printer_get_changeid(mem_ctx, session_info, msg_ctx, + winreg_printer_get_changeid_internal(mem_ctx, session_info, msg_ctx, info2->sharename, &r->change_id); r->last_error = WERR_OK; @@ -4323,7 +4323,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, DEBUG(4,("Found a printer in smb.conf: %s[%x]\n", printer, snum)); - result = winreg_create_printer(mem_ctx, + result = winreg_create_printer_internal(mem_ctx, session_info, msg_ctx, printer); @@ -4339,7 +4339,7 @@ static WERROR enum_all_printers_info_level(TALLOC_CTX *mem_ctx, goto out; } - result = winreg_get_printer(mem_ctx, session_info, msg_ctx, + result = winreg_get_printer_internal(mem_ctx, session_info, msg_ctx, printer, &info2); if (!W_ERROR_IS_OK(result)) { goto out; @@ -4756,7 +4756,7 @@ WERROR _spoolss_GetPrinter(struct pipes_struct *p, return WERR_BADFID; } - result = winreg_get_printer(p->mem_ctx, + result = winreg_get_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -5534,7 +5534,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, return WERR_UNKNOWN_LEVEL; } - result = winreg_get_printer(mem_ctx, + result = winreg_get_printer_internal(mem_ctx, session_info, msg_ctx, lp_const_servicename(snum), @@ -5547,7 +5547,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx, return WERR_INVALID_PRINTER_NAME; } - result = winreg_get_driver(mem_ctx, session_info, msg_ctx, + result = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, architecture, pinfo2->drivername, version, &driver); @@ -5566,7 +5566,7 @@ 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, session_info, msg_ctx, + result = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, architecture, pinfo2->drivername, version, &driver); @@ -5997,13 +5997,13 @@ static WERROR update_printer_sec(struct policy_handle *handle, /* NT seems to like setting the security descriptor even though nothing may have actually changed. */ - result = winreg_get_printer_secdesc(p->mem_ctx, + result = winreg_get_printer_secdesc_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, &old_secdesc); if (!W_ERROR_IS_OK(result)) { - DEBUG(2,("update_printer_sec: winreg_get_printer_secdesc() failed\n")); + DEBUG(2,("update_printer_sec: winreg_get_printer_secdesc_internal() failed\n")); result = WERR_BADFID; goto done; } @@ -6049,7 +6049,7 @@ static WERROR update_printer_sec(struct policy_handle *handle, goto done; } - result = winreg_set_printer_secdesc(p->mem_ctx, + result = winreg_set_printer_secdesc_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, @@ -6260,7 +6260,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->drivername, old_printer->drivername)) { push_reg_sz(mem_ctx, &buffer, printer->drivername); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6282,7 +6282,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->comment, old_printer->comment)) { push_reg_sz(mem_ctx, &buffer, printer->comment); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6301,7 +6301,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->sharename, old_printer->sharename)) { push_reg_sz(mem_ctx, &buffer, printer->sharename); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6330,7 +6330,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } push_reg_sz(mem_ctx, &buffer, p); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6348,7 +6348,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->portname, old_printer->portname)) { push_reg_sz(mem_ctx, &buffer, printer->portname); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6367,7 +6367,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->location, old_printer->location)) { push_reg_sz(mem_ctx, &buffer, printer->location); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6387,7 +6387,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || !strequal(printer->sepfile, old_printer->sepfile)) { push_reg_sz(mem_ctx, &buffer, printer->sepfile); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6408,7 +6408,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || printer->starttime != old_printer->starttime) { buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->starttime); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6422,7 +6422,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || printer->untiltime != old_printer->untiltime) { buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->untiltime); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6436,7 +6436,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, if (force_update || printer->priority != old_printer->priority) { buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, printer->priority); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6451,7 +6451,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, buffer = data_blob_talloc(mem_ctx, NULL, 4); SIVAL(buffer.data, 0, (printer->attributes & PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS)); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6475,7 +6475,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, spooling = "unknown"; } push_reg_sz(mem_ctx, &buffer, spooling); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6487,7 +6487,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } push_reg_sz(mem_ctx, &buffer, lp_netbios_name()); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6509,7 +6509,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, } push_reg_sz(mem_ctx, &buffer, longname); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6522,7 +6522,7 @@ static WERROR update_dsspooler(TALLOC_CTX *mem_ctx, uncname = talloc_asprintf(mem_ctx, "\\\\%s\\%s", lp_netbios_name(), printer->sharename); push_reg_sz(mem_ctx, &buffer, uncname); - winreg_set_printer_dataex(mem_ctx, + winreg_set_printer_dataex_internal(mem_ctx, session_info, msg_ctx, printer->sharename, @@ -6571,7 +6571,7 @@ static WERROR update_printer(struct pipes_struct *p, goto done; } - result = winreg_get_printer(tmp_ctx, + result = winreg_get_printer_internal(tmp_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -6635,7 +6635,7 @@ static WERROR update_printer(struct pipes_struct *p, if (devmode == NULL) { printer_mask &= ~SPOOLSS_PRINTER_INFO_DEVMODE; } - result = winreg_update_printer(tmp_ctx, + result = winreg_update_printer_internal(tmp_ctx, get_session_info_system(), p->msg_ctx, printer->sharename, @@ -6676,7 +6676,7 @@ static WERROR publish_or_unpublish_printer(struct pipes_struct *p, if (!get_printer_snum(p, handle, &snum, NULL)) return WERR_BADFID; - result = winreg_get_printer(p->mem_ctx, + result = winreg_get_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_servicename(snum), @@ -6725,7 +6725,7 @@ static WERROR update_printer_devmode(struct pipes_struct *p, return WERR_ACCESS_DENIED; } - return winreg_update_printer(p->mem_ctx, + return winreg_update_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -7139,7 +7139,7 @@ WERROR _spoolss_EnumJobs(struct pipes_struct *p, return WERR_BADFID; } - result = winreg_get_printer(p->mem_ctx, + result = winreg_get_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -7329,7 +7329,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, *info_p = NULL; for (version=0; version<DRIVER_MAX_VERSION; version++) { - result = winreg_get_driver_list(mem_ctx, session_info, msg_ctx, + result = winreg_get_driver_list_internal(mem_ctx, session_info, msg_ctx, architecture, version, &num_drivers, &drivers); if (!W_ERROR_IS_OK(result)) { @@ -7354,7 +7354,7 @@ static WERROR enumprinterdrivers_level_by_architecture(TALLOC_CTX *mem_ctx, for (i = 0; i < num_drivers; i++) { DEBUG(5, ("\tdriver: [%s]\n", drivers[i])); - result = winreg_get_driver(mem_ctx, session_info, + result = winreg_get_driver_internal(mem_ctx, session_info, msg_ctx, architecture, drivers[i], version, &driver); @@ -7550,7 +7550,7 @@ WERROR _spoolss_EnumForms(struct pipes_struct *p, switch (r->in.level) { case 1: - result = winreg_printer_enumforms1(p->mem_ctx, + result = winreg_printer_enumforms1_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->out.count, @@ -7600,7 +7600,7 @@ WERROR _spoolss_GetForm(struct pipes_struct *p, switch (r->in.level) { case 1: - result = winreg_printer_getform1(p->mem_ctx, + result = winreg_printer_getform1_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.form_name, @@ -7983,7 +7983,7 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p, info2, NULL); - err = winreg_update_printer(p->mem_ctx, + err = winreg_update_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, info2->sharename, @@ -8110,7 +8110,7 @@ WERROR _spoolss_AddPrinterDriverEx(struct pipes_struct *p, goto done; } - err = winreg_add_driver(p->mem_ctx, + err = winreg_add_driver_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, r->in.info_ctr, @@ -8551,7 +8551,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, return WERR_INVALID_PARAM; } - status = winreg_printer_addform1(p->mem_ctx, + status = winreg_printer_addform1_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, form); @@ -8567,7 +8567,7 @@ WERROR _spoolss_AddForm(struct pipes_struct *p, return WERR_BADFID; } - status = winreg_printer_update_changeid(p->mem_ctx, + status = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -8610,7 +8610,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p, return WERR_ACCESS_DENIED; } - status = winreg_printer_deleteform1(p->mem_ctx, + status = winreg_printer_deleteform1_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, form_name); @@ -8626,7 +8626,7 @@ WERROR _spoolss_DeleteForm(struct pipes_struct *p, return WERR_BADFID; } - status = winreg_printer_update_changeid(p->mem_ctx, + status = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -8674,7 +8674,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p, return WERR_ACCESS_DENIED; } - status = winreg_printer_setform1(p->mem_ctx, + status = winreg_printer_setform1_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, form_name, @@ -8691,7 +8691,7 @@ WERROR _spoolss_SetForm(struct pipes_struct *p, return WERR_BADFID; } - status = winreg_printer_update_changeid(p->mem_ctx, + status = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -9189,7 +9189,7 @@ WERROR _spoolss_GetJob(struct pipes_struct *p, return WERR_BADFID; } - result = winreg_get_printer(p->mem_ctx, + result = winreg_get_printer_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -9316,7 +9316,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, if (r->in.offered >= *r->out.needed) { uint32_t changeid = 0; - result = winreg_printer_get_changeid(p->mem_ctx, + result = winreg_printer_get_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, @@ -9331,7 +9331,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, goto done; } - result = winreg_get_printer_dataex(p->mem_ctx, + result = winreg_get_printer_dataex_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, @@ -9406,7 +9406,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, return WERR_ACCESS_DENIED; } - result = winreg_get_printer(Printer, + result = winreg_get_printer_internal(Printer, get_session_info_system(), p->msg_ctx, lp_servicename(snum), @@ -9425,7 +9425,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, /* save the registry data */ - result = winreg_set_printer_dataex(p->mem_ctx, + result = winreg_set_printer_dataex_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, pinfo2->sharename, @@ -9451,7 +9451,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, * previous set_printer_dataex() call. I have no idea if * this is right. --jerry */ - winreg_set_printer_dataex(p->mem_ctx, + winreg_set_printer_dataex_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, pinfo2->sharename, @@ -9462,7 +9462,7 @@ WERROR _spoolss_SetPrinterDataEx(struct pipes_struct *p, strlen(oid_string) + 1); } - result = winreg_printer_update_changeid(p->mem_ctx, + result = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum)); @@ -9510,14 +9510,14 @@ WERROR _spoolss_DeletePrinterDataEx(struct pipes_struct *p, } printer = lp_const_servicename(snum); - status = winreg_delete_printer_dataex(p->mem_ctx, + status = winreg_delete_printer_dataex_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, r->in.key_name, r->in.value_name); if (W_ERROR_IS_OK(status)) { - status = winreg_printer_update_changeid(p->mem_ctx, + status = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer); @@ -9552,7 +9552,7 @@ WERROR _spoolss_EnumPrinterKey(struct pipes_struct *p, return WERR_BADFID; } - result = winreg_enum_printer_key(p->mem_ctx, + result = winreg_enum_printer_key_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), @@ -9626,13 +9626,13 @@ WERROR _spoolss_DeletePrinterKey(struct pipes_struct *p, printer = lp_const_servicename(snum); /* delete the key and all subkeys */ - status = winreg_delete_printer_key(p->mem_ctx, + status = winreg_delete_printer_key_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer, r->in.key_name); if (W_ERROR_IS_OK(status)) { - status = winreg_printer_update_changeid(p->mem_ctx, + status = winreg_printer_update_changeid_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, printer); @@ -9683,7 +9683,7 @@ WERROR _spoolss_EnumPrinterDataEx(struct pipes_struct *p, } /* now look for a match on the key name */ - result = winreg_enum_printer_dataex(p->mem_ctx, + result = winreg_enum_printer_dataex_internal(p->mem_ctx, get_session_info_system(), p->msg_ctx, lp_const_servicename(snum), |