X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/70c6c150f6f669425d7929e3e5229f3b12368d75..255130dde8eed921fea4b23786a5743fbd50cbda:/src/s_newconf.c

diff --git a/src/s_newconf.c b/src/s_newconf.c
index 592b410..6114a51 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: s_newconf.c 3508 2007-06-04 16:04:49Z jilles $
  */
 
 #include "stdinc.h"
@@ -651,6 +650,7 @@ valid_temp_time(const char *p)
 	return(result * 60);
 }
 
+/* Propagated bans are expired elsewhere. */
 static void
 expire_temp_rxlines(void *unused)
 {
@@ -663,6 +663,8 @@ expire_temp_rxlines(void *unused)
 	{
 		aconf = ptr->data;
 
+		if(aconf->lifetime != 0)
+			continue;
 		if(aconf->hold && aconf->hold <= rb_current_time())
 		{
 			if(ConfigFileEntry.tkline_expire_notices)
@@ -680,6 +682,8 @@ expire_temp_rxlines(void *unused)
 	{
 		aconf = ptr->data;
 
+		if(aconf->lifetime != 0)
+			continue;
 		if(aconf->hold && aconf->hold <= rb_current_time())
 		{
 			if(ConfigFileEntry.tkline_expire_notices)
@@ -695,6 +699,8 @@ expire_temp_rxlines(void *unused)
 	{
 		aconf = ptr->data;
 
+		if(aconf->lifetime != 0)
+			continue;
 		if(aconf->hold && aconf->hold <= rb_current_time())
 		{
 			if(ConfigFileEntry.tkline_expire_notices)