]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Make KCM the default ccache on OS X
authorGreg Hudson <ghudson@mit.edu>
Fri, 11 Jul 2014 03:11:11 +0000 (23:11 -0400)
committerGreg Hudson <ghudson@mit.edu>
Wed, 30 Jul 2014 17:00:55 +0000 (13:00 -0400)
If we do not find a default ccache value from krb5-config and we
detect that the host platform is OS X 10.7 or higher, use KCM: as the
default ccache name instead of FILE:/tmp/krb5cc_%{uid}.

ticket: 7964

src/configure.in

index a8a633e4fc607cd3f90faf5e164f53b3352c9134..48786e048ea53d28803c005dace3fd3f5036becd 100644 (file)
@@ -1317,8 +1317,22 @@ if test "x$with_krb5_config" != xno; then
                : "${DEFCKTNAME=`$with_krb5_config --defcktname`}"
        fi
 fi
+dnl The outer brackets around the case statement prevent m4 from eating the
+dnl brackets in the glob patterns.
 if test "${DEFCCNAME+set}" != set; then
-       DEFCCNAME=FILE:/tmp/krb5cc_%{uid}
+       [case $host in
+       *-*-darwin[0-9].* | *-*-darwin10.*)
+               # Use the normal default for OS X 10.6 (Darwin 10) and prior.
+               ;;
+       *-*-darwin*)
+               # For OS X 10.7 (Darwin 11) and later, the native ccache uses
+               # the KCM daemon.
+               DEFCCNAME=KCM:
+               ;;
+       esac]
+       if test "${DEFCCNAME+set}" != set; then
+               DEFCCNAME=FILE:/tmp/krb5cc_%{uid}
+       fi
 fi
 if test "${DEFKTNAME+set}" != set; then
        DEFKTNAME=FILE:/etc/krb5.keytab