* Removed the session_count() function. Instead, keep a reference count

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 243985722c16535d5f6a315611c0a64e8ad34f34..1bc99652ccdf46ce1c9b03cf3a0bc994f3aecc22 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -130,19 +130,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;
                                }
                        }
                }
@@ -275,7 +278,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 +294,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 +307,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.
@@ -439,7 +448,7 @@ 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");
+       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))
@@ -841,7 +850,7 @@ void cmd_scdn(char *argbuf)
  */
 void begin_session(struct CitContext *con)
 {
-       int num_sessions, len;
+       int len;
        struct sockaddr_in sin;
 
        /* 
@@ -869,7 +878,6 @@ 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;