github/santa
1
1
Fork 0
mirror of https://github.com/google/santa.git synced 2026-04-24 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

SNTConfigurator: Fix broken MachineID/MachineOwner parsing

Browse Source
This commit is contained in:
Russell Hancox
2015-03-31 17:26:02 -04:00
parent 16531d18c8
commit 8096701fbd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/common/SNTConfigurator.m
View File

@@ -109,17 +109,19 @@ static NSString * const kMachineIDPlistKeyKey = @"MachineIDKey";
}
- (NSString *)machineOwner {
NSString *machineOwner = @"";
if (self.configData[kMachineOwnerPlistFileKey] && self.configData[kMachineOwnerPlistKeyKey]) {
NSDictionary *plist =
[NSDictionary dictionaryWithContentsOfFile:self.configData[kMachineOwnerPlistFileKey]];
return plist[self.configData[kMachineOwnerPlistKeyKey]];
machineOwner = plist[self.configData[kMachineOwnerPlistKeyKey]];
}
if (self.configData[kMachineOwnerKey]) {
return self.configData[kMachineOwnerKey];
machineOwner = self.configData[kMachineOwnerKey];
}
return @"";
return machineOwner;
}
- (NSString *)machineID {
@@ -128,7 +130,7 @@ static NSString * const kMachineIDPlistKeyKey = @"MachineIDKey";
if (self.configData[kMachineIDPlistFileKey] && self.configData[kMachineIDPlistKeyKey]) {
NSDictionary *plist =
[NSDictionary dictionaryWithContentsOfFile:self.configData[kMachineIDPlistFileKey]];
machineId = plist[kMachineIDPlistKeyKey];
machineId = plist[self.configData[kMachineIDPlistKeyKey]];
}
if (self.configData[kMachineIDKey]) {