[srvx-commits] CVS: services/src nickserv.c,1.212,1.213

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

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

Modified Files:
	nickserv.c 
Log Message:
warn users when someone OREGISTERs an account
update allow_auth_dict correctly when a user changes nick


Index: nickserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/nickserv.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -C2 -r1.212 -r1.213
*** nickserv.c	28 Oct 2002 02:01:47 -0000	1.212
--- nickserv.c	31 Oct 2002 03:41:04 -0000	1.213
***************
*** 95,99 ****
  #define NSMSG_NONE "(none)"
  #define NSMSG_UNKNOWN "<unknown>"
! #define NSMSG_HANDLE_EXISTS	"Account $b%s$b already registered."
  #define NSMSG_HANDLE_TOO_LONG	"Account name too long."
  #define NSMSG_PASSWORD_SHORT    "Your password must be at least %lu characters long."
--- 95,99 ----
  #define NSMSG_NONE "(none)"
  #define NSMSG_UNKNOWN "<unknown>"
! #define NSMSG_HANDLE_EXISTS	"Account $b%s$b is already registered."
  #define NSMSG_HANDLE_TOO_LONG	"Account name too long."
  #define NSMSG_PASSWORD_SHORT    "Your password must be at least %lu characters long."
***************
*** 102,107 ****
  #define NSMSG_PASSWORD_READABLE "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)."
  #define NSMSG_PARTIAL_REGISTER  "Account has been registered to you; nick was already registered to someone else."
  #define NSMSG_OREGISTER_H_SUCCESS "Account has been registered."
! #define NSMSG_REGISTER_H_SUCCESS "Account has been registered to you."
  #define NSMSG_REGISTER_HN_SUCCESS "Account and nick have been registered to you."
  #define NSMSG_REQUIRE_OPER	 "You must be an $bIRC Operator$b to register the first account."
--- 102,108 ----
  #define NSMSG_PASSWORD_READABLE "Your password must have at least %lu digit(s), %lu capital letter(s), and %lu lower-case letter(s)."
  #define NSMSG_PARTIAL_REGISTER  "Account has been registered to you; nick was already registered to someone else."
+ #define NSMSG_OREGISTER_VICTIM    "%s has registered a new account for you (named %s)."
  #define NSMSG_OREGISTER_H_SUCCESS "Account has been registered."
! #define NSMSG_REGISTER_H_SUCCESS  "Account has been registered to you."
  #define NSMSG_REGISTER_HN_SUCCESS "Account and nick have been registered to you."
  #define NSMSG_REQUIRE_OPER	 "You must be an $bIRC Operator$b to register the first account."
***************
*** 862,865 ****
--- 863,869 ----
  	}
      }
+     if (settee && (user != settee)) {
+         nickserv_notice(settee, NSMSG_OREGISTER_VICTIM, user->nick, hi->handle);
+     }
      return hi;
  }
***************
*** 3152,3159 ****
  {
      struct handle_info *hi;
      if ((hi = dict_find(nickserv_allow_auth_dict, user->nick, 0))) {
!         /* Need to update allow_auth_dict .. */
          dict_remove(nickserv_allow_auth_dict, user->nick);
!         dict_insert(nickserv_allow_auth_dict, new_nick, hi);
      }
      timeq_del(0, nickserv_reclaim_p, user, TIMEQ_IGNORE_WHEN);
--- 3156,3171 ----
  {
      struct handle_info *hi;
+ 
      if ((hi = dict_find(nickserv_allow_auth_dict, user->nick, 0))) {
!         char old_nick[NICKLEN+1];
!         /* Need to update allow_auth_dict.  However, new_nick may be a
!          * temporary pointer. The dict stores the key pointer.  Make
!          * sure it knows about the change but still points to
!          * user->nick. */
          dict_remove(nickserv_allow_auth_dict, user->nick);
!         strcpy(old_nick, user->nick);
!         strcpy(user->nick, new_nick);
!         dict_insert(nickserv_allow_auth_dict, user->nick, hi);
!         strcpy(user->nick, old_nick);
      }
      timeq_del(0, nickserv_reclaim_p, user, TIMEQ_IGNORE_WHEN);