Remove kerberos policy from the default configuration file to prevent cups

from failing to start. Initial breakage reported by Anthony Campbell.
This commit is contained in:
ajacoutot 2017-01-26 00:56:55 +00:00
parent a466cfda46
commit f93b027a7a
2 changed files with 59 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.215 2017/01/19 03:08:52 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.216 2017/01/26 00:56:55 ajacoutot Exp $
COMMENT-main= Common Unix Printing System
COMMENT-libs= CUPS libraries and headers
@ -11,6 +11,8 @@ GH_TAGNAME= v${VERSION}
PKGNAME-main= cups-${VERSION}
PKGNAME-libs= cups-libs-${VERSION}
REVISION-main= 0
CATEGORIES= print sysutils
# config-scripts/cups-sharedlibs.m4

View File

@ -0,0 +1,56 @@
$OpenBSD: patch-conf_cupsd_conf_in,v 1.3 2017/01/26 00:56:55 ajacoutot Exp $
https://github.com/apple/cups/issues/4947
--- conf/cupsd.conf.in.orig Thu Jan 26 01:51:26 2017
+++ conf/cupsd.conf.in Thu Jan 26 01:51:49 2017
@@ -134,49 +134,3 @@ WebInterface @CUPS_WEBIF@
Order deny,allow
</Limit>
</Policy>
-
-# Set the kerberized printer/job policies...
-<Policy kerberos>
- # Job/subscription privacy...
- JobPrivateAccess default
- JobPrivateValues default
- SubscriptionPrivateAccess default
- SubscriptionPrivateValues default
-
- # Job-related operations must be done by the owner or an administrator...
- <Limit Create-Job Print-Job Print-URI Validate-Job>
- AuthType Negotiate
- Order deny,allow
- </Limit>
-
- <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
- AuthType Negotiate
- Require user @OWNER @SYSTEM
- Order deny,allow
- </Limit>
-
- # All administration operations require an administrator to authenticate...
- <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
- AuthType Default
- Require user @SYSTEM
- Order deny,allow
- </Limit>
-
- # All printer operations require a printer operator to authenticate...
- <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
- AuthType Default
- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
- Order deny,allow
- </Limit>
-
- # Only the owner or an administrator can cancel or authenticate a job...
- <Limit Cancel-Job CUPS-Authenticate-Job>
- AuthType Negotiate
- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
- Order deny,allow
- </Limit>
-
- <Limit All>
- Order deny,allow
- </Limit>
-</Policy>