[X2serv-cvs] CVS: x2/source commands.c,1.138,1.139 set.c,1.2,1.3

[Richard P. <lys...@us...>]

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

Modified Files:
	commands.c set.c 
Log Message:
unbanme now also checks if the IP of a user is banned. .set had a minor
display error


Index: commands.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/commands.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -r1.138 -r1.139
*** commands.c	2001/03/14 14:39:04	1.138
--- commands.c	2001/03/14 15:22:02	1.139
***************
*** 639,642 ****
--- 639,643 ----
  {
    char nuh[MAXLEN];
+   char nuh2[MAXLEN];
  
    if(uptr == NULL)
***************
*** 646,650 ****
    }
    sprintf(nuh, "%s!%s@%s", uptr->Nick, uptr->UserID, uptr->Address);
!   if (channel_unban(cptr, nuh))
    {
        send_to_user(uptr, "\x2You have been unbanned from %s.\x2", cptr->Name);
--- 647,655 ----
    }
    sprintf(nuh, "%s!%s@%s", uptr->Nick, uptr->UserID, uptr->Address);
!   sprintf(nuh2, "%s!%s@%d.%d.%d.%d", uptr->Nick, uptr->UserID,
! 	  uptr->IP / 65536 / 256 % 256, uptr->IP / 65536 % 256, uptr->IP / 256 % 256, uptr->IP % 256);
!   Debug(DBGINFO, "Scanning IP mask %s", nuh2);
! 
!   if (channel_unban(cptr, nuh) || channel_unban(cptr, nuh2))
    {
        send_to_user(uptr, "\x2You have been unbanned from %s.\x2", cptr->Name);

Index: set.c
===================================================================
RCS file: /cvsroot/x2serv/x2/source/set.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** set.c	2001/03/02 09:52:21	1.2
--- set.c	2001/03/14 15:22:02	1.3
***************
*** 211,215 ****
          {
              if(!set_commands[i].user)  /* If it IS an IRCOP only command */
!                 send_to_user(uptr, "\002%10s\002 : %d  .%s.%s", set_commands[i].name,
                               cptr->settings[set_commands[i].index], set_commands[i].pre,
                               set_commands[i].settings[cptr->settings[set_commands[i].index]]);
--- 211,215 ----
          {
              if(!set_commands[i].user)  /* If it IS an IRCOP only command */
!                 send_to_user(uptr, "\002%10s\002 : %d  \002%s\002%s", set_commands[i].name,
                               cptr->settings[set_commands[i].index], set_commands[i].pre,
                               set_commands[i].settings[cptr->settings[set_commands[i].index]]);