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 ae53a742b9b6ecc0f6bda3a63f2a791d585ce2a3..ff4ee84e03198bf5b9955c06e4bce2b50d2406f0 100644 (file)
--- 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->host = host;
 
     if (cred_style == NULL  ||  ! strcmp (cred_style, "legacy")) {

+       creds->user = user == NULL  ?  getusername ()  :  user;

         if (sasl) {
         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. */
 
             /* This is what inc.c and msgchk.c used to contain. */
             /* Only inc.c and msgchk.c do this.  smtp.c doesn't. */