X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fplatform%2FDARWIN%2FAFSPreference%2FAFSPropertyManager.m;h=559a216229a7f969f7981ddc2ba2d32b766912f1;hp=5a5c54039423f75961f717e2c8184ad2ecf1593b;hb=464b99b8ffa4ee8c7a33cd34609ba2f6885f6b01;hpb=6f52f9493a99974b88b7526287c8e291786e52b8

diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
index 5a5c540..559a216 100644
--- a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
+++ b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m
@@ -6,7 +6,7 @@
 //  Copyright 2007 INFN - National Institute of Nuclear Physics. All rights reserved.
 //
 
-#import <Kerberos/Kerberos.h>
+#import "Krb5Util.h"
 #import "AFSPropertyManager.h"
 #import "TaskUtil.h"
 
@@ -1000,24 +1000,13 @@
 //  +(void) aklog
 // -------------------------------------------------------------------------------
 -(void) aklog:(NSString*)theCell noKerberosCall:(BOOL)krb5CallEnable {
-	KLPrincipal		princ = nil;
 	KLStatus		kstatus = noErr;
-	char			*princName = 0L;
-	KLBoolean       outFoundValidTickets = false;
 	@try {
 		// trying to ket kerberos ticket
 		if(krb5CallEnable) {
-			kstatus = KLCacheHasValidTickets(nil, nil, &outFoundValidTickets, nil, nil);
-			//kstatus =  KLAcquireInitialTickets (0L, 0L, &princ,  &princName);
-			if(!outFoundValidTickets) {
-				kstatus = KLAcquireNewInitialTickets(nil, nil, &princ, &princName);
-				if(kstatus != noErr && kstatus != klUserCanceledErr) @throw [NSException exceptionWithName:@"aklog" 
-																									reason:@"KLAcquireInitialTickets" 
-																								  userInfo:nil];
-			}
+			kstatus = [Krb5Util getNewTicketIfNotPresent];
 		} else kstatus = klNoErr;
 		
-		
 		//ok to launch aklog
 		if(kstatus == klNoErr) [TaskUtil executeTaskSearchingPath:@"aklog" 
 															 args:(theCell==nil?[NSArray arrayWithObjects:nil]:[NSArray arrayWithObjects:@"-c", theCell, nil])];
@@ -1027,11 +1016,7 @@
 		@throw e;
 	}
 	@finally {
-		// destory the kerberos va
-		if (kstatus == klNoErr) {
-			KLDisposeString (princName);
-			KLDisposePrincipal (princ);
-		}
+
 	}
 		
 }