X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/6b2cf989b6f77ca06d6d46efa3b26c0ea22d76e4..a4d2230fbc3276ed947b801ace231fb54b402ec7:/src/s_newconf.c?ds=sidebyside

diff --git a/src/s_newconf.c b/src/s_newconf.c
index b26be9d..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"
@@ -486,7 +485,7 @@ find_xline(const char *gecos, int counter)
 	{
 		aconf = ptr->data;
 
-		if(match_esc(aconf->name, gecos))
+		if(match_esc(aconf->host, gecos))
 		{
 			if(counter)
 				aconf->port++;
@@ -507,7 +506,7 @@ find_xline_mask(const char *gecos)
 	{
 		aconf = ptr->data;
 
-		if(!irccmp(aconf->name, gecos))
+		if(!irccmp(aconf->host, gecos))
 			return aconf;
 	}
 
@@ -524,7 +523,7 @@ find_nick_resv(const char *name)
 	{
 		aconf = ptr->data;
 
-		if(match_esc(aconf->name, name))
+		if(match_esc(aconf->host, name))
 		{
 			aconf->port++;
 			return aconf;
@@ -544,7 +543,7 @@ find_nick_resv_mask(const char *name)
 	{
 		aconf = ptr->data;
 
-		if(!irccmp(aconf->name, name))
+		if(!irccmp(aconf->host, name))
 			return aconf;
 	}
 
@@ -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,12 +663,14 @@ 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)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary RESV for [%s] expired",
-						aconf->name);
+						aconf->host);
 
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &resvTable[i]);
@@ -680,12 +682,14 @@ 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)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary RESV for [%s] expired",
-						aconf->name);
+						aconf->host);
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &resv_conf_list);
 		}
@@ -695,12 +699,14 @@ 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)
 				sendto_realops_snomask(SNO_GENERAL, L_ALL,
 						"Temporary X-line for [%s] expired",
-						aconf->name);
+						aconf->host);
 			free_conf(aconf);
 			rb_dlinkDestroy(ptr, &xline_conf_list);
 		}