From: Zoot <zoot@gamesurge.net>
Date: Tue, 23 Nov 2004 04:09:30 +0000 (+0000)
Subject: Fix ban reader
X-Git-Tag: v1.4.0-rc1~192
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=3111244015e3761744d589375393ac9d43ed1b0f

Fix ban reader

 * src/chanserv.c: Drop invalid bans with no reason during database reads
   and require bans to have a reason set in add_channel_ban().
git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-84
---

diff --git a/ChangeLog b/ChangeLog
index 43fe2e3..ec9fe13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2004-srvx/srvx--devo--1.3
 #
 
+2004-11-23 04:09:30 GMT	Zoot <zoot@gamesurge.net>	patch-84
+
+    Summary:
+      Fix ban reader
+    Revision:
+      srvx--devo--1.3--patch-84
+
+     * src/chanserv.c: Drop invalid bans with no reason during database reads
+       and require bans to have a reason set in add_channel_ban().
+
+    modified files:
+     ChangeLog src/chanserv.c
+
+
 2004-11-10 01:25:53 GMT	Michael Poole <mdpoole@troilus.org>	patch-83
 
     Summary:
diff --git a/src/chanserv.c b/src/chanserv.c
index abba31f..c38cd51 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1202,7 +1202,7 @@ add_channel_ban(struct chanData *channel, const char *mask, char *owner, time_t
     safestrncpy(bd->mask, mask, sizeof(bd->mask));
     if(owner)
         safestrncpy(bd->owner, owner, sizeof(bd->owner));
-    bd->reason = reason ? strdup(reason) : NULL;
+    bd->reason = strdup(reason);
 
     if(expires)
 	timeq_add(expires, expire_ban, bd);
@@ -6591,7 +6591,7 @@ ban_read_helper(const char *key, struct record_data *rd, struct chanData *chan)
     else
         expires_time = 0;
 
-    if(expires_time && (expires_time < now))
+    if(!reason || (expires_time && (expires_time < now)))
         return;
 
     bData = add_channel_ban(chan, key, owner, set_time, triggered_time, expires_time, reason);