[srvx-commits] CVS: services/src chanserv.c,1.161.2.80,1.161.2.81

[Paul C. <zo...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv28077/src

Modified Files:
      Tag: rel-1_0
	chanserv.c 
Log Message:
Fix the tagging of commands executed with security override so access
levels are compared, instead of simply checking for access.


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.161.2.80
retrieving revision 1.161.2.81
diff -C2 -r1.161.2.80 -r1.161.2.81
*** chanserv.c	2001/08/31 16:46:01	1.161.2.80
--- chanserv.c	2001/09/01 03:03:33	1.161.2.81
***************
*** 706,709 ****
--- 706,711 ----
      }
  
+     /* We have to put the PubCmd check here, before channel is
+        set to the channel in the argument, if any. */
      if(channel && channel->channel_info && !(cmd->flags & CMD_PUBLIC_OVERRIDE))
      {
***************
*** 849,854 ****
  	{
  	    /* Make sure the user doesn't have access to the channel
! 	       before flagging the entry. */
! 	    if(!GetChannelAccess(channel->channel_info, user->handle_info))
  	    {
  		index += sprintf(buffer + index, " [override]");
--- 851,858 ----
  	{
  	    /* Make sure the user doesn't have access to the channel
! 	       before flagging the entry. uData is guaranteed to be
! 	       valid if _CMD_REQUIRE_ACCESS is on due to the check
! 	       above. */
! 	    if(uData->access < cmd->access)
  	    {
  		index += sprintf(buffer + index, " [override]");