macos: update AFS prefs pane
[openafs.git] / src / platform / DARWIN / AFSPreference / AFSPropertyManager.m
index 559a216..e96fc74 100644 (file)
@@ -92,7 +92,6 @@
        if(cellList) {[cellList removeAllObjects];[cellList release];}
        if(cellName) {[cellName release];}
        if(futil) {
-               [futil endAutorization];
                [futil release];
                futil = nil; 
        }
                [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];
 //  readCacheInfo:
 //  file template "/afs:/var/db/openafs/cache:30000"
 // -------------------------------------------------------------------------------
--(void) readCacheInfo:(NSString*)filePath
+-(int) readCacheInfo:(NSString*)filePath
 {
        int cicle = 0;
        NSString *tmpString = nil;
        
        NSCharacterSet *returnCS = [NSCharacterSet characterSetWithCharactersInString:@"\n"];
        NSFileHandle *fileH = [NSFileHandle fileHandleForReadingAtPath:filePath];
+       if (!fileH) return 0;
        NSData *fileHData = [fileH readDataToEndOfFile];
        NSString *cacheInfoStrData = [[NSString alloc] initWithData:fileHData
                                                                                                           encoding:NSASCIIStringEncoding];
                //if(cacheInfoStrData) [cacheInfoStrData release];
                if(chunkStartCS) [chunkStartCS release];
        }
