* Split cmd_user() and cmd_pass() into frontend/backend functions

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index a2ee6e7e8de966c2fbed8349bda7b517fc1a87dd..e9573ad588489b0284feea018bc1251db4924eeb 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -13,6 +13,7 @@
 #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>
@@ -130,19 +131,22 @@ void RemoveContext (struct CitContext *con)
                }
 
        /* Remove the context from the global context list.  This needs
-        * to get done FIRST to avoid concurrency problems.
+        * 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;
                                }
                        }
                }
@@ -239,6 +243,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;
@@ -275,7 +280,7 @@ void cmd_info(void) {
 
 void cmd_rchg(char *argbuf)
 {
-       char newroomname[ROOMNAMELEN];
+       char newroomname[256];
 
        extract(newroomname, argbuf, 0);
        newroomname[ROOMNAMELEN-1] = 0;
@@ -291,10 +296,9 @@ void cmd_rchg(char *argbuf)
 
 void cmd_hchg(char *argbuf)
 {
-       char newhostname[25];
+       char newhostname[256];
 
        extract(newhostname, argbuf, 0);
-       newhostname[24] = 0;
        if (strlen(newhostname) > 0) {
                safestrncpy(CC->fake_hostname, newhostname,
                        sizeof(CC->fake_hostname) );
@@ -305,29 +309,36 @@ void cmd_hchg(char *argbuf)
        cprintf("%d OK\n", OK);
 }
 
-void cmd_uchg(char *newusername)
+void cmd_uchg(char *argbuf)
 {
-   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);
+
+       char newusername[256];
+
+       extract(newusername, argbuf, 0);
+
+       if (CC->usersupp.axlevel < 6) {
+               cprintf("%d You must be an Aide to masquerade your name.\n",
+                       ERROR+HIGHER_ACCESS_REQUIRED);
+               return;
+       }
+
+       if (strlen(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.
@@ -442,7 +453,7 @@ void cmd_iden(char *argbuf)
        lprintf(9, "Looking up hostname '%s'\n", from_host);
        if ((strlen(from_host)>0) && 
           (is_public_client(CC->cs_host))) {
-               if (inet_aton(from_host, &addr))
+               if ((addr.s_addr = inet_addr(from_host)) != INADDR_NONE)
                        locate_host(CC->cs_host, &addr);
                else {
                        safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
@@ -837,11 +848,11 @@ void cmd_scdn(char *argbuf)
 
 
 /*
- * 
+ * Back-end function for starting a session
  */
 void begin_session(struct CitContext *con)
 {
-       int num_sessions, len;
+       int len;
        struct sockaddr_in sin;
 
        /* 
@@ -856,7 +867,7 @@ void begin_session(struct CitContext *con)
        time(&con->lastidle);
        strcpy(con->lastcmdname, "    ");
        strcpy(con->cs_clientname, "(unknown)");
-       strcpy(con->curr_user,"(not logged in)");
+       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);
@@ -869,12 +880,21 @@ void begin_session(struct CitContext *con)
        con->dl_is_net = 0;
        con->FirstSessData = NULL;
 
-       num_sessions = session_count();
        con->nologin = 0;
        if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
                con->nologin = 1;
 
-       if (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, "");
+}
+
+
+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,
@@ -884,13 +904,6 @@ void begin_session(struct CitContext *con)
                cprintf("%d %s Citadel/UX server ready.\n",
                        OK, config.c_nodename);
                }
-
-       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, "");
 }