6f78d6e52b
This is a partial revert of 57a669d35dc70d21be0b799e893535fc26d95c6d which added SASL auth support but in the process removed normal auth. In order to support OFTC which doesn't currentl do SASL we add back in normal auth support while keeping SASL for OFTC should they add the functionality. Change-Id: I191ced962e91226d196e6fae728484d8cd7233e2