ngIRCd Release 27

[ngircd-alex.git] / src / ngircd / lists.c

diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c
index a091addb26860ed703c40ddc25eb5c0c65f1d582..69ea79a4063396bcfd7aa07e663b48ea76e1b6fe 100644 (file)
--- a/src/ngircd/lists.c
+++ b/src/ngircd/lists.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2018 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ struct list_elem {
 /**
  * Get IRC mask stored in list element.
  *
- * @param list_elem List element.
+ * @param e List element.
  * @return Pointer to IRC mask
  */
 GLOBAL const char *
@@ -52,7 +52,7 @@ Lists_GetMask(const struct list_elem *e)
 /**
  * Get optional "reason" text stored in list element.
  *
- * @param list_elem List element.
+ * @param e List element.
  * @return Pointer to "reason" text or empty string ("").
  */
 GLOBAL const char *
@@ -65,7 +65,7 @@ Lists_GetReason(const struct list_elem *e)
 /**
  * Get "validity" value stored in list element.
  *
- * @param list_elem List element.
+ * @param e List element.
  * @return Validity: 0=unlimited, >0 until this time stamp.
  */
 GLOBAL time_t
@@ -78,7 +78,7 @@ Lists_GetValidity(const struct list_elem *e)
 /**
  * Get "onlyonce" value stored in list element.
  *
- * @param list_elem List element.
+ * @param e List element.
  * @return True if the element was stored for single use, false otherwise.
  */
 GLOBAL bool
@@ -341,7 +341,7 @@ Lists_CheckReason(struct list_head *h, CLIENT *Client, char *reason, size_t len)
 
        while (e) {
                next = e->next;
-               if (MatchCaseInsensitive(e->mask, Client_MaskCloaked(Client))) {
+               if (MatchCaseInsensitive(e->mask, Client_MaskCloaked(Client)) || MatchCaseInsensitive(e->mask, Client_Mask(Client))) {
                        if (len && e->reason)
                                strlcpy(reason, e->reason, len);
                        if (e->onlyonce) {
@@ -381,11 +381,11 @@ Lists_Expire(struct list_head *h, const char *ListName)
                if (e->valid_until > 0 && e->valid_until < now) {
                        /* Entry is expired, delete it */
                        if (e->reason)
-                               Log(LOG_INFO,
+                               Log(LOG_NOTICE|LOG_snotice,
                                    "Deleted \"%s\" (\"%s\") from %s list (expired).",
                                    e->mask, e->reason, ListName);
                        else
-                               Log(LOG_INFO,
+                               Log(LOG_NOTICE|LOG_snotice,
                                    "Deleted \"%s\" from %s list (expired).",
                                    e->mask, ListName);
                        Lists_Unlink(h, last, e);