* First cut at Solaris fixes. There may still be some *printf("%s", NULL)
[citadel.git] / citadel / citserver.c
index 7343e230d0fe124ee3839ad7e4c58663937608aa..7acaa6701c02032bebdaf6cd44395fa4613b200f 100644 (file)
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include <syslog.h>
 #include <dlfcn.h>
 #include <netdb.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -39,6 +37,7 @@
 #include "tools.h"
 
 struct CitContext *ContextList = NULL;
+char *unique_session_numbers;
 int ScheduledShutdown = 0;
 int do_defrag = 0;
 
@@ -56,9 +55,10 @@ void master_startup(void) {
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
-       create_room(BASEROOM, 0, "", 0);
-       create_room(AIDEROOM, 4, "", 0);
-       create_room(config.c_twitroom, 0, "", 0);
+       create_room(BASEROOM,           0, "", 0);
+       create_room(AIDEROOM,           3, "", 0);
+       create_room(SYSCONFIGROOM,      3, "", 0);
+       create_room(config.c_twitroom,  0, "", 0);
        }
 
 /*
@@ -69,9 +69,11 @@ void master_cleanup(void) {
 
        /* Cancel all running sessions */
        lprintf(7, "Cancelling running sessions...\n");
+
+/* FIXME do something here
        while (ContextList != NULL) {
-               kill_session(ContextList->cs_pid);
                }
+ */
 
        /* Run any cleanup routines registered by loadable modules */
        for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
@@ -116,47 +118,85 @@ void deallocate_user_data(struct CitContext *con)
 
 
 /*
- * Gracefully terminate the session and thread.
- * (This is called as a cleanup handler by the thread library.)
- *
- * All NON-system-dependent stuff is done in this function.
- * System-dependent session/thread cleanup is in cleanup() in sysdep.c
+ * Terminate a session and remove its context data structure.
  */
-void cleanup_stuff(void *arg)
+void RemoveContext (struct CitContext *con)
 {
-       char buf[256];
+       struct CitContext *ptr = NULL;
+       struct CitContext *ToFree = NULL;
 
-       lprintf(9, "cleanup_stuff() called\n");
+       lprintf(9, "RemoveContext() called\n");
+       if (con==NULL) {
+               lprintf(5, "WARNING: RemoveContext() called with NULL!\n");
+               return;
+               }
 
-       lprintf(7, "Calling logout(%d)\n", CC->cs_pid);
-       logout(CC);
+       /* Remove the context from the global context list.  This needs
+        * to get done FIRST to avoid concurrency problems.  It is *vitally*
+        * important to keep num_sessions accurate!!
+        */
+       lprintf(7, "Removing context for session %d\n", con->cs_pid);
+       begin_critical_section(S_SESSION_TABLE);
+       if (ContextList == con) {
+               ToFree = ContextList;
+               ContextList = ContextList->next;
+               --num_sessions;
+               }
+       else {
+               for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
+                       if (ptr->next == con) {
+                               ToFree = ptr->next;
+                               ptr->next = ptr->next->next;
+                               --num_sessions;
+                               }
+                       }
+               }
+       end_critical_section(S_SESSION_TABLE);
 
-       rec_log(CL_TERMINATE,CC->curr_user);
-       unlink(CC->temp);
-       lprintf(3, "citserver[%3d]: ended.\n",CC->cs_pid);
-       
-       /* Run any cleanup routines registered by loadable modules */
+       if (ToFree == NULL) {
+               lprintf(9, "RemoveContext() found nothing to remove\n");
+               return;
+       }
+
+       /* Run any cleanup routines registered by loadable modules.
+        * Note 1: This must occur *before* deallocate_user_data() because the
+        *         cleanup functions might touch dynamic session data.
+        * Note 2: We have to "become_session()" because the cleanup functions
+        *         might make references to "CC" assuming it's the right one.
+        */
+       become_session(con);
        PerformSessionHooks(EVT_STOP);
+       become_session(NULL);
+
+       /* Now handle all of the administrivia. */
+       lprintf(7, "Calling logout(%d)\n", con->cs_pid);
+       logout(con);
 
-       syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
+       rec_log(CL_TERMINATE, con->curr_user);
+       unlink(con->temp);
+       lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
+       
+
+       syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
        
        /* Deallocate any user-data attached to this session */
