[srvx-commits] CVS: services/src chanserv.c,1.321,1.322

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24141/src

Modified Files:
	chanserv.c 
Log Message:
make cunsuspend only look at argv for a channel name
fix cunsuspend's min_argc


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -C2 -r1.321 -r1.322
*** chanserv.c	17 Dec 2002 19:16:17 -0000	1.321
--- chanserv.c	17 Dec 2002 20:26:51 -0000	1.322
***************
*** 4823,4842 ****
      char message[MAXLEN];
  
!     if(!channel && argc < 2)
!     {
! 	chanserv_notice(user, MSG_INVALID_CHANNEL);
! 	return 0;
!     }
! 
!     if(channel)
!     {
! 	if(!channel->channel_info || !IsSuspended(channel->channel_info))
! 	{
! 	    chanserv_notice(user, CSMSG_NOT_SUSPENDED, channel->name);
! 	    return 0;
! 	}
! 	suspended = channel->channel_info->suspended;
!     }
!     else if(!(suspended = dict_find(sChannels, argv[1], NULL)))
      {
          chanserv_notice(user, CSMSG_NOT_SUSPENDED, argv[1]);
--- 4823,4827 ----
      char message[MAXLEN];
  
!     if(!(suspended = dict_find(sChannels, argv[1], NULL)))
      {
          chanserv_notice(user, CSMSG_NOT_SUSPENDED, argv[1]);
***************
*** 7218,7222 ****
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 2, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);
--- 7203,7207 ----
      DEFINE_COMMAND(move, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "template", "register", NULL);
      DEFINE_COMMAND(csuspend, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_REGCHAN, "flags", "+helping", NULL);
!     DEFINE_COMMAND(cunsuspend, 1, MODCMD_REQUIRE_AUTHED, "template", "csuspend", NULL);
      DEFINE_COMMAND(createnote, 5, 0, "access", "800", NULL);
      DEFINE_COMMAND(removenote, 2, 0, "access", "800", NULL);