Added "Kerberos Preferences" as valid config file on Mac OS. Others will be removed...

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12037 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index 0297a7b7a930eee1b82a6f65a74f5cd50fca26c1..0c2b5e5a12cd8ce99f00be607348c04bec08ad7c 100644 (file)
--- 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);