From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 17 Mar 2011 04:11:43 +0000 (-0400)
Subject: osx: prefs pane should properly detect version
X-Git-Tag: openafs-devel-1_7_1~796
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=0016e013aa012e179e7ac4c59b19a0ee1cbd0840

osx: prefs pane should properly detect version

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>
---

diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
index 2c4e5f2..fb696da 100644
--- 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];