[srvx-commits] CVS: services/src hash.c,1.170,1.171

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

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

Modified Files:
	hash.c 
Log Message:
do not clear channel modes in ReintroduceUser()
remove an incorrect comment in NickChange()


Index: hash.c
===================================================================
RCS file: /cvsroot/srvx/services/src/hash.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -r1.170 -r1.171
*** hash.c	6 Jan 2003 01:53:01 -0000	1.170
--- hash.c	7 Jan 2003 04:23:12 -0000	1.171
***************
*** 159,163 ****
          }
  	irc_join(user, mn->channel);
-         mn->modes &= ~(MODE_CHANOP|MODE_VOICE); /* since they just rejoined */
          if (modes[0]) irc_mode(user, mn->channel, modes);
      }
--- 159,162 ----
***************
*** 174,184 ****
      /* remove old entry from clients dictionary */
      dict_remove(clients, user->nick);
  
      /* Make callbacks for nick changes.
       * This needs to be done with the old nick still in place, else
       * dict lookups based on user->nick will miss the user.
!      * It is safe to re-insert using new_nick (which may be a
!      * temporary pointer) since the later value of user->nick will be
!      * correct. */
      for (nn=0; nn<ncf2_used; nn++) {
          ncf2_list[nn](user, new_nick);
--- 173,185 ----
      /* remove old entry from clients dictionary */
      dict_remove(clients, user->nick);
+ #if !defined(WITH_PROTOCOL_P10)
+     /* Remove from uplink's clients dict */
+     dict_remove(user->uplink->users, user->nick);
+ #endif
  
      /* Make callbacks for nick changes.
       * This needs to be done with the old nick still in place, else
       * dict lookups based on user->nick will miss the user.
!      */
      for (nn=0; nn<ncf2_used; nn++) {
          ncf2_list[nn](user, new_nick);
***************
*** 187,194 ****
      user->timestamp = now;
      if (IsLocal(user) && !no_announce) irc_nick(user, new_nick);
- #if !defined(WITH_PROTOCOL_P10)
-     /* Remove from uplink's clients dict */
-     dict_remove(user->uplink->users, user->nick);
- #endif
      /* Copy new nick into user structure */
      safestrncpy(user->nick, new_nick, sizeof(user->nick));
--- 188,191 ----