[X2serv-cvs] CVS: x2/source parse.c,1.56,1.57 server.c,1.11,1.12

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

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

Modified Files:
	parse.c server.c 
Log Message:
Fixed a bug where x2 was not getting the proper gline time
for glines other servers or services set. 


Index: parse.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/parse.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** parse.c	2001/01/22 19:03:53	1.56
--- parse.c	2001/02/15 02:36:43	1.57
***************
*** 539,543 ****
      Arg[3] = (char *) strtok(NULL, " ");        /* +/-*@* */
      Arg[4] = (char *) strtok(NULL, " ");        /* Time */
!     Arg[5] = (char *) strtok(NULL, " ");        /* time? */
      Arg[6] = (char *) strtok(NULL, "\0");       /* Reason */
      if (Arg[3][0] == '+')
--- 539,543 ----
      Arg[3] = (char *) strtok(NULL, " ");        /* +/-*@* */
      Arg[4] = (char *) strtok(NULL, " ");        /* Time */
!     Arg[5] = (char *) strtok(NULL, " ");        /* : */
      Arg[6] = (char *) strtok(NULL, "\0");       /* Reason */
      if (Arg[3][0] == '+')
***************
*** 546,550 ****
        if (!Arg[4])
      	return (0);		/* Invalid no time.. */
!       ProcessAddGline(&Arg[3][1], atoi(Arg[5]), Arg[6]);
        if(time(NULL) > gwritets + 60)
        {
--- 546,550 ----
        if (!Arg[4])
      	return (0);		/* Invalid no time.. */
!       ProcessAddGline(&Arg[3][1], atoi(Arg[4]), Arg[6]);
        if(time(NULL) > gwritets + 60)
        {

Index: server.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/server.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** server.c	2001/01/22 07:24:33	1.11
--- server.c	2001/02/15 02:36:43	1.12
***************
*** 150,155 ****
    if((gptr = malloc(sizeof(GlineListType))))
    {
!     safecopy(gptr->address, Addr, MAXLEN);
!     safecopy(gptr->reason, Reason, MAXLEN);
      gptr->time = (NetTime() + gtime);
      gptr->Next = Glines;
--- 150,155 ----
    if((gptr = malloc(sizeof(GlineListType))))
    {
!     safecopy(gptr->address, Addr, MAXLEN-1);
!     safecopy(gptr->reason, Reason, MAXLEN-1);
      gptr->time = (NetTime() + gtime);
      gptr->Next = Glines;