* Replaced all the "centered 99% tables" with 100% width tables wrapped
[citadel.git] / webcit / auth.c
index 2262fd189d0b0be081cf510f96302c6db15adf82..1f2a62d1b0cee1dac59d133614ee24247b2358b0 100644 (file)
@@ -1,23 +1,34 @@
 /*
- * auth.c
+ * $Id$
  *
- * This file contains code which relates to authentication of users to Citadel.
+ * Handles authentication of users to a Citadel server.
  *
- * $Id$
  */
 
+
+#include <ctype.h>
 #include <stdlib.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <stdio.h>
-#include <ctype.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <limits.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include <string.h>
+#include <pwd.h>
 #include <errno.h>
+#include <stdarg.h>
+#include <pthread.h>
+#include <signal.h>
 #include "webcit.h"
-#include "child.h"
 
-char *axdefs[] = {
+char *axdefs[] =
+{
        "Deleted",
        "New User",
        "Problem User",
@@ -25,259 +36,269 @@ char *axdefs[] = {
        "Network User",
        "Preferred User",
        "Aide"
-       };
+};
 
 /*
  * Display the login screen
  */
-void display_login(char *mesg) {
-       char buf[256];
-
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+void display_login(char *mesg)
+{
+       char buf[SIZ];
 
-       /* Da banner */
-       wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
-       wprintf("<IMG SRC=\"/image&name=hello\">");
-       wprintf("</TD><TD><CENTER>\n");
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       //wprintf("<div id=\"content\">\n");
+       wprintf("<div>\n");
 
-       if (mesg != NULL) {
-               wprintf("<font size=+1><b>%s</b></font>", mesg);
-               }
-       else {
-               serv_puts("MESG hello");
-               serv_gets(buf);
-               if (buf[0]=='1') fmout(NULL);
-               }
+       if (mesg != NULL) if (strlen(mesg) > 0) {
+               stresc(buf, mesg, 0, 0);
+               svprintf("mesg", WCS_STRING, "%s", buf);
+       }
 
-       wprintf("</CENTER></TD></TR></TABLE></CENTER>\n");
-       wprintf("<HR>\n");
-
-       /* Da login box */
-       wprintf("<CENTER><FORM ACTION=\"/login\" METHOD=\"POST\">\n");
-       wprintf("<TABLE border><TR>\n");
-       wprintf("<TD>User Name:</TD>\n");
-       wprintf("<TD><INPUT TYPE=\"text\" NAME=\"name\" MAXLENGTH=\"25\">\n");
-       wprintf("</TD></TR><TR>\n");
-       wprintf("<TD>Password:</TD>\n");
-       wprintf("<TD><INPUT TYPE=\"password\" NAME=\"pass\" MAXLENGTH=\"20\"></TD>\n");
-       wprintf("</TR></TABLE>\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Login\">\n");
-        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"New User\">\n");
-        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Exit\">\n");
-        wprintf("</FORM></CENTER>\n");
-
-       /* Da instructions */
-       wprintf("<LI><EM>If you already have an account on %s,",
+       svprintf("hello", WCS_SERVCMD, "MESG hello");
+       svprintf("BOXTITLE", WCS_STRING, "%s - powered by Citadel",
                serv_info.serv_humannode);
-       wprintf("</EM> enter your user name\n");
-       wprintf("and password and click \"<TT>Login</TT>.\"<BR>\n");
-       wprintf("<LI><EM>If you are a new user,</EM>\n");
-       wprintf("enter the name and password you wish to use, and click\n");
-       wprintf("\"New User.\"<BR><LI>");
-       wprintf("<EM>Please log off properly when finished.</EM>");
-       wprintf("<LI>You must use a browser that supports <i>frames</i> ");
-       wprintf("and <i>cookies</i>.\n");
-       wprintf("</EM></UL>\n");
-
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
-       }
+
+       do_template("login");
+
+       wDumpContent(2);
+}
 
 
 
 
 /*
- * This function needs to get called whenever a PASS or NEWU succeeds.
+ * This function needs to get called whenever the session changes from
+ * not-logged-in to logged-in, either by an explicit login by the user or
+ * by a timed-out session automatically re-establishing with a little help
+ * from the browser cookie.  Either way, we need to load access controls and
+ * preferences from the server.
  */