-       deallocate_user_data(CC);
+       deallocate_user_data(con);
 
-       /* Tell the housekeeping thread to remove the session and context.
-        * This can't be done inline because the context data gets destroyed
-        * halfway through, and the context being destroyed can't be the one
-        * doing the work.
-        */
-       lprintf(7, "Scheduling housekeeper REMOVE_CONTEXT(%d)\n", CC->cs_pid);
-       sprintf(buf, "REMOVE_CONTEXT|%d", CC->cs_pid);
-       enter_housekeeping_cmd(buf);
+       /* If the client is still connected, blow 'em away. */
+       lprintf(7, "Closing socket %d\n", con->client_socket);
+       close(con->client_socket);
+
+        /* Tell the housekeeping thread to check to see if this is the time
+         * to initiate a scheduled shutdown event.
+         */
+        enter_housekeeping_cmd("SCHED_SHUTDOWN");
+
+       /* Free up the memory used by this context */
+       phree(con);
+
+       lprintf(7, "Done with RemoveContext()\n");
+}
 
-       /* Tell the housekeeping thread to check to see if this is the time
-        * to initiate a scheduled shutdown event.
-        */
-       enter_housekeeping_cmd("SCHED_SHUTDOWN");
-       }
 
 
 /*
@@ -212,6 +252,7 @@ void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
        ptr = mallok(sizeof(struct CtdlSessData));
        ptr->sym_id = requested_sym;
        ptr->sym_data = mallok(num_bytes);
+       memset(ptr->sym_data, 0, num_bytes);
 
        begin_critical_section(S_SESSION_TABLE);
        ptr->next = CC->FirstSessData;
@@ -222,6 +263,25 @@ void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
 }
 
 
+/* 
+ * Change the size of a buffer allocated with CtdlAllocUserData()
+ */
+void CtdlReallocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+       struct CtdlSessData *ptr;
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)  {
+               if (ptr->sym_id == requested_sym) {
+                       ptr->sym_data = reallok(ptr->sym_data, num_bytes);
+                       return;
+               }
+       }
+
+       lprintf(2, "CtdlReallocUserData() ERROR: symbol %ld not found!\n",
+               requested_sym);
+}
+
+
 
 
 
@@ -246,63 +306,12 @@ void cmd_info(void) {
        cprintf("000\n");
        }
 
-void cmd_rchg(char *argbuf)
-{
-       char newroomname[ROOMNAMELEN];
-
-       extract(newroomname, argbuf, 0);
-       newroomname[ROOMNAMELEN] = 0;
-       if (strlen(newroomname) > 0) {
-               safestrncpy(CC->fake_roomname, newroomname, 
-                       sizeof(CC->fake_roomname) );
-               CC->fake_roomname[ROOMNAMELEN - 1] = 0;
-               }
-       else {
-               strcpy(CC->fake_roomname, "");
-               }
-       cprintf("%d OK\n", OK);
-}
-
-void cmd_hchg(char *newhostname)
-{
-   if ((newhostname) && (newhostname[0]))
-   {
-      memset(CC->fake_hostname, 0, 25);
-      safestrncpy(CC->fake_hostname, newhostname, sizeof(CC->fake_hostname));
-   }
-   else
-      strcpy(CC->fake_hostname, "");
-   cprintf("%d OK\n",OK);
-}
-
-void cmd_uchg(char *newusername)
-{
-   if (CC->usersupp.axlevel < 6) 
-   {
-      cprintf("%d You must be an Aide to use UCHG.\n",
-               ERROR+HIGHER_ACCESS_REQUIRED);
-      return;
-   }
-   if ((newusername) && (newusername[0]))
-   {
-      CC->cs_flags &= ~CS_STEALTH;
-      memset(CC->fake_username, 0, 32);
-      if (strncasecmp(newusername, CC->curr_user, strlen(CC->curr_user)))
-         safestrncpy(CC->fake_username, newusername, sizeof(CC->fake_username));
-   }
-   else
-   {
-      CC->fake_username[0] = '\0';
-      CC->cs_flags |= CS_STEALTH;
-   }
-   cprintf("%d\n",OK);
-}
 
 /*
  * returns an asterisk if there are any express messages waiting,
  * space otherwise.
  */
