summaryrefslogtreecommitdiff
path: root/config-scripts
diff options
context:
space:
mode:
authorMichael R Sweet <michaelrsweet@gmail.com>2017-07-17 19:49:27 -0400
committerMichael R Sweet <michaelrsweet@gmail.com>2017-07-17 19:49:27 -0400
commitd2d605ff778b36f672ff1881059510e806389a2d (patch)
tree22c5bbf491bee46e070737f189530f71b2d27d4c /config-scripts
parent6eda776e8a62d7d6575fccaaf73633bd6fb9c2e0 (diff)
downloadcups-d2d605ff778b36f672ff1881059510e806389a2d.tar.gz
Fix authorization checks on macOS (no longer /etc/authorization, but now we don't need
to look for the old names from 10.5...)
Diffstat (limited to 'config-scripts')
-rw-r--r--config-scripts/cups-common.m49
1 files changed, 2 insertions, 7 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index e204e965f..c86f9b905 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -388,20 +388,15 @@ case $host_os_name in
if test "x$default_adminkey" != xdefault; then
CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
- elif grep -q system.print.operator /etc/authorization; then
+ else
CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
- else
- CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
- CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
fi
if test "x$default_operkey" != xdefault; then
CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
- elif grep -q system.print.operator /etc/authorization; then
- CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
else
- CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+ CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
fi])
AC_CHECK_HEADER(Security/SecBasePriv.h,AC_DEFINE(HAVE_SECBASEPRIV_H))