osx: prefs pane should properly detect version
authorDerrick Brashear <shadow@dementia.org>
Thu, 17 Mar 2011 04:11:43 +0000 (00:11 -0400)
committerDerrick Brashear <shadow@dementia.org>
Thu, 17 Mar 2011 13:35:31 +0000 (06:35 -0700)
we use "new" afs conf after 1.4.6 or 1.5.36. detect correctly

Change-Id: I7ae0005f7f1ca3a3164d12fab38e6d4da5c85168
Reviewed-on: http://gerrit.openafs.org/4254
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

src/platform/DARWIN/AFSPreference/AFSPropertyManager.m

index 2c4e5f2..fb696da 100644 (file)
                [self clearConfiguration];
                
                //chech the afs version for chioce wich afsd conf file usage
-               useAfsdConfVersion = mjVersion >= 1 && miVersion>=4 && paVersion>=7;
-               useAfsdConfVersion = useAfsdConfVersion || (mjVersion >= 1 && miVersion>=6 && paVersion>=31);
+               useAfsdConfVersion = mjVersion >= 1 && miVersion==4 && paVersion>=7;
+               useAfsdConfVersion = useAfsdConfVersion || (mjVersion >= 1 && miVersion==5 && paVersion>=31);
+               useAfsdConfVersion = useAfsdConfVersion || (mjVersion >= 1 && miVersion>=6);
                
                // read thiscell config file
                [filePath setString:installationPath];