summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorMiro Jurisic <meeroh@mit.edu>1999-02-20 00:24:44 +0000
committerMiro Jurisic <meeroh@mit.edu>1999-02-20 00:24:44 +0000
commitb98e54ce131b84b92a737676bf2254d38019090c (patch)
tree08806cae03f5833b4ab928520d25e4d5bfaeab74 /src/lib
parentd1efe6cec9ab19369e3d0f72484ac74e067c1a7b (diff)
Added get_from_os for MacOS
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11192 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/krb5/os/ccdefname.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index be88f695d..64d7a4697 100644
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -73,18 +73,6 @@ static int get_from_registry(char *name_buf, int name_size)
}
#endif
-#ifdef macintosh
-static krb5_error_code get_from_os(char *name_buf, int name_size)
-{
-#if defined(_WIN32)
- if (get_from_registry(name_buf, name_size))
- return 0;
-#endif
- strcpy(name_buf, "API:default_cache_name");
- return 0;
-}
-#endif
-
#if defined(_MSDOS) || defined(_WIN32)
static krb5_error_code get_from_os(char *name_buf, int name_size)
{
@@ -106,7 +94,18 @@ static krb5_error_code get_from_os(char *name_buf, int name_size)
}
#endif
-#if !(defined(_MSDOS) || defined(_WIN32) || defined(macintosh))
+#if defined (macintosh)
+
+static krb5_error_code get_from_os(char *name_buf, int name_size)
+{
+ if (name_size < 4)
+ return ENOMEM;
+ Krb5GlobalsGetDefaultCacheName (name_buf + 4, name_size - 4);
+ memcpy (name_buf, "API:", 4);
+ return 0;
+}
+
+#elif !(defined(_MSDOS) || defined(_WIN32)
static krb5_error_code get_from_os(char *name_buf, int name_size)
{
sprintf(name_buf, "FILE:/tmp/krb5cc_%d", getuid());