CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_03
Commit time: 2002-11-23 12:19:38 UTC
Modified files:
Tag: u2_10_11_03
ircd/m_server.c doc/example.conf ChangeLog
Log message:
- Fixed the H: lines not being rejected by mask bug.
- Documented the H-line port being the maximum hop
count allowed in example.conf.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.125.2.12 ircu2.10/ChangeLog:1.290.2.125.2.13
--- ircu2.10/ChangeLog:1.290.2.125.2.12 Sat Nov 23 03:10:50 2002
+++ ircu2.10/ChangeLog Sat Nov 23 04:19:27 2002
@@ -1,3 +1,7 @@
+2002-11-24 Andrew Miller <[EMAIL PROTECTED]>
+ * ircd/m_server.c: Fixed the H: line hostname checking.
+ * docs/example.conf: Documented the max-hops feature.
+
2002-11-23 Perry Lorier <[EMAIL PROTECTED]>
* ircd/m_nick.c: ms_nick had mysteriously gained a "return" in the
middle of it. This meant when two people had the same TS on a nick
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.15.2.7.4.2 ircu2.10/doc/example.conf:1.15.2.7.4.3
--- ircu2.10/doc/example.conf:1.15.2.7.4.2 Wed Oct 23 11:31:02 2002
+++ ircu2.10/doc/example.conf Sat Nov 23 04:19:27 2002
@@ -302,7 +302,7 @@
# assigned one or two uplinks to which your server can connect.
# If your uplink(s) also connect to other servers than yours (which is
# probable), you need to define your uplink as being allowed to "hub".
-# H:<allowed hostmask>::<server name>
+# H:<allowed hostmask>::<server name>:<maximum hops that can be introduced>
H:*.*::Amsterdam.NL.Eu.UnderNet.org
Index: ircu2.10/ircd/m_server.c
diff -u ircu2.10/ircd/m_server.c:1.19.2.3 ircu2.10/ircd/m_server.c:1.19.2.3.8.1
--- ircu2.10/ircd/m_server.c:1.19.2.3 Wed Jul 17 16:06:32 2002
+++ ircu2.10/ircd/m_server.c Sat Nov 23 04:19:26 2002
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_server.c,v 1.19.2.3 2002/07/17 23:06:32 kev Exp $
+ * $Id: m_server.c,v 1.19.2.3.8.1 2002/11/23 12:19:26 a1kmm Exp $
*/
/*
@@ -905,7 +905,8 @@
LHcptr = cptr; /* Squit ourselfs */
}
else if (!(lhconf = find_conf_byname(cli_confs(cptr), cli_name(cptr), CONF_HUB))
||
- (lhconf->port && (hop > lhconf->port)))
+ (lhconf->port && (hop > lhconf->port)) ||
+ (!BadPtr(lhconf->host) && match(lhconf->host, parv[1])))
{
struct Client *ac3ptr;
active_lh_line = 2;
----------------------- End of diff -----------------------
