From d418f9f11abb5b5ed038acbaf5dbb2a656d39d87 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 16 Aug 2010 13:53:10 +0200 Subject: s3-printing: Lift the use of smbd_server_fd from job_submit. Signed-off-by: Andreas Schneider --- source3/printing/print_cups.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'source3/printing/print_cups.c') diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 2441cfc275..a85fba8997 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -912,7 +912,6 @@ static int cups_job_submit(int snum, struct printjob *pjob) ipp_attribute_t *attr_job_id = NULL; /* IPP Attribute "job-id" */ 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 *new_jobname = NULL; int num_options = 0; cups_option_t *options = NULL; @@ -923,7 +922,6 @@ static int cups_job_submit(int snum, struct printjob *pjob) char *filename = NULL; size_t size; uint32_t jobid = (uint32_t)-1; - char addr[INET6_ADDRSTRLEN]; DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob)); @@ -981,14 +979,9 @@ static int cups_job_submit(int snum, struct printjob *pjob) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", NULL, user); - clientname = client_name(smbd_server_fd()); - if (strcmp(clientname, "UNKNOWN") == 0) { - clientname = client_addr(smbd_server_fd(),addr,sizeof(addr)); - } - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-originating-host-name", NULL, - clientname); + pjob->clientmachine); /* Get the jobid from the filename. */ jobid = print_parse_jobid(pjob->filename); -- cgit