Merge changes from CUPS 1.4svn-r7582.

[thirdparty/cups.git] / config-scripts / cups-common.m4

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index c643663b02f63b55ad37ba4ccbc026842e6ca5aa..6e81ea52605d3e2a77c47cf45ab2d4a13b09c17f 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -261,8 +261,13 @@ case $uname in
                dnl Check for Authorization Services support
                AC_CHECK_HEADER(Security/Authorization.h, [
                        AC_DEFINE(HAVE_AUTHORIZATION_H)
-                       CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
-                       CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"])
+                       if grep -q system.print.operator /etc/authorization; then
+                               CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
+                       else
+                               CUPS_DEFAULT_PRINTADMIN_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
+                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
+                       fi])
                AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))
 
                dnl Check for sandbox/Seatbelt support