-       
+       return noErr;
 }
 
 
 {
        @try{
                if(useAfsdConfVersion) {
-                       [self readNewAfsdOption:filePath];
-               } else {
+                   if ([self readNewAfsdOption:filePath] != noErr)
                        [self readOldAfsdOption:filePath];
+               } else {
+                   if ([self readOldAfsdOption:filePath] != noErr)
+                       [self readNewAfsdOption:filePath];
                }
        
        }@catch(NSException *e){
 // -------------------------------------------------------------------------------
 //  readOldAfsdOption:
 // -------------------------------------------------------------------------------
--(void) readOldAfsdOption:(NSString*)filePath
+-(int) readOldAfsdOption:(NSString*)filePath
 {
-
-       /*NSFileHandle *fileH = [NSFileHandle fileHandleForReadingAtPath:filePath];
-       NSData *fileHData = [fileH readDataToEndOfFile];
-       NSString *afsdOptionStrData = [[NSString alloc] initWithData:fileHData
-                                                                                                               encoding:NSASCIIStringEncoding];*/
-       if(!filePath) return;
-       [self readAFSDParamLineContent:[[NSString stringWithContentsOfFile:filePath 
+       if(!filePath) return 0;
+       return [self readAFSDParamLineContent:[[NSString stringWithContentsOfFile:filePath 
                                                                                                                          encoding:NSUTF8StringEncoding 
                                                                                                                                 error:nil] stringByStandardizingPath]];
 }
 // -------------------------------------------------------------------------------
 //  readAFSDParamLineContent:
 // -------------------------------------------------------------------------------
--(void) readAFSDParamLineContent:(NSString*) paramLine{
+-(int) readAFSDParamLineContent:(NSString*) paramLine{
+       if (!paramLine) return 0;
+
        NSString *tmpString = nil;
        NSCharacterSet *space = [NSCharacterSet characterSetWithCharactersInString:@" "];
        NSScanner *afsdOptionS = [NSScanner  scannerWithString:paramLine];
                
                
        }while(![afsdOptionS isAtEnd]);
-       
+       return noErr;
 }
 
 // -------------------------------------------------------------------------------
 //  readNewAfsdOption:
 // -------------------------------------------------------------------------------
--(void) readNewAfsdOption:(NSString*)filePath
+-(int) readNewAfsdOption:(NSString*)filePath
 {
-       if(!filePath) return;
-       NSString *currentLines = nil;
-       NSString *paramValue = nil;
-       NSScanner *lineScanner = nil;
+       if(!filePath) return 0;
+       NSString *currentLines = 0;
+       NSString *paramValue = 0;
+       NSScanner *lineScanner = 0;
        
        //Get file content
        NSString *newAFSDConfContent = [NSString stringWithContentsOfFile:filePath 
                                                                                                                         encoding:NSUTF8StringEncoding 
                                                                                                                                error:nil];
+       if (!newAFSDConfContent) return 0;
        
        //get lines in array
        NSArray *confLines = [newAFSDConfContent componentsSeparatedByString:@"\n"];
                        
                }
        }
+       return noErr;
 }
 
 
 {
        NSString *tmpString = nil;
        NSString *result = [TaskUtil executeTaskSearchingPath:@"fs" args:[NSArray arrayWithObjects:@"-version", nil]];
+       if (!result) return nil;
        NSCharacterSet *endVersionCS = [NSCharacterSet characterSetWithCharactersInString:@"qwertyuiopasdfghjklzxcvbnmMNBVCXZLKJHGFDSAPOIUYTREWQ"];
        NSCharacterSet *spaceCS = [NSCharacterSet characterSetWithCharactersInString:@" "];
        NSScanner *versionS = [NSScanner  scannerWithString:result];
 {
        NSString *tmpString = nil;
        NSString *totalVersion = [self getAfsVersion];
+       if (!totalVersion) return 0;
        NSCharacterSet *pointCS = [NSCharacterSet characterSetWithCharactersInString:@"."];
        NSScanner *versionMS = [NSScanner  scannerWithString:totalVersion];
        [versionMS scanUpToCharactersFromSet:pointCS intoString:&tmpString];
 {
        NSString *tmpString = nil;
        NSString *totalVersion = [self getAfsVersion];
+       if (!totalVersion) return 0;
        NSCharacterSet *numCS = [NSCharacterSet characterSetWithCharactersInString:@"1234567890"];
        NSCharacterSet *pointCS = [NSCharacterSet characterSetWithCharactersInString:@"."];
        NSScanner *versionMS = [NSScanner  scannerWithString:totalVersion];
 -(int) getAfsPatchVersionVersion
 {
        NSString *totalVersion = [self getAfsVersion];
+       if (!totalVersion) return 0;
        NSCharacterSet *pointCS = [NSCharacterSet characterSetWithCharactersInString:@"."];
        int lastPointIndex = [totalVersion rangeOfCharacterFromSet:pointCS 
                                                                                                           options:NSBackwardsSearch].location;
                @throw [NSException exceptionWithName:@"readCellInfo" 
                                                                           reason:kConfFileNotExits
                                                                         userInfo:nil];
-       }
+       } else if (!result)
+           return;
        NSScanner *scanner = [NSScanner scannerWithString:result];
        [scanner scanUpToString:@"\n" 
                                 intoString:&tmpStr];
        NSCharacterSet *spaceCS = [NSCharacterSet characterSetWithCharactersInString:@" \t"];
        
        NSFileHandle *fileH = [NSFileHandle fileHandleForReadingAtPath:configFile];
+       if (!fileH) return;
        NSData *dbCellData = [fileH readDataToEndOfFile];
        NSString *strData = [[NSString alloc] initWithData:dbCellData
                                                                                          encoding:NSASCIIStringEncoding];
 //  scanIpForCell:
 // -------------------------------------------------------------------------------
 -(void) scanIpForCell:(DBCellElement*) cellElement allIP:(NSString*)allIP {
+    if (!allIP) return;
        NSScanner *ipScann = [NSScanner scannerWithString:allIP];
        NSCharacterSet *returnCS = [NSCharacterSet characterSetWithCharactersInString:@"\n"];
        NSCharacterSet *spaceCS = [NSCharacterSet characterSetWithCharactersInString:@" \t"];
        NSMutableArray *tokenList = [[NSMutableArray alloc] init];
        NSString *tokensOutput = [TaskUtil executeTaskSearchingPath:@"tokens" args:[NSArray arrayWithObjects:nil]];
        
-       // scann the tokens
+       if (!tokensOutput) return tokenList;
+       // scan the tokens
        NSScanner *tokenScan = [NSScanner scannerWithString:tokensOutput];
        NSCharacterSet *returnCS = [NSCharacterSet characterSetWithCharactersInString:@"\n"];
        
 // -------------------------------------------------------------------------------
 -(void) shutdown
 {
-       @try {
-               const char *stopArgs[] = {"stop", 0L};
-               if([[AuthUtil shared] autorize] == noErr) {
-                       [[AuthUtil shared] execUnixCommand:AFS_DAEMON_STARTUPSCRIPT
-                                                                                 args:stopArgs
-                                                                               output:nil];
-               }
-
-       }
-       @catch (NSException * e) {
-               @throw e;
-       }
-       @finally {
-       
-       }
-       
-       
+  NSString *rootHelperApp = [[NSBundle bundleForClass:[self class]] pathForResource:@"afshlp" ofType:@""];
+    @try {
+       const char *stopArgs[] = {AFS_DAEMON_STARTUPSCRIPT, "stop", 0L};
+       [[AuthUtil shared] execUnixCommand:[rootHelperApp fileSystemRepresentation]
+                          args:stopArgs
+                          output:nil];
+    }
+    @catch (NSException * e) {
+       @throw e;
+    }
+    @finally {
+    }
 }
 
 
 // -------------------------------------------------------------------------------
 -(void) startup
 {
-       @try {
-               const char *startArgs[] = {"start", 0L};
-               if([[AuthUtil shared] autorize] == noErr) {
-                       [[AuthUtil shared] execUnixCommand:AFS_DAEMON_STARTUPSCRIPT
-                                                                                 args:startArgs
-                                                                               output:nil];
-               }
-
-       }
-       @catch (NSException * e) {
-               @throw e;
-       }
-       @finally {
-
-       }
-
-
+  NSString *rootHelperApp = [[NSBundle bundleForClass:[self class]] pathForResource:@"afshlp" ofType:@""];
+    @try {
+       const char *startArgs[] = {AFS_DAEMON_STARTUPSCRIPT, "start", 0L};
+       [[AuthUtil shared] execUnixCommand:[rootHelperApp fileSystemRepresentation]
+                          args:startArgs
+                          output:nil];
+    }
+    @catch (NSException * e) {
+       @throw e;
+    }
+    @finally {
+    }
 }
+
 // -------------------------------------------------------------------------------
 //  -(void) saveConfigurationFiles
 // -------------------------------------------------------------------------------
                                                         encoding:  NSUTF8StringEncoding 
                                                                error:&err];
                
-               // backup original file
-               if([futil startAutorization] != noErr){
-                       @throw [NSException exceptionWithName:@"saveConfigurationFiles:startAutorization" 
-                                                                                  reason:kUserNotAuth
-                                                                                userInfo:nil];
-               }
-
                if(makeBackup) [self backupConfigurationFiles];
 
                // install ThisCell
                [self writeAfsdOption:useAfsdConfVersion?AFSD_TMP_NEW_PREFERENCE_FILE:AFSD_TMP_OLD_PREFERENCE_FILE];
                
                // backup original file
-               if([futil startAutorization] != noErr){
-                       @throw [NSException exceptionWithName:@"AFSPropertyManager:saveCacheConfigurationFiles:startAutorization" 
-                                                                                  reason:kUserNotAuth
-                                                                                userInfo:nil];
-               }
-               
                if(makeBackup) {
                        //cacheinfo
                        [self backupFile:@"/etc/cacheinfo"];
 {      
 
        @try{
-               if([futil startAutorization] != noErr){
-                       @throw [NSException exceptionWithName:@"backupConfigurationFiles:startAutorization" 
-                                                                                  reason:kUserNotAuth
-                                                                                userInfo:nil];
-               }
                //This cell
                [self backupFile:@"/etc/ThisCell"];
        
                //TheseCell
                [self backupFile:@"/etc/TheseCells"];
                
-               //[futil endAutorization];
        } @catch (NSException *e) {
                @throw e;
        } @finally {
                
                //Check if the file at path exist
                NSFileManager *fileManager = [NSFileManager defaultManager];
-               
-               //check if th efile exist
                if(![fileManager fileExistsAtPath:[filePath stringByExpandingTildeInPath]]) return;
                
                // store the source path