summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-03 23:20:10 -0700
committerJeremy Allison <jra@samba.org>2007-11-03 23:20:10 -0700
commit5b0b4f23ef5fec3d1ad518237f973d4e014b5766 (patch)
treef75cdfaef81e5fcc0cf7061e0141b97831508ee1 /source3/printing
parent51a0354d751f48a2542984c81e218da33669bbeb (diff)
downloadsamba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.tar.gz
samba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.tar.bz2
samba-5b0b4f23ef5fec3d1ad518237f973d4e014b5766.zip
Remove most of the remaining globals out of lib/util_sock.c.
I have a plan for dealing with the remaining..... Watch this space. Jeremy. (This used to be commit 963fc7685212689f02b3adcc05b4273ee5c382d4)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/print_cups.c4
-rw-r--r--source3/printing/print_iprint.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 5709d93624..2ffd322b45 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -618,9 +618,9 @@ static int cups_job_submit(int snum, struct printjob *pjob)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
NULL, pjob->user);
- clientname = client_name();
+ clientname = client_name(get_client_fd());
if (strcmp(clientname, "UNKNOWN") == 0) {
- clientname = client_addr(addr,sizeof(addr));
+ clientname = client_addr(get_client_fd(),addr,sizeof(addr));
}
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c
index 6dd19577f1..b038f8d1fe 100644
--- a/source3/printing/print_iprint.c
+++ b/source3/printing/print_iprint.c
@@ -779,9 +779,9 @@ static int iprint_job_submit(int snum, struct printjob *pjob)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
NULL, pjob->user);
- clientname = client_name();
+ clientname = client_name(get_client_fd());
if (strcmp(clientname, "UNKNOWN") == 0) {
- clientname = client_addr(addr,sizeof(addr));
+ clientname = client_addr(get_client_fd(),addr,sizeof(addr));
}
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,