[X2serv-cvs] CVS: x2/source commands.c,1.154,1.155 main.c,1.53,1.54 misc.c,1.44,1.45

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

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

Modified Files:
	commands.c main.c misc.c 
Log Message:
Fixing dellamer bug - AddyOk() wasnt accepting ' and ` as acceptable chars.


Index: commands.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/commands.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** commands.c	2001/07/19 02:17:27	1.154
--- commands.c	2001/08/03 09:15:22	1.155
***************
*** 3938,3942 ****
    }
    if (!AddyOk(Address))
!   {				/* if the address doesnt have address stuff in it (!@ etc) */
      if((target = FindNick(Address, UsersN)))
      {				/* if theres a user on with that nick */
--- 3938,3942 ----
    }
    if (!AddyOk(Address))
!   {		/* if the address doesnt have address stuff in it (!@ etc) */
      if((target = FindNick(Address, UsersN)))
      {				/* if theres a user on with that nick */

Index: main.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** main.c	2001/05/29 09:35:02	1.53
--- main.c	2001/08/03 09:15:22	1.54
***************
*** 569,572 ****
--- 569,577 ----
                  Mask = (char *) mysep(&lb, " ");
                  Reason = (char *) mysep(&lb, "\n\0");
+                 if(!AddyOk(Mask))
+                 {
+                     printf("Ignoring lamer %s because its not valid.\n", Mask);
+                     continue;
+                 }
                  AddLamer(cptr, BanTime, LastSeen, Mask, Reason);
                  continue;

Index: misc.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/misc.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** misc.c	2001/05/10 13:59:31	1.44
--- misc.c	2001/08/03 09:15:22	1.45
***************
*** 1290,1293 ****
--- 1290,1294 ----
          case '*': case '?': case '+': case '-': case '.': case '\\':
          case '^': case '_': case '{': case '[': case '}': case ']': case '~':
+         case '\'': case '`':
              continue;
          case '!': {