From: Ken Hornstein <kenh@pobox.com>
Date: Wed, 11 Jun 2014 01:08:02 +0000 (-0400)
Subject: Always default the username to the local username, even when not
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/164fc755c40aeb37efe1b330fd0c01b7fa9ce72c?hp=af2971700a5d9fbc9f68c4afca5ba6567e800260

Always default the username to the local username, even when not
doing SASL.  Fix suggested by Michael Urban.
---

diff --git a/sbr/credentials.c b/sbr/credentials.c
index ae53a742..ff4ee84e 100644
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -48,8 +48,8 @@ nmh_get_credentials (char *host, char *user, int sasl, nmh_creds_t creds) {
     creds->host = host;
 
     if (cred_style == NULL  ||  ! strcmp (cred_style, "legacy")) {
+	creds->user = user == NULL  ?  getusername ()  :  user;
         if (sasl) {
-            creds->user = user == NULL  ?  getusername ()  :  user;
 
             /* This is what inc.c and msgchk.c used to contain. */
             /* Only inc.c and msgchk.c do this.  smtp.c doesn't. */