diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-03 18:15:45 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-03 18:15:45 -0700 |
| commit | 6658165d5e9cd186fea74e1581091233e8990e9b (patch) | |
| tree | 13d5e5fd6d9d93adb4e60e58c5abacbbb959ecc7 /source3/printing | |
| parent | 73d407968002587eadd0ff13eb413ddf07c78771 (diff) | |
| download | samba-6658165d5e9cd186fea74e1581091233e8990e9b.tar.gz samba-6658165d5e9cd186fea74e1581091233e8990e9b.tar.bz2 samba-6658165d5e9cd186fea74e1581091233e8990e9b.zip | |
Stop get_peer_addr() and client_addr() from using global
statics. Part of my library cleanups.
Jeremy.
(This used to be commit e848506c858bd16706c1d7f6b4b032005512b8ac)
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/print_cups.c | 3 | ||||
| -rw-r--r-- | source3/printing/print_iprint.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index e9e4e5955f..ff4c7ebc5f 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -567,6 +567,7 @@ static int cups_job_submit(int snum, struct printjob *pjob) pstring new_jobname; int num_options = 0; cups_option_t *options = NULL; + char addr[INET6_ADDRSTRLEN]; DEBUG(5,("cups_job_submit(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); @@ -619,7 +620,7 @@ static int cups_job_submit(int snum, struct printjob *pjob) clientname = client_name(); if (strcmp(clientname, "UNKNOWN") == 0) { - clientname = client_addr(); + clientname = client_addr(addr); } ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c index 18f5e97856..8ee681b3be 100644 --- a/source3/printing/print_iprint.c +++ b/source3/printing/print_iprint.c @@ -727,6 +727,7 @@ static int iprint_job_submit(int snum, struct printjob *pjob) cups_lang_t *language = NULL; /* Default language */ char uri[HTTP_MAX_URI]; /* printer-uri attribute */ const char *clientname = NULL; /* hostname of client for job-originating-host attribute */ + char addr[INET6_ADDRSTRLEN]; DEBUG(5,("iprint_job_submit(%d, %p (%d))\n", snum, pjob, pjob->sysjob)); @@ -780,7 +781,7 @@ static int iprint_job_submit(int snum, struct printjob *pjob) clientname = client_name(); if (strcmp(clientname, "UNKNOWN") == 0) { - clientname = client_addr(); + clientname = client_addr(addr); } ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, |