[srvx-commits] CVS: services/src chanserv.c,1.161.2.82,1.161.2.83

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

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

Modified Files:
      Tag: rel-1_0
	chanserv.c 
Log Message:
be more careful dereferencing pointers
voice users in channel userlists when they auth (if they don't get ops)


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.161.2.82
retrieving revision 1.161.2.83
diff -C2 -r1.161.2.82 -r1.161.2.83
*** chanserv.c	2001/09/02 06:52:04	1.161.2.82
--- chanserv.c	2001/09/04 18:35:55	1.161.2.83
***************
*** 4655,4660 ****
      for(channel = user->handle_info->channels; channel; channel = channel->next)
      {
!         struct chanNode *cn = channel->channel->channel;
!         if(!cn || IsSuspended(channel->channel) || !GetUserMode(cn, user)) continue;
  
  	if(channel->user->access >= ulMaster)
--- 4655,4660 ----
      for(channel = user->handle_info->channels; channel; channel = channel->next)
      {
!         struct chanNode *cn;
!         if(IsSuspended(channel->channel) || !(cn = channel->channel->channel) || !GetUserMode(cn, user)) continue;
  
  	if(channel->user->access >= ulMaster)
***************
*** 4666,4669 ****
--- 4666,4673 ----
          {
              AddChannelOp(1, &user, cn, chanserv->numeric, 1);
+         }
+         else if (GetChannelAccess(channel->channel, user->handle_info))
+         {
+             AddChannelVoice(1, &user, cn, chanserv->numeric, 1);
          }