summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-07-05 00:16:03 +0200
committerGünther Deschner <gd@samba.org>2011-07-07 18:06:01 +0200
commit0a1ec73b965f66977a90fb7febb3b56b52ebab20 (patch)
treefb78794e58094950a8483914459f25d78d903684 /source3/printing
parentada5380d2090179fc57eee66e2b46788f4944db0 (diff)
downloadsamba-0a1ec73b965f66977a90fb7febb3b56b52ebab20.tar.gz
samba-0a1ec73b965f66977a90fb7febb3b56b52ebab20.tar.bz2
samba-0a1ec73b965f66977a90fb7febb3b56b52ebab20.zip
s3-printing: use winreg_internal functions.
Guenther Pair-Programmed-With: David Disseldorp <ddiss@suse.de>
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing.c18
-rw-r--r--source3/printing/nt_printing_ads.c10
2 files changed, 14 insertions, 14 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);