-void become_logged_in(char *user, char *pass, char *serv_response) {
-       logged_in = 1;
-       extract(wc_username, &serv_response[4], 0);
-       strcpy(wc_password, pass);
-       axlevel = extract_int(&serv_response[4], 1);
-       if (axlevel >=6) is_aide = 1;
+void become_logged_in(char *user, char *pass, char *serv_response)
+{
+       char buf[SIZ];
+
+       WC->logged_in = 1;
+       extract(WC->wc_username, &serv_response[4], 0);
+       strcpy(WC->wc_password, pass);
+       WC->axlevel = extract_int(&serv_response[4], 1);
+       if (WC->axlevel >= 6) {
+               WC->is_aide = 1;
        }
 
+       load_preferences();
 
-void do_login(void) {
-       char buf[256];
-       int need_regi = 0;
+       serv_puts("CHEK");
+       serv_gets(buf);
+       if (buf[0] == '2') {
+               WC->new_mail = extract_int(&buf[4], 0);
+               WC->need_regi = extract_int(&buf[4], 1);
+               WC->need_vali = extract_int(&buf[4], 2);
+               extract(WC->cs_inet_email, &buf[4], 3);
+       }
+}
+
+
+void do_login(void)
+{
+       char buf[SIZ];
 
        if (!strcasecmp(bstr("action"), "Exit")) {
                do_logout();
-               }
-
+               return;
+       }
        if (!strcasecmp(bstr("action"), "Login")) {
                serv_printf("USER %s", bstr("name"));
                serv_gets(buf);
-               if (buf[0]=='3') {
+               if (buf[0] == '3') {
                        serv_printf("PASS %s", bstr("pass"));
                        serv_gets(buf);
-                       if (buf[0]=='2') {
+                       if (buf[0] == '2') {
                                become_logged_in(bstr("name"),
-                                       bstr("pass"), buf);
-                               }
-                       else {
+                                                bstr("pass"), buf);
+                       } else {
                                display_login(&buf[4]);
                                return;
-                               }
                        }
-               else {
+               else {
                        display_login(&buf[4]);
                        return;
-                       }
                }
-
+       }
        if (!strcasecmp(bstr("action"), "New User")) {
+               if (strlen(bstr("pass")) == 0) {
+                       display_login("Blank passwords are not allowed.");
+                       return;
+               }
                serv_printf("NEWU %s", bstr("name"));
                serv_gets(buf);
-               if (buf[0]=='2') {
+               if (buf[0] == '2') {
                        become_logged_in(bstr("name"), bstr("pass"), buf);
                        serv_printf("SETP %s", bstr("pass"));
                        serv_gets(buf);
-                       }
-               else {
+               } else {
                        display_login(&buf[4]);
                        return;
-                       }
                }
-
-       if (logged_in) {
-               serv_puts("CHEK");
-               serv_gets(buf);
-               if (buf[0]=='2') {
-                       need_regi = extract_int(&buf[4], 1);
-                       /* FIX also check for new mail etc. here */
-                       }
-               if (need_regi) {
+       }
+       if (WC->logged_in) {
+               if (WC->need_regi) {
                        display_reg(1);
-                       }
-               else {
-                       output_static("frameset.html");
-                       }
+               } else {
+                       do_welcome();
                }
-       else {
+       else {
                display_login("Your password was not accepted.");
-               }
-
        }
 
-void do_welcome(void) {
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
-       wprintf("<CENTER><H1>");
-       escputs(wc_username);
-       wprintf("</H1>\n");
-       /* FIX add user stats here */
-
-       wprintf("<HR>");
-       /* FIX  ---  what should we put here?  the main menu,
-        * or new messages in the lobby?
-        */
-       embed_main_menu();
-
-       wprintf("</BODY></HTML>\n");
-       wDumpContent();
+}
+
+void do_welcome(void)
+{
+       char startpage[SIZ];
+
+       get_preference("startpage", startpage);
+       if (strlen(startpage)==0) {
+               strcpy(startpage, "/dotskip&room=_BASEROOM_");
+               set_preference("startpage", startpage);
        }
 
+       http_redirect(startpage);
+}
 
-void do_logout(void) {
-       char buf[256];
 
-       strcpy(wc_username, "");
-       strcpy(wc_password, "");
-       strcpy(wc_roomname, "");
+/*
+ * Disconnect from the Citadel server, and end this WebCit session
+ */
+void end_webcit_session(void) {
+       serv_puts("QUIT");
+       WC->killthis = 1;
+       /* close() of citadel socket will be done by do_housekeeping() */
+}
 
-       printf("HTTP/1.0 200 OK\n");
-       printf("X-WebCit-Session: close\n");
-       output_headers(1);
 
-       wprintf("<CENTER>");    
-       serv_puts("MESG goodbye");
-       serv_gets(buf);
+void do_logout(void)
+{
+       char buf[SIZ];
 
-       if (buf[0]=='1') fmout(NULL);
-       else wprintf("Goodbye\n");
+       strcpy(WC->wc_username, "");
+       strcpy(WC->wc_password, "");
+       strcpy(WC->wc_roomname, "");
 
-       wprintf("<HR><A HREF=\"/\">Log in again</A>\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
-       serv_puts("QUIT");
-       exit(0);
-       }
+       /* Calling output_headers() this way causes the cookies to be un-set */
+       output_headers(1, 1, 0, 1, 0, 0, 0);
 
+       wprintf("<center>");
+       serv_puts("MESG goodbye");
+       serv_gets(buf);
 
+       if (WC->serv_sock >= 0) {
+               if (buf[0] == '1') {
+                       fmout(NULL, "CENTER");
+               } else {
+                       wprintf("Goodbye\n");
+               }
+       }
+       else {
+               wprintf("This program was unable to connect or stay "
+                       "connected to the Citadel server.  Please report "
+                       "this problem to your system administrator."
+               );
+       }
 
+       wprintf("<hr /><a href=\"/\">Log in again</A>&nbsp;&nbsp;&nbsp;"
+               "<a href=\"javascript:window.close();\">Close window</A>"
+               "</center>\n");
+       wDumpContent(2);
+       end_webcit_session();
+}
 
 
 /* 
  * validate new users
  */
-void validate(void) {
-       char cmd[256];
-       char user[256];
-       char buf[256];
+void validate(void)
+{
+       char cmd[SIZ];
+       char user[SIZ];
+       char buf[SIZ];
        int a;
 
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
-
-       strcpy(buf,bstr("user"));
-       if (strlen(buf)>0) if (strlen(bstr("axlevel"))>0) {
-               serv_printf("VALI %s|%s",buf,bstr("axlevel"));
-               serv_gets(buf);
-               if (buf[0]!='2') {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Validate new users</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+                                                                                                                            
+       strcpy(buf, bstr("user"));
+       if (strlen(buf) > 0)
+               if (strlen(bstr("axlevel")) > 0) {
+                       serv_printf("VALI %s|%s", buf, bstr("axlevel"));
+                       serv_gets(buf);
+                       if (buf[0] != '2') {
+                               wprintf("<b>%s</b><br />\n", &buf[4]);
                        }
                }
-       
        serv_puts("GNUR");
        serv_gets(buf);
 
-       if (buf[0]!='3') {
-               wprintf("<EM>%s</EM><BR></BODY></HTML>\n", &buf[4]);
-               wDumpContent();
+       if (buf[0] != '3') {
+               wprintf("<b>%s</b><br />\n", &buf[4]);
+               wDumpContent(1);
                return;
-               }
+       }
+
+       wprintf("<div style=\"margin-right:1px\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+       wprintf("<center>");
 
-       strcpy(user,&buf[4]);
-       serv_printf("GREG %s",user);
+       strcpy(user, &buf[4]);
+       serv_printf("GREG %s", user);
        serv_gets(cmd);
-       if (cmd[0]=='1') {
+       if (cmd[0] == '1') {
                a = 0;
                do {
                        serv_gets(buf);
                        ++a;
-                       if (a==1) wprintf("User #%s<BR><H1>%s</H1>",
-                               buf,&cmd[4]);
-                       if (a==2) wprintf("PW: %s<BR>\n",buf);
-                       if (a==3) wprintf("%s<BR>\n",buf);
-                       if (a==4) wprintf("%s<BR>\n",buf);
-                       if (a==5) wprintf("%s, ",buf);
-                       if (a==6) wprintf("%s ",buf);
-                       if (a==7) wprintf("%s<BR>\n",buf);
-                       if (a==8) wprintf("%s<BR>\n",buf);
-                       if (a==9) wprintf("Current access level: %d (%s)\n",
-                               atoi(buf),axdefs[atoi(buf)]);
-                       } while(strcmp(buf,"000"));
-               }
-       else {
-               wprintf("<H1>%s</H1>%s<BR>\n",user,&cmd[4]);
-               }
-
-       wprintf("<CENTER><TABLE border><CAPTION>Select access level:");
-       wprintf("</CAPTION><TR>");
-       for (a=0; a<=6; ++a) {
-               wprintf(
-               "<TD><A HREF=\"/validate&user=%s&axlevel=%d\">%s</A></TD>\n",
-                       urlesc(user), a, axdefs[a]);
-               }
-       wprintf("</TR></TABLE><CENTER><BR>\n");
-       wDumpContent();
+                       if (a == 1)
+                               wprintf("User #%s<br /><H1>%s</H1>",
+                                       buf, &cmd[4]);
+                       if (a == 2)
+                               wprintf("PW: %s<br />\n", buf);
+                       if (a == 3)
+                               wprintf("%s<br />\n", buf);
+                       if (a == 4)
+                               wprintf("%s<br />\n", buf);
+                       if (a == 5)
+                               wprintf("%s, ", buf);
+                       if (a == 6)
+                               wprintf("%s ", buf);
+                       if (a == 7)
+                               wprintf("%s<br />\n", buf);
+                       if (a == 8)
+                               wprintf("%s<br />\n", buf);
+                       if (a == 9)
+                               wprintf("Current access level: %d (%s)\n",
+                                       atoi(buf), axdefs[atoi(buf)]);
+               } while (strcmp(buf, "000"));
+       } else {
+               wprintf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
        }
 
+       wprintf("<hr />Select access level for this user:<br />\n");
+       for (a = 0; a <= 6; ++a) {
+               wprintf("<A HREF=\"/validate&user=");
+               urlescputs(user);
+               wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
+                       a, axdefs[a]);
+       }
+       wprintf("<br />\n");
 
-
+       wprintf("</CENTER>\n");
+       wprintf("</td></tr></table></div>\n");
+       wDumpContent(1);
+}
 
 
 
@@ -286,98 +307,31 @@ void validate(void) {
  * (Set during_login to 1 if this registration is being performed during
  * new user login and will require chaining to the proper screen.)
  */
-void display_reg(int during_login) {
-       char buf[256];
-       int a;
-
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+void display_reg(int during_login)
+{
+       long vcard_msgnum;
 
-        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-        wprintf("<B>Enter registration info</B>\n");
-        wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
-       serv_puts("MESG register");
-       serv_gets(buf);
-       if (buf[0]=='1') fmout(NULL);
-
-       wprintf("<FORM ACTION=\"/register\" METHOD=\"POST\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"during_login\" VALUE=\"%d\">\n", during_login);
-
-       serv_puts("GREG _SELF_");
-       serv_gets(buf);
-       if (buf[0]!='1') {
-               wprintf("<EM>%s</EM><BR>\n",&buf[4]);
-               }
-       else {
-       
-               wprintf("<H1>%s</H1><TABLE border>\n",&buf[4]);
-               a = 0;
-               while (serv_gets(buf), strcmp(buf,"000")) {
-                       ++a;
-                       wprintf("<TR><TD>");
-                       switch(a) {
-                               case 3: wprintf("Real Name:</TD><TD><INPUT TYPE=\"text\" NAME=\"realname\" VALUE=\"%s\" MAXLENGTH=\"29\"><BR>\n",buf);
-                                       break;
-                               case 4: wprintf("Street Address:</TD><TD><INPUT TYPE=\"text\" NAME=\"address\" VALUE=\"%s\" MAXLENGTH=\"24\"><BR>\n",buf);
-                                       break;
-                               case 5: wprintf("City/town:</TD><TD><INPUT TYPE=\"text\" NAME=\"city\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n",buf);
-                                       break;
-                               case 6: wprintf("State/province:</TD><TD><INPUT TYPE=\"text\" NAME=\"state\" VALUE=\"%s\" MAXLENGTH=\"2\"><BR>\n",buf);
-                                       break;
-                               case 7: wprintf("ZIP code:</TD><TD><INPUT TYPE=\"text\" NAME=\"zip\" VALUE=\"%s\" MAXLENGTH=\"10\"><BR>\n",buf);
-                                       break;
-                               case 8: wprintf("Telephone:</TD><TD><INPUT TYPE=\"text\" NAME=\"phone\" VALUE=\"%s\" MAXLENGTH=\"14\"><BR>\n",buf);
-                                       break;
-                               case 9: wprintf("E-Mail:</TD><TD><INPUT TYPE=\"text\" NAME=\"email\" VALUE=\"%s\" MAXLENGTH=\"31\"><BR>\n",buf);
-                                       break;
-                               }
-                       wprintf("</TD></TR>\n");
-                       }
-               wprintf("</TABLE><P>");
-               }
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Register\">\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
+       if (goto_config_room() != 0) {
+               if (during_login) do_welcome();
+               else display_main_menu();
+               return;
        }
 
-/*
- * register
- */
-void register_user(void) {
-       char buf[256];
-       
-       if (strcmp(bstr("action"),"Register")) {
-               display_error("Cancelled.  Registration was not saved.");
+       vcard_msgnum = locate_user_vcard(WC->wc_username, -1);
+       if (vcard_msgnum < 0L) {
+               if (during_login) do_welcome();
+               else display_main_menu();
                return;
-               }
-
-       serv_puts("REGI");
-       serv_gets(buf);
-       if (buf[0]!='4') {
-               display_error(&buf[4]);
-               }
+       }
 
-       serv_puts(bstr("realname"));
-       serv_puts(bstr("address"));
-       serv_puts(bstr("city"));
-       serv_puts(bstr("state"));
-       serv_puts(bstr("zip"));
-       serv_puts(bstr("phone"));
-       serv_puts(bstr("email"));
-       serv_puts("000");
-       
-       if (atoi(bstr("during_login"))) {
-               output_static("frameset.html");
-               }
+       if (during_login) {
+               do_edit_vcard(vcard_msgnum, "1", "/do_welcome");
+       }
        else {
-               display_error("Registration information has been saved.");
-               }
+               do_edit_vcard(vcard_msgnum, "1", "/display_main_menu");
        }
 
+}
 
 
 
@@ -385,56 +339,93 @@ void register_user(void) {
 /* 
  * display form for changing your password
  */
-void display_changepw(void) {
-       char buf[256];
-
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+void display_changepw(void)
+{
+       char buf[SIZ];
+
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Change your password</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       if (strlen(WC->ImportantMessage) > 0) {
+               do_template("beginbox_nt");
+               wprintf("<SPAN CLASS=\"errormsg\">"
+                       "%s</SPAN><br />\n", WC->ImportantMessage);
+               do_template("endbox");
+               strcpy(WC->ImportantMessage, "");
+       }
 
-        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-        wprintf("<B>Change your password</B>\n");
-        wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<div style=\"margin-right:1px\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
-       wprintf("<CENTER>");
+       wprintf("<CENTER><br />");
        serv_puts("MESG changepw");
        serv_gets(buf);
-       if (buf[0]=='1') fmout(NULL);
+       if (buf[0] == '1') {
+               fmout(NULL, "CENTER");
+       }
 
-       wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
-       wprintf("<CENTER><TABLE border><TR><TD>Enter new password:</TD>\n");
+       wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
+       wprintf("<CENTER>"
+               "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
+               "BGCOLOR=\"#EEEEEE\">"
+               "<TR><TD>Enter new password:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
        wprintf("<TR><TD>Enter it again to confirm:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-       wprintf("</TABLE>\n");  
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
-       wprintf("</CENTER></BODY></HTML>\n");
-       wDumpContent();
-       }
+
+       wprintf("</TABLE><br />\n");
+       wprintf("<INPUT type=\"submit\" name=\"action\" value=\"Change\">"
+               "&nbsp;"
+               "<INPUT type=\"submit\" name=\"action\" value=\"Cancel\">\n");
+       wprintf("</form></center>\n");
+       wprintf("</td></tr></table></div>\n");
+       wDumpContent(1);
+}
 
 /*
  * change password
  */
-void changepw(void) {
-       char buf[256];
+void changepw(void)
+{
+       char buf[SIZ];
        char newpass1[32], newpass2[32];
-       
-       if (strcmp(bstr("action"),"Change")) {
-               display_error("Cancelled.  Password was not changed.");
+
+       if (strcmp(bstr("action"), "Change")) {
+               strcpy(WC->ImportantMessage, 
+                       "Cancelled.  Password was not changed.");
+               display_main_menu();
                return;
-               }
+       }
 
        strcpy(newpass1, bstr("newpass1"));
        strcpy(newpass2, bstr("newpass2"));
 
        if (strcasecmp(newpass1, newpass2)) {
-               display_error("They don't match.  Password was not changed.");
+               strcpy(WC->ImportantMessage, 
+                       "They don't match.  Password was not changed.");
+               display_changepw();
                return;
-               }
+       }
+
+       if (strlen(newpass1) == 0) {
+               strcpy(WC->ImportantMessage, 
+                       "Blank passwords are not allowed.");
+               display_changepw();
+               return;
+       }
 
        serv_printf("SETP %s", newpass1);
        serv_gets(buf);
-       if (buf[0]=='2') display_success(&buf[4]);
-       else display_error(&buf[4]);
+       sprintf(WC->ImportantMessage, "%s", &buf[4]);
+       if (buf[0] == '2') {
+               display_main_menu();
+       }
+       else {
+               display_changepw();
        }
+}