summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorTingPing <tngpng@gmail.com>2013-04-22 07:30:33 -0300
committerTingPing <tngpng@gmail.com>2013-04-22 07:30:33 -0300
commit9603248a5bee98ce25a9d6361f3f3f89b3033441 (patch)
treea1229e04f9db39a5c4cb1dc45e334189f5419f0b /src/common
parent4e891102f25515830686f7b43edc907c910611ca (diff)
Fall back to global username for sasl
Diffstat (limited to 'src/common')
-rw-r--r--src/common/servlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/servlist.c b/src/common/servlist.c
index 306b42e8..a87cc719 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -634,11 +634,11 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
 		safe_strcpy (serv->password, net->pass, sizeof (serv->password));
 	}
 
-	if (net->flags & FLAG_USE_GLOBAL)
+	if (net->flags & FLAG_USE_GLOBAL || net->user == NULL)
 	{
 		strcpy (serv->sasluser, prefs.hex_irc_user_name);
 	}
-	else if (net->user != NULL)
+	else
 	{
 		safe_strcpy (serv->sasluser, net->user, sizeof (serv->sasluser));
 	}