diff options
| author | Theodore Tso <tytso@mit.edu> | 1998-09-01 19:45:26 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1998-09-01 19:45:26 +0000 |
| commit | 7e9b3b1e66bee116ae57dc19533a92e35fbbde05 (patch) | |
| tree | 7ee99c539cb11bc67de53e698d81bc544c3b7508 /src | |
| parent | 702ceb420a343939c7a1728b874b935485c7d1f8 (diff) | |
| download | krb5-7e9b3b1e66bee116ae57dc19533a92e35fbbde05.tar.gz krb5-7e9b3b1e66bee116ae57dc19533a92e35fbbde05.tar.xz krb5-7e9b3b1e66bee116ae57dc19533a92e35fbbde05.zip | |
ccdefname.c (krb5_cc_default_name): Changed the PC version to use the
CCache API by default. Removed the old Macintosh code that had been
commented out. (If we need to ressurect it, we'll get it from CVS.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10904 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/krb5/os/ccdefname.c | 27 |
2 files changed, 15 insertions, 19 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 9b6df700c..48beadbf8 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 1 15:44:11 1998 Theodore Y. Ts'o <tytso@mit.edu> + + * ccdefname.c (krb5_cc_default_name): Changed the PC version to + use the CCache API by default. Removed the old Macintosh + code that had been commented out. (If we need to + ressurect it, we'll get it from CVS.) + Fri Aug 21 17:37:00 1998 Miro Jurisic <meeroh@mit.edu> * ccdefname.c.c (krb5_cc_default_name): Changed the Mac diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c index cbaeba5af..0f90135ac 100644 --- a/src/lib/krb5/os/ccdefname.c +++ b/src/lib/krb5/os/ccdefname.c @@ -92,21 +92,8 @@ krb5_cc_default_name(context) if (name == 0) { -/* meeroh: I have no idea why we're using HAVE_MACSOCK_H here instead of macintosh, - but since I am not sure it is worng I will leave it that way. */ -#ifdef HAVE_MACSOCK_H +#ifdef macintosh { -//short vRefnum; -//long parID; -//OSErr theErr; -//FSSpec krbccSpec; -//char pathbuf[255]; - -// theErr = FindFolder(kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder, &vRefnum, &parID); -// FSMakeFSSpec(vRefnum, parID, "\pkrb5cc", &krbccSpec); -// GetPathname(&krbccSpec, &pathbuf); -// sprintf(name_buf, "STDIO:%s", pathbuf); -// strcpy (name_buf, "STDIO:krb5cc"); strcpy (name_buf, "API:default_cache_name"); } #else @@ -154,17 +141,19 @@ krb5_cc_default_name(context) if(!(found)) { #endif - GetWindowsDirectory (defname, sizeof(defname)-7); - strcat (defname, "\\krb5cc"); - strcpy (name_buf, "FILE:"); + //GetWindowsDirectory (defname, sizeof(defname)-7); + strcpy (defname, "default_cache_name"); + strcpy (name_buf, "API:"); GetPrivateProfileString(INI_FILES, INI_KRB_CCACHE, defname, - name_buf+5, sizeof(name_buf)-5, KERBEROS_INI); + name_buf+4, sizeof(name_buf)-4, + KERBEROS_INI); #if defined(_WIN32) } #endif } #else - sprintf(name_buf, "FILE:/tmp/krb5cc_%d", getuid()); + sprintf(name_buf, "API:default_cache_name"); + //sprintf(name_buf, "FILE:/tmp/krb5cc_%d", getuid()); #endif #endif name = name_buf; |