-char check_express(void) {
+char CtdlCheckExpress(void) {
        if (CC->FirstExpressMessage == NULL) {
                return(' ');
                }
@@ -392,7 +401,7 @@ void cmd_iden(char *argbuf)
        if (num_parms(argbuf)<4) {
                cprintf("%d usage error\n",ERROR);
                return;
-               }
+       }
 
        dev_code = extract_int(argbuf,0);
        cli_code = extract_int(argbuf,1);
@@ -409,16 +418,16 @@ void cmd_iden(char *argbuf)
        safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname);
        CC->cs_clientname[31] = 0;
 
-       lprintf(9, "Looking up hostname\n");
-       if ((strlen(from_host)>0) && 
-          (is_public_client(CC->cs_host))) {
-               if (inet_aton(from_host, &addr))
+       lprintf(9, "Looking up hostname '%s'\n", from_host);
+       if ((strlen(from_host)>0)
+         && ( (CC->is_local_socket) || (is_public_client(CC->cs_host)))) {
+               if ((addr.s_addr = inet_addr(from_host)) != -1)
                        locate_host(CC->cs_host, &addr);
                else {
                        safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
                        CC->cs_host[24] = 0;
-                       }
                }
+       }
 
        syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
                dev_code,
@@ -427,43 +436,7 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc);
                cprintf("%d Ok\n",OK);
-       }
-
-
-/*
- * enter or exit "stealth mode"
- */
-void cmd_stel(char *cmdbuf)
-{
-       int requested_mode;
-
-       requested_mode = extract_int(cmdbuf,0);
-       if (requested_mode !=0) requested_mode = 1;
-
-       if (!CC->logged_in) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
-               return;
-               }
-
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You must be an Aide to use stealth mode.\n",
-                       ERROR+HIGHER_ACCESS_REQUIRED);
-               return;
-               }
-
-       if (CC->cs_flags & CS_STEALTH) {
-               if (requested_mode == 0)
-                       CC->cs_flags = CC->cs_flags-CS_STEALTH;
-               }
-       else {
-               if (requested_mode == 1)
-                       CC->cs_flags = CC->cs_flags|CS_STEALTH;
-               }
-
-       cprintf("%d Ok\n",OK);
-       }
-
-
+}
 
 
 /*
@@ -590,90 +563,6 @@ void GenerateRoomDisplay(char *real_room,
 }
 
 
-/*
- * who's online
- */
-void cmd_rwho(void) {
-       struct CitContext *cptr;
-       int spoofed = 0;
-       int aide;
-       char un[40];
-       char real_room[ROOMNAMELEN], room[ROOMNAMELEN];
-       char host[40], flags[5];
-       
-       aide = CC->usersupp.axlevel >= 6;
-       cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
-       
-       for (cptr = ContextList; cptr != NULL; cptr = cptr->next) 
-       {
-               flags[0] = '\0';
-               spoofed = 0;
-               
-               if (cptr->cs_flags & CS_POSTING)
-                  strcat(flags, "*");
-               else
-                  strcat(flags, ".");
-                  
-               if (cptr->fake_username[0])
-               {
-                  strcpy(un, cptr->fake_username);
-                  spoofed = 1;
-               }
-               else
-                  strcpy(un, cptr->curr_user);
-                  
-               if (cptr->fake_hostname[0])
-               {
-                  strcpy(host, cptr->fake_hostname);
-                  spoofed = 1;
-               }
-               else
-                  strcpy(host, cptr->cs_host);
-
-               GenerateRoomDisplay(real_room, cptr, CC);
-
-               if (cptr->fake_roomname[0]) {
-                       strcpy(room, cptr->fake_roomname);
-                       spoofed = 1;
-               }
-               else {
-                       strcpy(room, real_room);
-               }
-               
-                if ((aide) && (spoofed))
-                   strcat(flags, "+");
-               
-               if ((cptr->cs_flags & CS_STEALTH) && (aide))
-                  strcat(flags, "-");
-               
-               if (((cptr->cs_flags&CS_STEALTH)==0) || (aide))
-               {
-                       cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
-                               cptr->cs_pid, un, room,
-                               host, cptr->cs_clientname,
-                               (long)(cptr->lastidle),
-                               cptr->lastcmdname, flags);
-               }
-               if ((spoofed) && (aide))
-               {
-                       cprintf("%d|%s|%s|%s|%s|%ld|%s|%s\n",
-                               cptr->cs_pid, cptr->curr_user,
-                               real_room,
-                               cptr->cs_host, cptr->cs_clientname,
-                               (long)(cptr->lastidle),
-                               cptr->lastcmdname, flags);
-               
-               }
-       }
-
-       /* Now it's magic time.  Before we finish, call any EVT_RWHO hooks
-        * so that external paging modules such as serv_icq can add more
-        * content to the Wholist.
-        */
-       PerformSessionHooks(EVT_RWHO);
-       cprintf("000\n");
-       }
-
 
 /*
  * Terminate another running session
@@ -682,7 +571,7 @@ void cmd_term(char *cmdbuf)
 {
        int session_num;
        struct CitContext *ccptr;
-       int session_to_kill = 0;
+       int found_it = 0;
 
        if (!CC->logged_in) {
                cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
@@ -705,15 +594,13 @@ void cmd_term(char *cmdbuf)
        begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
                if (session_num == ccptr->cs_pid) {
-                       session_to_kill = ccptr->cs_pid;
+                       ccptr->kill_me = 1;
+                       found_it = 1;
                        }
                }
        end_critical_section(S_SESSION_TABLE);
-       lprintf(9, "session_to_kill == %d\n", session_to_kill);
 
-       if (session_to_kill > 0) {
-               lprintf(9, "calling kill_session()\n");
-               kill_session(session_to_kill);
+       if (found_it) {
                cprintf("%d Session terminated.\n", OK);
                }
        else {
@@ -809,460 +696,438 @@ void cmd_scdn(char *argbuf)
 
 
 /*
- * main context loop
+ * Back-end function for starting a session
  */
