author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Mon, 19 Sep 2016 00:22:44 -0700 | |
changeset 6954 | bdf0b42d8cef |
parent 1150 | b6dd488e8bb7 |
permissions | -rw-r--r-- |
1150
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
1 |
--- scheduler/audit.c Tue Feb 5 07:54:29 2013 |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
2 |
+++ scheduler/audit.c Tue Feb 5 07:53:56 2013 |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
3 |
@@ -171,7 +171,6 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
4 |
int job_id, boolean_t remote) |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
5 |
{ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
6 |
char tmpfile[IPP_MAX_NAME]; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
7 |
- char tfile[IPP_MAX_NAME]; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
8 |
char r_job_ID[IPP_MAX_NAME]; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
9 |
char *file, *f_job_ID = NULL; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
10 |
struct stat attributes; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
11 |
@@ -239,14 +238,9 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
12 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
13 |
/* |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
14 |
* In case of remote request, filelist contains client document-name. |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
15 |
- * Append the same to filename before writing to the audit record. |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
16 |
*/ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
17 |
if (remote && (filelist != NULL)) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
18 |
- strlcpy(tfile, "Local file: ", sizeof (tmpfile)); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
19 |
- strcat(tfile, tmpfile); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
20 |
- strcat(tfile, " | Remote file: "); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
21 |
- strcat(tfile, filelist); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
22 |
- file = tfile; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
23 |
+ file = filelist; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
24 |
} |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
25 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
26 |
/* extract label from slabel */ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
27 |
@@ -424,6 +418,7 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
28 |
int status, return_val; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
29 |
struct addrinfo *ai = NULL; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
30 |
boolean_t remote = B_FALSE; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
31 |
+ boolean_t freedlist = B_FALSE; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
32 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
33 |
if ((event = adt_alloc_event(ah, event_ID)) == NULL) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
34 |
cupsdLogMessage(CUPSD_LOG_EMERG, |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
35 |
@@ -485,10 +480,24 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
36 |
if (document_list == NULL) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
37 |
dlist = job_name; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
38 |
} else { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
39 |
- dlist = document_list; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
40 |
+ dlist = strdup(document_list); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
41 |
+ freedlist = B_TRUE; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
42 |
+ } |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
43 |
+ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
44 |
+ if (dlist != NULL) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
45 |
cupsdLogMessage(CUPSD_LOG_DEBUG2, |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
46 |
+ "cups_audit_print_request_sub():" |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
47 |
+ "document-names is %s ", dlist); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
48 |
+ } else { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
49 |
+ cupsdLogMessage(CUPSD_LOG_ERROR, |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
50 |
"cups_audit_print_request_sub():" |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
51 |
- "document-names is %s ", dlist); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
52 |
+ "document list is NULL"); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
53 |
+ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
54 |
+ if (ai != NULL) |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
55 |
+ freeaddrinfo(ai); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
56 |
+ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
57 |
+ adt_free_event(event); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
58 |
+ return; |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
59 |
} |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
60 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
61 |
/* |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
62 |
@@ -495,9 +504,7 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
63 |
* document-names=f1,f2,f3... |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
64 |
* extract the files from it. |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
65 |
*/ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
66 |
- if (dlist != NULL) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
67 |
- filelist = strtok(dlist, ","); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
68 |
- } |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
69 |
+ filelist = strtok(dlist, ","); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
70 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
71 |
if (remote) { |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
72 |
/* Remote Request */ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
73 |
@@ -540,6 +547,9 @@ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
74 |
freeaddrinfo(ai); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
75 |
} |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
76 |
|
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
77 |
+ if (freedlist) |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
78 |
+ free(dlist); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
79 |
+ |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
80 |
adt_free_event(event); |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
81 |
} |
b6dd488e8bb7
16182423 Update error code for all the failed use of authorization records in CUPS
Sonam Gupta <sonam.x.gupta@oracle.com>
parents:
diff
changeset
|
82 |