summaryrefslogtreecommitdiff
path: root/berkeley
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-08-29 00:26:48 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2012-08-29 00:26:48 +0000
commit37e7e6e0b27c7db3be8e160e87a63fec66e0fcca (patch)
tree08d7d4e2e80a04c648bc0137f9c8f3c26f0760fb /berkeley
parenta29fd7ddb5d63688a4d44d08e4ab16428921c321 (diff)
downloadcups-37e7e6e0b27c7db3be8e160e87a63fec66e0fcca.tar.gz
Merge changes from CUPS 1.7svn-r10578.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3891 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
-rw-r--r--berkeley/lpq.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index e798cf8c6..2dfc3bfbf 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -3,7 +3,7 @@
*
* "lpq" command for CUPS.
*
- * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2007-2012 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
@@ -371,6 +371,7 @@ show_jobs(const char *command, /* I - Command name */
* attributes-natural-language
* job-uri or printer-uri
* requested-attributes
+ * requesting-user-name
*/
request = ippNewRequest(id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS);
@@ -399,6 +400,9 @@ show_jobs(const char *command, /* I - Command name */
"requesting-user-name", NULL, user);
ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
}
+ else
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
+ "requesting-user-name", NULL, cupsUser());
ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
"requested-attributes",
@@ -447,8 +451,8 @@ show_jobs(const char *command, /* I - Command name */
jobpriority = 50;
#endif /* __osf__ */
jobstate = IPP_JOB_PENDING;
- jobname = "untitled";
- jobuser = NULL;
+ jobname = "unknown";
+ jobuser = "unknown";
jobdest = NULL;
jobcopies = 1;