Guarding against nil group name

halo · Nov 10, 2015 · a60146d · a60146d
1 parent dc0c808
commit a60146d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/macosvpn/Classes/VPNServiceConfig.m b/macosvpn/Classes/VPNServiceConfig.m
@@ -134,11 +134,15 @@ - (CFDictionaryRef) ciscoConfig {
   keys[count]   = kSCPropNetIPSecXAuthPasswordEncryption;
   vals[count++] = kSCValNetIPSecXAuthPasswordEncryptionKeychain;
 
-  keys[count]   = kSCPropNetIPSecLocalIdentifier;
-  vals[count++] = (__bridge CFStringRef)self.localIdentifier;
+  if (self.localIdentifier) {
+    DDLogDebug(@"Assigning group name <%@> to cisco service config", self.localIdentifier);
+
+    keys[count]   = kSCPropNetIPSecLocalIdentifier;
+    vals[count++] = (__bridge CFStringRef)self.localIdentifier;
 
-  keys[count]    = kSCPropNetIPSecLocalIdentifierType;
-  vals[count++]  = kSCValNetIPSecLocalIdentifierTypeKeyID;
+    keys[count]    = kSCPropNetIPSecLocalIdentifierType;
+    vals[count++]  = kSCValNetIPSecLocalIdentifierTypeKeyID;
+  }
 
   return CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&vals, count, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 }