- LSPP cupsdSetString/ClearString fixes (bug #378451).

This commit is contained in:
Tim Waugh 2007-11-13 14:53:32 +00:00
parent 6e81cf0b3b
commit e6351f16b1
2 changed files with 10 additions and 7 deletions

View File

@ -1160,7 +1160,7 @@
+ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); + cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification);
+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, + audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
+ ServerName, NULL, NULL, 1); + ServerName, NULL, NULL, 1);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
+ } + }
@ -1660,7 +1660,7 @@
+ con->username, con->scon, printer->name); + con->username, con->scon, printer->name);
+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, + audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+ ServerName, NULL, NULL, 0); + ServerName, NULL, NULL, 0);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+ +
+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer")); + send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer"));
@ -1805,7 +1805,7 @@
+ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, + audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
+ ServerName, NULL, NULL, 0); + ServerName, NULL, NULL, 0);
+ } + }
+ free(audit_message); + cupsdClearString(&audit_message);
} }
} }
@ -2350,7 +2350,7 @@
+ job->auid, (job->username)?job->username:"?", job->scon, printer->name); + job->auid, (job->username)?job->username:"?", job->scon, printer->name);
+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, + audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+ ServerName, NULL, NULL, 0); + ServerName, NULL, NULL, 0);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+ +
+ cupsdCancelJob(job, 0, IPP_JOB_ABORTED); + cupsdCancelJob(job, 0, IPP_JOB_ABORTED);
@ -2399,7 +2399,7 @@
+ job->id, job->auid, job->username, printer->name, title); + job->id, job->auid, job->username, printer->name, title);
+ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, + audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
+ ServerName, NULL, NULL, 1); + ServerName, NULL, NULL, 1);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+ } + }
+ else + else
@ -2437,7 +2437,7 @@
+ printer->name, title, job->scon, mls_label?mls_label:"none"); + printer->name, title, job->scon, mls_label?mls_label:"none");
+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, + audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
+ ServerName, NULL, NULL, 1); + ServerName, NULL, NULL, 1);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+ context_free(jobcon); + context_free(jobcon);
+ free(label_template); + free(label_template);
@ -2526,7 +2526,7 @@
+ if (printercon) + if (printercon)
+ context_free(printercon); + context_free(printercon);
+ free(rangestr); + free(rangestr);
+ free(audit_message); + cupsdClearString(&audit_message);
+ } + }
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
} }

View File

@ -449,6 +449,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Tue Nov 13 2007 Tim Waugh <twaugh@redhat.com>
- LSPP cupsdSetString/ClearString fixes (bug #378451).
* Wed Nov 7 2007 Tim Waugh <twaugh@redhat.com> 1:1.3.4-2 * Wed Nov 7 2007 Tim Waugh <twaugh@redhat.com> 1:1.3.4-2
- Applied patch to fix CVE-2007-4045 (bug #250161). - Applied patch to fix CVE-2007-4045 (bug #250161).
- Applied patch to fix CVE-2007-4352, CVE-2007-5392 and - Applied patch to fix CVE-2007-4352, CVE-2007-5392 and