This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Undernet IRC Server Source Code.".

The branch, u2_10_12_branch has been updated
       via  55da36f3a64f1d578284019945d6a355ab6a256e (commit)
      from  6e7faac5523c092ba2062432c5e0228bfa7871f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 55da36f3a64f1d578284019945d6a355ab6a256e
Author: Michael Poole <[email protected]>
Date:   Wed Oct 19 23:09:34 2016 -0400

    get_history(): Always use KILLCHASETIMELIMIT value.

diff --git a/include/whowas.h b/include/whowas.h
index 6f3eae1..8d1a179 100644
--- a/include/whowas.h
+++ b/include/whowas.h
@@ -72,7 +72,7 @@ extern struct Whowas* whowashash[];
 
 extern unsigned int hash_whowas_name(const char *name);
 
-extern struct Client *get_history(const char *nick, time_t timelimit);
+extern struct Client *get_history(const char *nick);
 extern void add_history(struct Client *cptr, int still_on);
 extern void off_history(const struct Client *cptr);
 extern void initwhowas(void);
diff --git a/ircd/channel.c b/ircd/channel.c
index 9c0f192..86001db 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -229,7 +229,7 @@ struct Client* find_chasing(struct Client* sptr, const 
char* user, int* chasing)
   if (who)
     return who;
 
-  if (!(who = get_history(user, feature_int(FEAT_KILLCHASETIMELIMIT)))) {
+  if (!(who = get_history(user))) {
     send_reply(sptr, ERR_NOSUCHNICK, user);
     return 0;
   }
diff --git a/ircd/m_kill.c b/ircd/m_kill.c
index b038bc8..d04e3a4 100644
--- a/ircd/m_kill.c
+++ b/ircd/m_kill.c
@@ -262,7 +262,7 @@ int mo_kill(struct Client* cptr, struct Client* sptr, int 
parc, char* parv[])
      * rewrite the KILL for this new nickname--this keeps
      * servers in synch when nick change and kill collide
      */
-    if (!(victim = get_history(user, (long)15)))
+    if (!(victim = get_history(user)))
       return send_reply(sptr, ERR_NOSUCHNICK, user);
 
     sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :Changed KILL %s into %s", sptr,
diff --git a/ircd/whowas.c b/ircd/whowas.c
index fed3fff..b3cc224 100644
--- a/ircd/whowas.c
+++ b/ircd/whowas.c
@@ -317,13 +317,12 @@ void off_history(const struct Client *cptr)
 
 /** Find a client who has recently used a particular nickname.
  * @param[in] nick Nickname to find.
- * @param[in] timelimit Maximum age for entry.
  * @return User's online client, or NULL if none is found.
  */
-struct Client *get_history(const char *nick, time_t timelimit)
+struct Client *get_history(const char *nick)
 {
   struct Whowas *temp = whowashash[hash_whowas_name(nick)];
-  timelimit = CurrentTime - timelimit;
+  time_t timelimit = CurrentTime - feature_int(FEAT_KILLCHASETIMELIMIT);
 
   for (; temp; temp = temp->hnext)
     if (0 == ircd_strcmp(nick, temp->name) && temp->logoff > timelimit)
-----------------------------------------------------------------------

Summary of changes:
 include/whowas.h |    2 +-
 ircd/channel.c   |    2 +-
 ircd/m_kill.c    |    2 +-
 ircd/whowas.c    |    5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Undernet IRC Server Source Code.
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches

Reply via email to