handle null usernames

(This used to be commit ee60d9a289f8d94f8e4d8405f7b41690b891bbb1)

1 files changed, 5 insertions, 8 deletions

diff --git a/source3/web/swat.c b/source3/web/swat.c
index f5c8e286cd..a1e56e9389 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -661,7 +661,7 @@ static void chg_passwd(void)
 ****************************************************************************/
 static void passwd_page(void)
 {
-	char *new_name;
+	char *new_name = get_user_name();
 
 	printf("<H2>Password Manager</H2>\n");
 
@@ -673,14 +673,11 @@ static void passwd_page(void)
 	 * After the first time through here be nice. If the user
 	 * changed the User box text to another users name, remember it.
 	 */
-	if (cgi_variable(USER) && 
-	    (strcmp(cgi_variable(USER), get_user_name()))) {
-		/* User is changing another accounts passwd */
+	if (cgi_variable(USER)) {
 		new_name = cgi_variable(USER);
-	} else {
-		/* User is changing there own passwd */
-		new_name = get_user_name();
-	}
+	} 
+
+	if (!new_name) new_name = "";
 
 	printf("<p> User Name        : <input type=text size=30 name=%s value=%s> \n", 
 	       USER, new_name);