-void *context_loop(struct CitContext *con)
+void begin_session(struct CitContext *con)
 {
-       char cmdbuf[256];
-       int num_sessions, len;
+       int len;
        struct sockaddr_in sin;
 
-       /*
-        * Wedge our way into the context table.
-        */
-       InitMyContext(con);
-
        /* 
         * Initialize some variables specific to our context.
         */
-       CC->logged_in = 0;
-       CC->internal_pgm = 0;
-       CC->download_fp = NULL;
-       CC->upload_fp = NULL;
-       CC->cs_pid = con->client_socket;        /* not necessarily portable */
-       CC->FirstExpressMessage = NULL;
-       time(&CC->lastcmd);
-       time(&CC->lastidle);
-       strcpy(CC->lastcmdname, "    ");
-       strcpy(CC->cs_clientname, "(unknown)");
-       strcpy(CC->curr_user,"(not logged in)");
-       strcpy(CC->net_node,"");
-       snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
-       safestrncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
-       CC->cs_host[sizeof CC->cs_host - 1] = 0;
+       con->logged_in = 0;
+       con->internal_pgm = 0;
+       con->download_fp = NULL;
+       con->upload_fp = NULL;
+       con->FirstExpressMessage = NULL;
+       time(&con->lastcmd);
+       time(&con->lastidle);
+       strcpy(con->lastcmdname, "    ");
+       strcpy(con->cs_clientname, "(unknown)");
+       strcpy(con->curr_user, NLI);
+       strcpy(con->net_node,"");
+       snprintf(con->temp, sizeof con->temp, tmpnam(NULL));
+       safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
+       con->cs_host[sizeof con->cs_host - 1] = 0;
        len = sizeof sin;
-       if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len))
-               locate_host(CC->cs_host, &sin.sin_addr);
-       CC->cs_flags = 0;
-       CC->upload_type = UPL_FILE;
-       CC->dl_is_net = 0;
-       CC->FirstSessData = NULL;
-
-       num_sessions = session_count();
-       CC->nologin = 0;
-       if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
-               CC->nologin = 1;
-
-       if (CC->nologin==1) {
-          cprintf("%d %s: Too many users are already online (maximum is %d)\n",
-               ERROR+MAX_SESSIONS_EXCEEDED,
-               config.c_nodename,config.c_maxsessions);
-               }
+       if (!CC->is_local_socket) {
+               if (!getpeername(con->client_socket,
+                  (struct sockaddr *) &sin, &len))
+                       locate_host(con->cs_host, &sin.sin_addr);
+       }
        else {
-          cprintf("%d %s Citadel/UX server ready.\n",OK,config.c_nodename);
-               }
+               strcpy(con->cs_host, "");
+       }
+       con->cs_flags = 0;
+       con->upload_type = UPL_FILE;
+       con->dl_is_net = 0;
+       con->FirstSessData = NULL;
 
