[X2serv-cvs] CVS: x2/source accounting.c,1.6,1.7 chan.c,1.69,1.70 config.h,1.51,1.52 gate.c,1.16,1.17 misc.c,1.39,1.40

[Alex S. <ru...@us...>]

Update of /cvsroot/x2serv/x2/source
In directory usw-pr-cvs1:/tmp/cvs-serv22299

Modified Files:
	accounting.c chan.c config.h gate.c misc.c 
Log Message:
Modified x2 not to log details about the PASS command.



Index: accounting.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/accounting.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** accounting.c	2001/02/11 03:28:45	1.6
--- accounting.c	2001/02/13 11:47:53	1.7
***************
*** 32,41 ****
         return(0);
     }
! 
     if(!strcasecmp(mycommand, "LOGIN") || !strcasecmp(mycommand, "PASS") || !strcasecmp(mycommand, "RESETPASS") || !strcasecmp(mycommand, "SETPASS"))
     {
         myrest = "*******";
     }
! 
     if(cptr)
     {
--- 32,41 ----
         return(0);
     }
! /*
     if(!strcasecmp(mycommand, "LOGIN") || !strcasecmp(mycommand, "PASS") || !strcasecmp(mycommand, "RESETPASS") || !strcasecmp(mycommand, "SETPASS"))
     {
         myrest = "*******";
     }
! */
     if(cptr)
     {

Index: chan.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/chan.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** chan.c	2001/01/24 00:54:17	1.69
--- chan.c	2001/02/13 11:47:53	1.70
***************
*** 1665,1669 ****
    time_t currtime;
  
!   Debug(DBGNOTICE, "*** Checking for bans in %s older than %lu\n", cptr->Name, period);
    Dummy = *b_list;
    currtime = time(NULL);
--- 1665,1669 ----
    time_t currtime;
  
!   /*Debug(DBGNOTICE, "*** Checking for bans in %s older than %lu\n", cptr->Name, period); */
    Dummy = *b_list;
    currtime = time(NULL);

Index: config.h
===================================================================
RCS file: /cvsroot/x2serv/x2/source/config.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** config.h	2001/01/24 00:54:17	1.51
--- config.h	2001/02/13 11:47:53	1.52
***************
*** 45,49 ****
  
  /* This is used to refer to your network in various places. It should be one word, eg "AfterNET" */
! #define NETWORK         "Loxxin"
  
  #define OPERHELPFILE	"HELP/operhelp.txt"
--- 45,49 ----
  
  /* This is used to refer to your network in various places. It should be one word, eg "AfterNET" */
! #define NETWORK         "AfterNET"
  
  #define OPERHELPFILE	"HELP/operhelp.txt"

Index: gate.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/gate.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** gate.c	2000/12/19 08:11:56	1.16
--- gate.c	2001/02/13 11:47:53	1.17
***************
*** 82,86 ****
    if(connect(GatePtr->sock, (struct sockaddr *) &GateAddr, sizeof(GateAddr)) >= 0)
    {
!      Debug(DBGINFO, "Called connect() for gate..");
       GatePtr->state = WAIT_TO_SEND;
    }
--- 82,86 ----
    if(connect(GatePtr->sock, (struct sockaddr *) &GateAddr, sizeof(GateAddr)) >= 0)
    {
!      /*Debug(DBGINFO, "Called connect() for gate.."); */
       GatePtr->state = WAIT_TO_SEND;
    }
***************
*** 91,99 ****
         /* connect is non blocking, use select to finish..*/
         GatePtr->state = WAIT_TO_CONNECT;
!        Debug(DBGINFO, "Non blocking connect to %s, waiting to finish..", GatePtr->iphost);
      }
      else
      {
!        Debug(DBGNOTICE, "Connect failed to %s.  :%s:", GatePtr->iphost, strerror(errno));
         GatePtr->delete = TRUE;
         close(GatePtr->sock);
--- 91,99 ----
         /* connect is non blocking, use select to finish..*/
         GatePtr->state = WAIT_TO_CONNECT;
!     /*   Debug(DBGINFO, "Non blocking connect to %s, waiting to finish..", GatePtr->iphost); */
      }
      else
      {
!     /*   Debug(DBGNOTICE, "Connect failed to %s.  :%s:", GatePtr->iphost, strerror(errno)); */
         GatePtr->delete = TRUE;
         close(GatePtr->sock);
***************
*** 108,112 ****
       if(GatePtr->delete)
       {
!         Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost);
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
--- 108,112 ----
       if(GatePtr->delete)
       {
!       /*  Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost); */
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
***************
*** 148,158 ****
        if(opt_val == 0)
        {
!          Debug(DBGINFO, "NONBLOCK connect to %s succeded.", GatePtr->iphost);
           GatePtr->state = WAIT_TO_SEND;
        }
        else
        {
!          Debug(DBGINFO, "NONBLOCK connect to %s failed. opt_val is: %s", 
!                          GatePtr->iphost, strerror(opt_val));
           GatePtr->delete = TRUE;
           close(GatePtr->sock);
--- 148,158 ----
        if(opt_val == 0)
        {
!        /*  Debug(DBGINFO, "NONBLOCK connect to %s succeded.", GatePtr->iphost); */
           GatePtr->state = WAIT_TO_SEND;
        }
        else
        {
!          /*Debug(DBGINFO, "NONBLOCK connect to %s failed. opt_val is: %s", 
!                          GatePtr->iphost, strerror(opt_val)); */
           GatePtr->delete = TRUE;
           close(GatePtr->sock);
***************
*** 162,166 ****
    else
    {
!       Debug(DBGINFO, "getsockopt() failed.. :%s:", strerror(errno));
        GatePtr->delete = TRUE;
        close(GatePtr->sock);
--- 162,166 ----
    else
    {
!      /* Debug(DBGINFO, "getsockopt() failed.. :%s:", strerror(errno)); */
        GatePtr->delete = TRUE;
        close(GatePtr->sock);
***************
*** 174,178 ****
       if(GatePtr->delete)
       {
!         Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost);
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
--- 174,178 ----
       if(GatePtr->delete)
       {
!        /* Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost); */
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
***************
*** 234,238 ****
       if(FD_ISSET(GatePtr->sock, &fdset))
       {
!         Debug(DBGINFO, "Sending magic string to %s", GatePtr->iphost);
          send(GatePtr->sock, keystring, 17, 0);
          GatePtr->timestamp = time(NULL);
--- 234,238 ----
       if(FD_ISSET(GatePtr->sock, &fdset))
       {
!       /*  Debug(DBGINFO, "Sending magic string to %s", GatePtr->iphost); */
          send(GatePtr->sock, keystring, 17, 0);
          GatePtr->timestamp = time(NULL);
***************
*** 256,260 ****
       if(GatePtr->delete)
       {
!         Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost);
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
--- 256,260 ----
       if(GatePtr->delete)
       {
!         /*Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost); */
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
***************
*** 350,354 ****
          else
          {
!           Debug(DBGNOTICE, "Read error to socket for %s. 0 bytes read.", GatePtr->iphost);
            close(GatePtr->sock);
            NumOfGateSocks--;
--- 350,354 ----
          else
          {
!        /*   Debug(DBGNOTICE, "Read error to socket for %s. 0 bytes read.", GatePtr->iphost); */
            close(GatePtr->sock);
            NumOfGateSocks--;
***************
*** 376,380 ****
       if(GatePtr->delete)
       {
!         Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost);
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
--- 376,380 ----
       if(GatePtr->delete)
       {
!         /*Debug(DBGNOTICE, "Removing %s from gate list.", GatePtr->iphost); */
          if(GatePtr == GatePtrs)
            GatePtrs = GatePtr->next;
***************
*** 398,402 ****
       if(GatePtr->state == WAIT_TOO_MANY)
       {
!         Debug(DBGINFO, "Starting delayed gatecheck of %s", GatePtr->iphost);
          GateConnect(GatePtr);
       }
--- 398,402 ----
       if(GatePtr->state == WAIT_TOO_MANY)
       {
!        /* Debug(DBGINFO, "Starting delayed gatecheck of %s", GatePtr->iphost); */
          GateConnect(GatePtr);
       }

Index: misc.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/misc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** misc.c	2001/02/05 10:55:36	1.39
--- misc.c	2001/02/13 11:47:53	1.40
***************
*** 294,297 ****
--- 294,298 ----
     if( ! (strcasecmp(command, "LOGIN") && 
        strcasecmp(command, "RESETPASS") &&
+       strcasecmp(command, "PASS") &&
        strcasecmp(command, "MLOGIN") ) )
     {