[srvx-commits] CVS: services/src chanserv.c,1.317,1.318 modcmd.c,1.43,1.44

[Zoot <zo...@us...>]

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

Modified Files:
	chanserv.c modcmd.c 
Log Message:
Fix ChanServ's move command and channels being gobbled twice in modcmd's parser.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.317
retrieving revision 1.318
diff -C2 -r1.317 -r1.318
*** chanserv.c	14 Dec 2002 02:50:29 -0000	1.317
--- chanserv.c	15 Dec 2002 10:29:59 -0000	1.318
***************
*** 7208,7212 ****
      DEFINE_COMMAND(noregister, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
      DEFINE_COMMAND(allowregister, 2, 0, "template", "noregister", NULL);
!     DEFINE_COMMAND(move, 2, 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);
--- 7208,7212 ----
      DEFINE_COMMAND(noregister, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
      DEFINE_COMMAND(allowregister, 2, 0, "template", "noregister", NULL);
!     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);

Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** modcmd.c	12 Dec 2002 03:23:30 -0000	1.43
--- modcmd.c	15 Dec 2002 10:30:03 -0000	1.44
***************
*** 642,658 ****
          }
          argv = new_argv;
-     }
  
!     /* Try again to grab a handle to the channel after alias
!      * expansion, overwriting any previous channel.
!      */
!     if ((argc > 1)
!         && (cmd->flags & MODCMD_ACCEPT_CHANNEL)
!         && IsChannelName(argv[1])
!         && ((argv[1][0] != '+') || (cmd->flags & MODCMD_ACCEPT_PCHANNEL))
!         && (channel = dict_find(channels, argv[1], NULL))) {
!         argv[1] = argv[0];
!         argv++, argc--;
!         cmd_arg = 1;
      }
  
--- 642,659 ----
          }
          argv = new_argv;
  
!         /* Try again to grab a handle to the channel after alias
!          * expansion, overwriting any previous channel. This should,
!          * of course, only be done again if an alias was acually
!          * expanded. */
!         if ((argc > 1)
!             && (cmd->flags & MODCMD_ACCEPT_CHANNEL)
!             && IsChannelName(argv[1])
!             && ((argv[1][0] != '+') || (cmd->flags & MODCMD_ACCEPT_PCHANNEL))
!             && (channel = dict_find(channels, argv[1], NULL))) {
!             argv[1] = argv[0];
!             argv++, argc--;
!             cmd_arg = 1;
!         }
      }