Merge branch 'master' into HostServ

diff --combined src/nickserv.c
index af25c3eba1a5ecdf84589eb4780169554d36d075,4cb86a7adb1d7287fea278e96ee61c72f0121499..25c2a43cfa9dc427b1adead6d1e66e0e02632d6d
--- 1/src/nickserv.c
--- 2/src/nickserv.c
+++ b/src/nickserv.c
@@@ -988,7 -988,7 +988,7 @@@ reg_handle_rename_func(handle_rename_fu
      rf_list[rf_list_used++] = func;
  }
  
 -static char *
 +char *
  generate_fakehost(struct handle_info *handle)
  {
      extern const char *hidden_host_suffix;
@@@ -1009,7 -1009,7 +1009,7 @@@
      return handle->fakehost;
  }
  
 -static char *
 +char *
  generate_fakeident(struct handle_info *handle, struct userNode *user)
  {
      static char buffer[USERLEN+1];
@@@ -1023,7 -1023,7 +1023,7 @@@
      return handle->fakeident;
  }
  
 -static void
 +void
  apply_fakehost(struct handle_info *handle, struct userNode *user)
  {
      struct userNode *target;
@@@ -1969,7 -1969,7 +1969,7 @@@ static NICKSERV_FUNC(cmd_auth
      return 1;
  }
  
- struct handle_info *checklogin(const char *user, const char *pass, const char *numeric, const char *hostmask, const char *ipmask)
+ struct handle_info *checklogin(const char *user, const char *pass, UNUSED_ARG(const char *numeric), const char *hostmask, const char *ipmask)
  {
      struct handle_info *hi;
      unsigned int match = 0, ii = 0;