From 6b53da146e12e42347ea0245e12279b7464f8ae5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 23 Jul 2001 19:50:36 +0000 Subject: Fix for cups compile. Jeremy. (This used to be commit e90ad081ada5f3e11abe833b16a6416025ebcea5) --- source3/printing/print_cups.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'source3') diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index dd5f1ca188..cc6ed9871a 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -1009,6 +1009,7 @@ cups_queue_get(int snum, print_queue_struct **q, print_status_struct *status) static int cups_queue_pause(int snum) { + extern userdom_struct current_user_info; int ret; /* Return value */ http_t *http; /* HTTP connection to server */ ipp_t *request, /* IPP Request */ @@ -1019,15 +1020,15 @@ cups_queue_pause(int snum) DEBUG(5,("cups_queue_pause(%d)\n", snum)); - /* - * Make sure we don't ask for passwords... - */ + /* + * Make sure we don't ask for passwords... + */ cupsSetPasswordCB(cups_passwd_cb); - /* - * Try to connect to the server... - */ + /* + * Try to connect to the server... + */ if ((http = httpConnect(cupsServer(), ippPort())) == NULL) { @@ -1036,15 +1037,15 @@ cups_queue_pause(int snum) return (1); } - /* - * Build an IPP_PAUSE_PRINTER request, which requires the following - * attributes: - * - * attributes-charset - * attributes-natural-language - * printer-uri - * requesting-user-name - */ + /* + * Build an IPP_PAUSE_PRINTER request, which requires the following + * attributes: + * + * attributes-charset + * attributes-natural-language + * printer-uri + * requesting-user-name + */ request = ippNew(); @@ -1065,7 +1066,7 @@ cups_queue_pause(int snum) ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri); ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", - NULL, pjob->user); + NULL, current_user_info.unix_name); /* * Do the request and get back a response... -- cgit