]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/lists.c
Make configure[.ng] compatible with autoconf 1.10 again
[ngircd-alex.git] / src / ngircd / lists.c
index 4f57ca73521f6b65f568d0aefa9c60b844a685c6..21058a03116298b6cc81ff98f40b40d0c9caa502 100644 (file)
@@ -147,10 +147,8 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil,
 
        strlcpy(newelem->mask, Mask, sizeof(newelem->mask));
        if (Reason) {
-               newelem->reason = malloc(strlen(Reason) + 1);
-               if (newelem->reason)
-                       strlcpy(newelem->reason, Reason, strlen(Reason) + 1);
-               else
+               newelem->reason = strdup(Reason);
+               if (!newelem->reason)
                        Log(LOG_EMERG,
                            "Can't allocate memory for new list reason text!");
        }
@@ -285,7 +283,7 @@ Lists_MakeMask(const char *Pattern)
                excl = NULL;
 
        if (!at && !excl) {
-               /* Neither "!" nor "@" found: use string as nick name */
+               /* Neither "!" nor "@" found: use string as nickname */
                strlcpy(TheMask, Pattern, sizeof(TheMask) - 5);
                strlcat(TheMask, "!*@*", sizeof(TheMask));
                return TheMask;
@@ -344,7 +342,7 @@ Lists_CheckReason(struct list_head *h, CLIENT *Client)
 
        while (e) {
                next = e->next;
-               if (Match(e->mask, Client_Mask(Client))) {
+               if (Match(e->mask, Client_MaskCloaked(Client))) {
                        if (e->valid_until == 1) {
                                /* Entry is valid only once, delete it */
                                LogDebug("Deleted \"%s\" from list (used).",