- Better LSPP fix for bug #216855.

- Resolves: rhbz#216855
This commit is contained in:
Tim Waugh 2006-11-27 15:03:26 +00:00
parent 80ed432dfc
commit 63d0991b84
2 changed files with 7 additions and 4 deletions

View File

@ -1174,7 +1174,7 @@
+ security_context_t devcon; /* Printer's SELinux context */ + security_context_t devcon; /* Printer's SELinux context */
+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ + struct avc_entry_ref avcref; /* Pointer to the access vector cache */
+ security_class_t tclass; /* Object class for the SELinux check */ + security_class_t tclass; /* Object class for the SELinux check */
+ access_vector_t avr = 0; /* Access method being requested */ + access_vector_t avr; /* Access method being requested */
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
@ -1221,7 +1221,7 @@
+ tclass = SECCLASS_FILE; + tclass = SECCLASS_FILE;
+ avr = FILE__WRITE; + avr = FILE__WRITE;
+ } + }
+ else if (avr != FILE__WRITE || avr != CHR_FILE__WRITE) + else
+ { + {
+ cupsdLogMessage(CUPSD_LOG_ERROR, + cupsdLogMessage(CUPSD_LOG_ERROR,
+ "StartJob: Printer is not a character device or regular file"); + "StartJob: Printer is not a character device or regular file");
@ -1530,7 +1530,7 @@
+ security_context_t devcon; /* Printer's SELinux context */ + security_context_t devcon; /* Printer's SELinux context */
+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ + struct avc_entry_ref avcref; /* Pointer to the access vector cache */
+ security_class_t tclass; /* Object class for the SELinux check */ + security_class_t tclass; /* Object class for the SELinux check */
+ access_vector_t avr = 0; /* Access method being requested */ + access_vector_t avr; /* Access method being requested */
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
@ -1600,7 +1600,7 @@
+ tclass = SECCLASS_FILE; + tclass = SECCLASS_FILE;
+ avr = FILE__WRITE; + avr = FILE__WRITE;
+ } + }
+ else if (avr != FILE__WRITE || avr != CHR_FILE__WRITE) + else
+ { + {
+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file")); + send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file"));
+ return (NULL); + return (NULL);

View File

@ -432,6 +432,9 @@ rm -rf $RPM_BUILD_ROOT
%{cups_serverbin}/daemon/cups-lpd %{cups_serverbin}/daemon/cups-lpd
%changelog %changelog
* Mon Nov 27 2006 Tim Waugh <twaugh@redhat.com>
- Better LSPP fix for bug #216855.
* Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com> * Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com>
- Use translated string for password prompt (STR #2121). - Use translated string for password prompt (STR #2121).