-       lprintf(3, "citserver[%3d]: started.\n", CC->cs_pid);
+       con->nologin = 0;
+       if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
+               con->nologin = 1;
+
+       lprintf(3, "citserver[%3d]: started.\n", con->cs_pid);
 
        /* Run any session startup routines registered by loadable modules */
        PerformSessionHooks(EVT_START);
 
        rec_log(CL_CONNECT, "");
+}
 
-       do {
-               time(&CC->lastcmd);
-               memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
-               if (client_gets(cmdbuf) < 1) cleanup(EXIT_NULL);
-               lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
-
-               /*
-                * Let other clients see the last command we executed, and
-                * update the idle time, but not NOOP, PEXP, or GEXP.
-                */
-               if ( (strncasecmp(cmdbuf, "NOOP", 4))
-                  && (strncasecmp(cmdbuf, "PEXP", 4))
-                  && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
-                       strcpy(CC->lastcmdname, "    ");
-                       safestrncpy(CC->lastcmdname, cmdbuf, 
-                               sizeof(CC->lastcmdname) );
-                       time(&CC->lastidle);
-                       }
-                       
-               if ((strncasecmp(cmdbuf, "ENT0", 4)) && (strncasecmp(cmdbuf, "MESG", 4)) && (strncasecmp(cmdbuf, "MSGS", 4)))
-               {
-                  CC->cs_flags &= ~CS_POSTING;
-               }
-                  
-/*
- * This loop recognizes all server commands.
- */
-
-               if (!strncasecmp(cmdbuf,"NOOP",4)) {
-                       cprintf("%d%cok\n",OK,check_express());
-                       }
-
-               else if (!strncasecmp(cmdbuf,"QUIT",4)) {
-                       cprintf("%d Goodbye.\n",OK);
-                       }
 
-               else if (!strncasecmp(cmdbuf,"LOUT",4)) {
-                       if (CC->logged_in) logout(CC);
-                       cprintf("%d logged out.\n",OK);
-                       }
+void citproto_begin_session() {
+       if (CC->nologin==1) {
+               cprintf("%d %s: Too many users are already online "
+                       "(maximum is %d)\n",
+                       ERROR+MAX_SESSIONS_EXCEEDED,
+                       config.c_nodename, config.c_maxsessions);
+               }
+       else {
+               cprintf("%d %s Citadel/UX server ready.\n",
+                       OK, config.c_nodename);
+               }
+}
 
-               else if (!strncasecmp(cmdbuf,"USER",4)) {
-                       cmd_user(&cmdbuf[5]);
-                       }
 
-               else if (!strncasecmp(cmdbuf,"PASS",4)) {
-                       cmd_pass(&cmdbuf[5]);
-                       }
 
-               else if (!strncasecmp(cmdbuf,"NEWU",4)) {
-                       cmd_newu(&cmdbuf[5]);
-                       }
 
-               else if (!strncasecmp(cmdbuf,"SETP",4)) {
-                       cmd_setp(&cmdbuf[5]);
-                       }
+/*
+ * This loop recognizes all server commands.
+ */
+void do_command_loop(void) {
+       char cmdbuf[256];
 
-               else if (!strncasecmp(cmdbuf,"LRMS",4)) {
-                       cmd_lrms(&cmdbuf[5]);
-                       }
+       time(&CC->lastcmd);
+       memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
+       if (client_gets(cmdbuf) < 1) {
+               lprintf(3, "Client socket is broken.  Ending session.\n");
+               CC->kill_me = 1;
+               return;
+       }
+       lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
 
-               else if (!strncasecmp(cmdbuf,"LKRA",4)) {
-                       cmd_lkra(&cmdbuf[5]);
-                       }
+       /*
+        * Let other clients see the last command we executed, and
+        * update the idle time, but not NOOP, PEXP, or GEXP.
+        */
+       if ( (strncasecmp(cmdbuf, "NOOP", 4))
+          && (strncasecmp(cmdbuf, "PEXP", 4))
+          && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
+               strcpy(CC->lastcmdname, "    ");
+               safestrncpy(CC->lastcmdname, cmdbuf, 
+                       sizeof(CC->lastcmdname) );
+               time(&CC->lastidle);
+               }
+               
+       if ((strncasecmp(cmdbuf, "ENT0", 4))
+          && (strncasecmp(cmdbuf, "MESG", 4))
+          && (strncasecmp(cmdbuf, "MSGS", 4)))
+       {
+          CC->cs_flags &= ~CS_POSTING;
+       }
+                  
+       if (!strncasecmp(cmdbuf,"NOOP",4)) {
+               cprintf("%d%cok\n",OK,CtdlCheckExpress());
+               }
 
-               else if (!strncasecmp(cmdbuf,"LKRN",4)) {
-                       cmd_lkrn(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"QUIT",4)) {
+               cprintf("%d Goodbye.\n",OK);
+               CC->kill_me = 1;
+               }
 
-               else if (!strncasecmp(cmdbuf,"LKRO",4)) {
-                       cmd_lkro(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LOUT",4)) {
+               if (CC->logged_in) logout(CC);
+               cprintf("%d logged out.\n",OK);
+               }
 
-               else if (!strncasecmp(cmdbuf,"LZRM",4)) {
-                       cmd_lzrm(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"USER",4)) {
+               cmd_user(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"GETU",4)) {
-                       cmd_getu();
-                       }
+       else if (!strncasecmp(cmdbuf,"PASS",4)) {
+               cmd_pass(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"SETU",4)) {
-                       cmd_setu(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"NEWU",4)) {
+               cmd_newu(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"GOTO",4)) {
-                       cmd_goto(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"SETP",4)) {
+               cmd_setp(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MSGS",4)) {
-                       cmd_msgs(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LRMS",4)) {
+               cmd_lrms(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"WHOK",4)) {
-                       cmd_whok();
-                       }
+       else if (!strncasecmp(cmdbuf,"LKRA",4)) {
+               cmd_lkra(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"RDIR",4)) {
-                       cmd_rdir();
-                       }
+       else if (!strncasecmp(cmdbuf,"LKRN",4)) {
+               cmd_lkrn(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MSG0",4)) {
-                       cmd_msg0(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LKRO",4)) {
+               cmd_lkro(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MSG2",4)) {
-                       cmd_msg2(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LZRM",4)) {
+               cmd_lzrm(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MSG3",4)) {
-                       cmd_msg3(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"GETU",4)) {
+               cmd_getu();
+               }
 
-               else if (!strncasecmp(cmdbuf,"MSG4",4)) {
-                       cmd_msg4(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"SETU",4)) {
+               cmd_setu(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"OPNA",4)) {
-                       cmd_opna(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"GOTO",4)) {
+               cmd_goto(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"INFO",4)) {
-                       cmd_info();
-                       }
+       else if (!strncasecmp(cmdbuf,"MSGS",4)) {
+               cmd_msgs(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"SLRP",4)) {
-                       cmd_slrp(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"WHOK",4)) {
+               cmd_whok();
+               }
 
-               else if (!strncasecmp(cmdbuf,"INVT",4)) {
-                       cmd_invt_kick(&cmdbuf[5],1);
-                       }
+       else if (!strncasecmp(cmdbuf,"RDIR",4)) {
+               cmd_rdir();
+               }
 
-               else if (!strncasecmp(cmdbuf,"KICK",4)) {
-                       cmd_invt_kick(&cmdbuf[5],0);
-                       }
+       else if (!strncasecmp(cmdbuf,"MSG0",4)) {
+               cmd_msg0(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"GETR",4)) {
-                       cmd_getr();
-                       }
+       else if (!strncasecmp(cmdbuf,"MSG2",4)) {
+               cmd_msg2(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"SETR",4)) {
-                       cmd_setr(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"MSG3",4)) {
+               cmd_msg3(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"GETA",4)) {
-                       cmd_geta();
-                       }
+       else if (!strncasecmp(cmdbuf,"MSG4",4)) {
+               cmd_msg4(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"SETA",4)) {
-                       cmd_seta(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"OPNA",4)) {
+               cmd_opna(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"ENT0",4)) {
-                       cmd_ent0(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"INFO",4)) {
+               cmd_info();
+               }
 
-               else if (!strncasecmp(cmdbuf,"ENT3",4)) {
-                       cmd_ent3(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"SLRP",4)) {
+               cmd_slrp(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"RINF",4)) {
-                       cmd_rinf();
-                       }
+       else if (!strncasecmp(cmdbuf,"INVT",4)) {
+               cmd_invt_kick(&cmdbuf[5],1);
+               }
 
-               else if (!strncasecmp(cmdbuf,"DELE",4)) {
-                       cmd_dele(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"KICK",4)) {
+               cmd_invt_kick(&cmdbuf[5],0);
+               }
 
-               else if (!strncasecmp(cmdbuf,"KILL",4)) {
-                       cmd_kill(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"GETR",4)) {
+               cmd_getr();
+               }
 
-               else if (!strncasecmp(cmdbuf,"CRE8",4)) {
-                       cmd_cre8(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"SETR",4)) {
+               cmd_setr(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MOVE",4)) {
-                       cmd_move(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"GETA",4)) {
+               cmd_geta();
+               }
 
-               else if (!strncasecmp(cmdbuf,"FORG",4)) {
-                       cmd_forg();
-                       }
+       else if (!strncasecmp(cmdbuf,"SETA",4)) {
+               cmd_seta(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"MESG",4)) {
-                       cmd_mesg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"ENT0",4)) {
+               cmd_ent0(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"EMSG",4)) {
-                       cmd_emsg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"ENT3",4)) {
+               cmd_ent3(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"GNUR",4)) {
-                       cmd_gnur();
-                       }
+       else if (!strncasecmp(cmdbuf,"RINF",4)) {
+               cmd_rinf();
+               }
 
-               else if (!strncasecmp(cmdbuf,"VALI",4)) {
-                       cmd_vali(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"DELE",4)) {
+               cmd_dele(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"EINF",4)) {
-                       cmd_einf(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"KILL",4)) {
+               cmd_kill(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"LIST",4)) {
-                       cmd_list();
-                       }
+       else if (!strncasecmp(cmdbuf,"CRE8",4)) {
+               cmd_cre8(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"CHEK",4)) {
-                       cmd_chek();
-                       }
+       else if (!strncasecmp(cmdbuf,"MOVE",4)) {
+               cmd_move(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"DELF",4)) {
-                       cmd_delf(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"FORG",4)) {
+               cmd_forg();
+               }
 
-               else if (!strncasecmp(cmdbuf,"MOVF",4)) {
-                       cmd_movf(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"MESG",4)) {
+               cmd_mesg(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"NETF",4)) {
-                       cmd_netf(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"EMSG",4)) {
+               cmd_emsg(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"RWHO",4)) {
-                       cmd_rwho();
-                       }
+       else if (!strncasecmp(cmdbuf,"GNUR",4)) {
+               cmd_gnur();
+               }
 
-               else if (!strncasecmp(cmdbuf,"OPEN",4)) {
-                       cmd_open(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"VALI",4)) {
+               cmd_vali(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"CLOS",4)) {
-                       cmd_clos();
-                       }
+       else if (!strncasecmp(cmdbuf,"EINF",4)) {
+               cmd_einf(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"UOPN",4)) {
-                       cmd_uopn(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LIST",4)) {
+               cmd_list();
+               }
 
-               else if (!strncasecmp(cmdbuf,"UCLS",4)) {
-                       cmd_ucls(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"CHEK",4)) {
+               cmd_chek();
+               }
 
-               else if (!strncasecmp(cmdbuf,"READ",4)) {
-                       cmd_read(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"DELF",4)) {
+               cmd_delf(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"WRIT",4)) {
-                       cmd_writ(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"MOVF",4)) {
+               cmd_movf(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"QUSR",4)) {
-                       cmd_qusr(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"NETF",4)) {
+               cmd_netf(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"ECHO",4)) {
-                       cmd_echo(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"OPEN",4)) {
+               cmd_open(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"OIMG",4)) {
-                       cmd_oimg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"CLOS",4)) {
+               cmd_clos();
+               }
 
-               else if (!strncasecmp(cmdbuf,"MORE",4)) {
-                       cmd_more();
-                       }
+       else if (!strncasecmp(cmdbuf,"UOPN",4)) {
+               cmd_uopn(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"NETP",4)) {
-                       cmd_netp(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"UCLS",4)) {
+               cmd_ucls(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"NDOP",4)) {
-                       cmd_ndop(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"READ",4)) {
+               cmd_read(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"NUOP",4)) {
-                       cmd_nuop(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"WRIT",4)) {
+               cmd_writ(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"LFLR",4)) {
-                       cmd_lflr();
-                       }
+       else if (!strncasecmp(cmdbuf,"QUSR",4)) {
+               cmd_qusr(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"CFLR",4)) {
-                       cmd_cflr(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"ECHO",4)) {
+               cmd_echo(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"KFLR",4)) {
-                       cmd_kflr(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"OIMG",4)) {
+               cmd_oimg(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"EFLR",4)) {
-                       cmd_eflr(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"MORE",4)) {
+               cmd_more();
+               }
 
-               else if (!strncasecmp(cmdbuf,"IDEN",4)) {
-                       cmd_iden(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"NETP",4)) {
+               cmd_netp(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"IPGM",4)) {
-                       cmd_ipgm(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"NDOP",4)) {
+               cmd_ndop(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"EBIO",4)) {
-                       cmd_ebio();
-                       }
+       else if (!strncasecmp(cmdbuf,"NUOP",4)) {
+               cmd_nuop(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"RBIO",4)) {
-                       cmd_rbio(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"LFLR",4)) {
+               cmd_lflr();
+               }
 
-               else if (!strncasecmp(cmdbuf,"LBIO",4)) {
-                       cmd_lbio();
-                       }
+       else if (!strncasecmp(cmdbuf,"CFLR",4)) {
+               cmd_cflr(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"STEL",4)) {
-                       cmd_stel(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"KFLR",4)) {
+               cmd_kflr(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"TERM",4)) {
-                       cmd_term(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"EFLR",4)) {
+               cmd_eflr(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"DOWN",4)) {
-                       cmd_down();
-                       }
+       else if (!strncasecmp(cmdbuf,"IDEN",4)) {
+               cmd_iden(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf,"SCDN",4)) {
-                       cmd_scdn(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"IPGM",4)) {
+               cmd_ipgm(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "NSET", 4)) {
-                       cmd_nset(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"TERM",4)) {
+               cmd_term(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
-                       cmd_uimg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"DOWN",4)) {
+               cmd_down();
+               }
 
-               else if (!strncasecmp(cmdbuf, "UCHG", 4)) {
-                       cmd_uchg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf,"SCDN",4)) {
+               cmd_scdn(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "TIME", 4)) {
-                       cmd_time();
-                       }
+       else if (!strncasecmp(cmdbuf, "NSET", 4)) {
+               cmd_nset(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "HCHG", 4)) {
-                       cmd_hchg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
+               cmd_uimg(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "RCHG", 4)) {
-                       cmd_rchg(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "TIME", 4)) {
+               cmd_time();
+               }
 
-               else if (!strncasecmp(cmdbuf, "AGUP", 4)) {
-                       cmd_agup(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "AGUP", 4)) {
+               cmd_agup(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "ASUP", 4)) {
-                       cmd_asup(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "ASUP", 4)) {
+               cmd_asup(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "GPEX", 4)) {
-                       cmd_gpex(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "GPEX", 4)) {
+               cmd_gpex(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "SPEX", 4)) {
-                       cmd_spex(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "SPEX", 4)) {
+               cmd_spex(&cmdbuf[5]);
+               }
 
-               else if (!strncasecmp(cmdbuf, "CONF", 4)) {
-                       cmd_conf(&cmdbuf[5]);
-                       }
+       else if (!strncasecmp(cmdbuf, "CONF", 4)) {
+               cmd_conf(&cmdbuf[5]);
+               }
 
 #ifdef DEBUG_MEMORY_LEAKS
-               else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
-                       dump_tracked();
-                       }
+       else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
+               dump_tracked();
+               }
 #endif
 
-               else if (!DLoader_Exec_Cmd(cmdbuf))
-                       {
-                          cprintf("%d Unrecognized or unsupported command.\n",
-                                   ERROR);
-                       }
-
-               /* Run any after-each-command outines registered by modules */
-               PerformSessionHooks(EVT_CMD);
-
-               } while(strncasecmp(cmdbuf, "QUIT", 4));
+       else if (!DLoader_Exec_Cmd(cmdbuf))
+               {
+                  cprintf("%d Unrecognized or unsupported command.\n",
+                           ERROR);
+               }
 
-       cleanup(EXIT_NORMAL);
-       return(NULL);
-       }
+       /* Run any after-each-command outines registered by modules */
+       PerformSessionHooks(EVT_CMD);
+}