osx: prefs pane should properly detect version

we use "new" afs conf after 1.4.6 or 1.5.36. detect correctly

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>
(cherry picked from commit 0016e013aa012e179e7ac4c59b19a0ee1cbd0840)

Change-Id: I6796dee249eccd7646359deb8f29322b9954f803
Reviewed-on: http://gerrit.openafs.org/4269
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
index 2c4e5f2dcebd3d88365b37d3310fa35013023e88..fb696da98002ec8cd1ffab61fffddbdf06e5727f 100644 (file)
--- a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
+++ b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
@@ -305,8 +305,9 @@
                [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];