[srvx-commits] CVS: services/src nickserv.c,1.224,1.225

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

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

Modified Files:
	nickserv.c 
Log Message:
always update nick_info->owner during a merge (fixes bug #662972)


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -C2 -r1.224 -r1.225
*** nickserv.c	6 Jan 2003 02:12:51 -0000	1.224
--- nickserv.c	7 Jan 2003 04:25:57 -0000	1.225
***************
*** 2525,2535 ****
          for (last_ni=hi_to->nicks; last_ni->next; last_ni=last_ni->next) ;
          last_ni->next = hi_from->nicks;
!         while (hi_from->nicks) {
!             hi_from->nicks->owner = hi_to;
!             hi_from->nicks = hi_from->nicks->next;
!         }
!     } else {
!         hi_to->nicks = hi_from->nicks;
!         hi_from->nicks = NULL;
      }
  
--- 2525,2532 ----
          for (last_ni=hi_to->nicks; last_ni->next; last_ni=last_ni->next) ;
          last_ni->next = hi_from->nicks;
!     }
!     while (hi_from->nicks) {
!         hi_from->nicks->owner = hi_to;
!         hi_from->nicks = hi_from->nicks->next;
      }