[srvx-commits] CVS: services/src modcmd.c,1.52,1.53

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

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

Modified Files:
	modcmd.c 
Log Message:
Don't automatically force commands marked "REQUIRE_JOINABLE" to have the "REQUIRE_CHANNEL" flag also -- if the channel doesn't exist, there is no effect anyway.


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** modcmd.c	25 Jan 2003 01:28:06 -0000	1.52
--- modcmd.c	21 Feb 2003 07:24:17 -0000	1.53
***************
*** 256,260 ****
      if (cmd->min_channel_access > ulNone) flags |= MODCMD_REQUIRE_CHANUSER;
      if (flags & MODCMD_REQUIRE_CHANUSER) flags |= MODCMD_REQUIRE_REGCHAN;
-     if (flags & MODCMD_REQUIRE_JOINABLE) flags |= MODCMD_REQUIRE_CHANNEL;
      if (flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING)) flags |= MODCMD_REQUIRE_AUTHED;
      cmd->effective_flags = flags;
--- 256,259 ----
***************
*** 474,481 ****
              }
          }
!         if (flags & MODCMD_REQUIRE_JOINABLE) {
              if (!uData_checked) uData = _GetChannelUser(channel->channel_info, user->handle_info, 1, 0), uData_checked = 1;
              if ((channel->modes & (MODE_INVITEONLY|MODE_KEY|MODE_SECRET))
!                 && (!channel->channel_info || !uData)
                  && !IsService(user)
                  && !GetUserMode(channel, user)) {
--- 473,480 ----
              }
          }
!         if ((flags & MODCMD_REQUIRE_JOINABLE) && channel) {
              if (!uData_checked) uData = _GetChannelUser(channel->channel_info, user->handle_info, 1, 0), uData_checked = 1;
              if ((channel->modes & (MODE_INVITEONLY|MODE_KEY|MODE_SECRET))
!                 && !uData
                  && !IsService(user)
                  && !GetUserMode(channel, user)) {