Merge branch 'f14'
This commit is contained in:
commit
d6f50937a8
@ -2769,7 +2769,7 @@ diff -urNp cups-1.4.6.old/scheduler/printers.c cups-1.4.6/scheduler/printers.c
|
||||
+ if (getfilecon(printerfile, &devcon) == -1)
|
||||
+ {
|
||||
+ if(is_selinux_enabled())
|
||||
+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context");
|
||||
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSetPrinterAttrs: Unable to get printer context");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
|
@ -612,6 +612,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%changelog
|
||||
* Thu Mar 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-14
|
||||
- Fixed some typos in colord patch.
|
||||
- LSPP: only warn when unable to get printer context.
|
||||
|
||||
* Mon Mar 07 2011 Richard Hughes <rhughes@redhat.com> 1:1.4.6-13
|
||||
- Updated colord patch.
|
||||
|
Loading…
Reference in New Issue
Block a user