From 9c5f5770023b2dc07ffaa2f6cdcab365b6306894 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Mon, 14 Sep 2015 09:33:06 -0400
Subject: [PATCH] Don't use SASL on an unknown network

https://bugzilla.redhat.com/show_bug.cgi?id=1262763
---
 src/common/outbound.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/outbound.c b/src/common/outbound.c
index ac274a87..a4611927 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3413,8 +3413,9 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 			safe_strcpy (serv->password, net->pass, sizeof (serv->password));
 			serv->loginmethod = net->logintype;
 		}
-		else /* Otherwise ensure no password is sent */
+		else /* Otherwise ensure no password is sent or SASL started */
 		{
+			serv->loginmethod = LOGIN_DEFAULT;
 			serv->password[0] = 0;
 		}
 	}