Don't use SASL when NickServ password is empty

rolandwalker · May 6, 2014 · 9aba935 · 9aba935
1 parent f84ccbc
commit 9aba935
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Classes/Dialogs/ServerDialog.m b/Classes/Dialogs/ServerDialog.m
@@ -130,7 +130,12 @@ - (void)save
     _config.username = _usernameText.stringValue;
     _config.realName = _realNameText.stringValue;
     _config.nickPassword = _nickPasswordText.stringValue;
-    _config.useSASL = _saslCheck.state;
+    if (_config.nickPassword.length > 0) {
+        _config.useSASL = _saslCheck.state;
+    }
+    else {
+        _config.useSASL = NO;
+    }
 
     NSArray* nicks = [_altNicksText.stringValue componentsSeparatedByString:@" "];
     [_config.altNicks removeAllObjects];

diff --git a/Classes/IRC/IRCClientConfig.m b/Classes/IRC/IRCClientConfig.m
@@ -70,7 +70,9 @@ - (id)initWithDictionary:(NSDictionary*)dic
         _username = [dic stringForKey:@"username"] ?: @"";
         _realName = [dic stringForKey:@"realname"] ?: @"";
         _nickPassword = [dic stringForKey:@"nickPassword"] ?: [Keychain genericPasswordWithAccountName:[self nickPasswordKey] serviceName:[self keychainServiceName]] ?: @"";
-        _useSASL = [dic boolForKey:@"useSASL"];
+        if (_nickPassword.length > 0) {
+            _useSASL = [dic boolForKey:@"useSASL"];
+        }
         [_altNicks addObjectsFromArray:[dic arrayForKey:@"alt_nicks"]];
 
         _proxyType = [dic intForKey:@"proxy"];