X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=df522de4c27a577274900a002d54aacc9903cec2;hb=bb81e1a5f38b1d6487e53aa5ac69ca7ced9f6562;hp=56a2774946fafd2e18e1dc942bca14cf6bce9c90;hpb=fd0445fad795b75791f7b376fab6936621bb5dad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 56a277494..df522de4c 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -148,9 +148,9 @@ void read_xline_defaults()
 
 // adds a g:line
 
-void add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
 {
-	del_gline(hostmask);
+	bool ret = del_gline(hostmask);
 	GLine item;
 	item.duration = duration;
 	strlcpy(item.hostmask,hostmask,199);
@@ -167,13 +167,14 @@ void add_gline(long duration, const char* source,const char* reason,const char*
 	{
 		pglines.push_back(item);
 	}
+	return !ret;
 }
 
 // adds an e:line (exception to bans)
 
-void add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+bool add_eline(long duration, const char* source, const char* reason, const char* hostmask)
 {
-        del_eline(hostmask);
+        bool ret = del_eline(hostmask);
         ELine item;
         item.duration = duration;
         strlcpy(item.hostmask,hostmask,199);
@@ -190,13 +191,14 @@ void add_eline(long duration, const char* source, const char* reason, const char
 	{
 		pelines.push_back(item);
 	}
+	return !ret;
 }
 
 // adds a q:line
 
-void add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool add_qline(long duration, const char* source, const char* reason, const char* nickname)
 {
-	del_qline(nickname);
+	bool ret = del_qline(nickname);
 	QLine item;
 	item.duration = duration;
 	strlcpy(item.nick,nickname,63);
@@ -214,13 +216,14 @@ void add_qline(long duration, const char* source, const char* reason, const char
 	{
 		pqlines.push_back(item);
 	}
+	return !ret;
 }
 
 // adds a z:line
 
-void add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
 {
-	del_zline(ipaddr);
+	bool ret = del_zline(ipaddr);
 	ZLine item;
 	item.duration = duration;
 	if (strchr(ipaddr,'@'))
@@ -244,13 +247,14 @@ void add_zline(long duration, const char* source, const char* reason, const char
 	{
 		pzlines.push_back(item);
 	}
+	return !ret;
 }
 
 // adds a k:line
 
-void add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+bool add_kline(long duration, const char* source, const char* reason, const char* hostmask)
 {
-	del_kline(hostmask);
+	bool ret = del_kline(hostmask);
 	KLine item;
 	item.duration = duration;
 	strlcpy(item.hostmask,hostmask,200);
@@ -267,6 +271,7 @@ void add_kline(long duration, const char* source, const char* reason, const char
 	{
 		pklines.push_back(item);
 	}
+	return !ret;
 }
 
 // deletes a g:line, returns true if the line existed and was removed
@@ -660,7 +665,7 @@ void apply_lines(const int What)
 	{
 		userrec* u = (userrec*)(*u2);
 		u->MakeHost(host);
-		if (elines.size())
+		if (elines.size() || pelines.size())
 		{
 			// ignore people matching exempts
 			if (matches_exception(host))
@@ -668,7 +673,7 @@ void apply_lines(const int What)
 		}
 		if ((What & APPLY_GLINES) && (glines.size() || pglines.size()))
 		{
-			if (check = matches_gline(host))
+			if ((check = matches_gline(host)))
 			{
 				snprintf(reason,MAXBUF,"G-Lined: %s",check);
 				Goners->AddItem(u,reason);
@@ -676,7 +681,7 @@ void apply_lines(const int What)
 		}
 		if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
 		{
-			if (check = matches_kline(host))
+			if ((check = matches_kline(host)))
 			{
 				snprintf(reason,MAXBUF,"K-Lined: %s",check);
 				Goners->AddItem(u,reason);
@@ -684,15 +689,15 @@ void apply_lines(const int What)
 		}
 		if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
 		{
-			if (check = matches_qline(u->nick))
+			if ((check = matches_qline(u->nick)))
 			{
-				snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check);
+				snprintf(reason,MAXBUF,"Q-Lined: %s",check);
 				Goners->AddItem(u,reason);
 			}
 		}
 		if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
 		{
-			if (check = matches_zline(u->ip))
+			if ((check = matches_zline((char*)inet_ntoa(u->ip4))))
 			{
 				snprintf(reason,MAXBUF,"Z-Lined: %s",check);
 				Goners->AddItem(u,reason);
@@ -707,40 +712,40 @@ void apply_lines(const int What)
 void stats_k(userrec* user)
 {
 	for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
-		WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 	for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
-		WriteServ(user->fd,"216 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 }
 
 void stats_g(userrec* user)
 {
 	for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
-		WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 	for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
-		WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 }
 
 void stats_q(userrec* user)
 {
 	for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
-		WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
 	for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
-		WriteServ(user->fd,"217 %s :%s %d %d %s %s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason);
 }
 
 void stats_z(userrec* user)
 {
 	for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
-		WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
 	for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
-		WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason);
 }
 
 void stats_e(userrec* user)
 {
         for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
-                WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+                WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 	for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
-		WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
+		WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason);
 }