diff options
| author | Marshall Vale <mjv@mit.edu> | 2000-02-11 20:51:00 +0000 |
|---|---|---|
| committer | Marshall Vale <mjv@mit.edu> | 2000-02-11 20:51:00 +0000 |
| commit | a39cd8baa12d266bf97e35078be96cb623e3fd1b (patch) | |
| tree | b79be28441f66a28650b249471f95c02b3da98f2 /src/lib | |
| parent | 2e59d242d1fc5078a03b7aed8c37c0afafa7d763 (diff) | |
| download | krb5-a39cd8baa12d266bf97e35078be96cb623e3fd1b.tar.gz krb5-a39cd8baa12d266bf97e35078be96cb623e3fd1b.tar.xz krb5-a39cd8baa12d266bf97e35078be96cb623e3fd1b.zip | |
Added "Kerberos Preferences" as valid config file on Mac OS. Others will be removed at a later date
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12037 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/os/init_os_ctx.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c index 0297a7b7a..0c2b5e5a1 100644 --- a/src/lib/krb5/os/init_os_ctx.c +++ b/src/lib/krb5/os/init_os_ctx.c @@ -204,28 +204,34 @@ os_get_default_config_files(pfiles, secure) { profile_filespec_t* files; #ifdef macintosh - files = malloc(5 * sizeof(FSSpec)); + files = malloc(7 * sizeof(FSSpec)); if (files != 0) { - OSErr err = GetMacProfileFileSpec(&(files [2]), "\pKerberos5 Configuration", kApplicationSupportFolderType); + OSErr err = GetMacProfileFileSpec(&(files [3]), "\pKerberos Preferences", kApplicationSupportFolderType); if (err == noErr) { - err = GetMacProfileFileSpec( &(files [3]), "\pkrb5.ini", kApplicationSupportFolderType); + err = GetMacProfileFileSpec( &(files [4]), "\pkrb5.ini", kApplicationSupportFolderType); } - + if (err == noErr) { + err = GetMacProfileFileSpec( &(files [5]), "\pKerberos5 Configuration", kApplicationSupportFolderType); + } + if (err == noErr) { - files[4].vRefNum = 0; - files[4].parID = 0; - files[4].name[0] = '\0'; + files[6].vRefNum = 0; + files[6].parID = 0; + files[6].name[0] = '\0'; } else { - files[2].vRefNum = 0; - files[2].parID = 0; - files[2].name[0] = '\0'; + files[3].vRefNum = 0; + files[3].parID = 0; + files[3].name[0] = '\0'; } - err = GetMacProfileFileSpec(&(files [0]), "\pKerberos5 Configuration", kPreferencesFolderType); + err = GetMacProfileFileSpec(&(files [0]), "\pKerberos Preferences", kPreferencesFolderType); if (err == noErr) { err = GetMacProfileFileSpec( &(files [1]), "\pkrb5.ini", kPreferencesFolderType); } + if (err == noErr) { + err = GetMacProfileFileSpec( &(files [2]), "\pKerberos5 Configuration", kPreferencesFolderType); + } if (err != noErr) { free (files); |