Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / sbr / ruserpass.c

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index a55f68031b60006562a6874e4c33bd1a21617b3b..7038cf5ce4ac87a2f15e0ce8150c5d24343c9c2d 100644 (file)
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -152,7 +152,7 @@ ruserpass(char *host, char **aname, char **apass)
            advise ("tmp", "fgets");
        }
        tmp[strlen(tmp) - 1] = '\0';
            advise ("tmp", "fgets");
        }
        tmp[strlen(tmp) - 1] = '\0';

-       if (*tmp != '\0') {
+       if (*tmp != '\0' || myname == NULL) {

            myname = tmp;
        }
 
            myname = tmp;
        }