Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2007-03-17 21:33:47 UTC
Modified files:
ircd/s_conf.c ircd/ircd.c doc/example.conf ChangeLog
Log message:
Merge new changes from u2_10_12_branch.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.840 ircu2.10/ChangeLog:1.841
--- ircu2.10/ChangeLog:1.840 Mon Mar 5 18:35:57 2007
+++ ircu2.10/ChangeLog Sat Mar 17 14:33:37 2007
@@ -1,3 +1,20 @@
+2007-03-16 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf (Class): Move the "Recommended client classes"
+ comment to a better place (and stop recommending them). Clarify
+ what maxlinks does. Make it clear that Operator password entries
+ only support umkpasswd formats.
+
+2007-03-16 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/ircd.c (parse_command_line): Emit a warning if using -x
+ when DEBUGMODE is disabled.
+
+2007-03-16 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/s_conf.c (find_conf_exact): Treat maxlinks == 0 as being
+ unlimited here, to match attach_conf()'s behavior.
+
2007-03-05 Michael Poole <[EMAIL PROTECTED]>
* ircd/m_privs.c (ms_privs): Use the correct source when
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.79 ircu2.10/doc/example.conf:1.80
--- ircu2.10/doc/example.conf:1.79 Sun Feb 25 08:12:45 2007
+++ ircu2.10/doc/example.conf Sat Mar 17 14:33:37 2007
@@ -106,8 +106,7 @@
# All connections to the server are associated with a certain "connection
# class", be they incoming or outgoing (initiated by the server), be they
# clients or servers.
-# Recommended client classes:
-# Take the following class blocks only as a guide.
+#
# Class {
# name = "<class>";
# pingfreq = time;
@@ -117,8 +116,12 @@
# usermode = "+i";
# };
#
-# maxlinks should be set at either 0 or 1.
-#
+# For connection classes used on server links, maxlinks should be set
+# to either 0 (for hubs) or 1 (for leaf servers). Client connection
+# classes may use maxlinks between 0 and approximately 4,000,000,000.
+# maxlinks = 0 means there is no limit on the number of connections
+# using the class.
+#
# <connect freq> applies only to servers, and specifies the frequency
# that the server tries to autoconnect. setting this to 0 will cause
# the server to attempt to connect repeatedly with no delay until the
@@ -161,9 +164,7 @@
# limits the number of matching clients allowed from a particular IP
# address.
#
-# Recommended client classes:
-# Client classes. 10 = locals; 2 = for all .net and .com that are not
-# in Europe; 1 = for everybody.
+# Take the following class blocks only as a guide.
Class {
name = "Local";
pingfreq = 1 minutes 30 seconds;
@@ -606,7 +607,8 @@
# By default, the password is hashed using the system's native crypt()
# function. Other password mechanisms are available; the umkpasswd
# utility from the ircd directory can hash passwords using those
-# mechanisms.
+# mechanisms. If you use a password format that is NOT generated by
+# umkpasswd, ircu will not recognize the oper's password.
#
# All privileges are shown with their default values; if you wish to
# override defaults, you should set only those privileges for the
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.103 ircu2.10/ircd/ircd.c:1.104
--- ircu2.10/ircd/ircd.c:1.103 Sat Dec 30 20:16:21 2006
+++ ircu2.10/ircd/ircd.c Sat Mar 17 14:33:37 2007
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.103 2006/12/31 04:16:21 entrope Exp $
+ * @version $Id: ircd.c,v 1.104 2007/03/17 21:33:37 entrope Exp $
*/
#include "config.h"
@@ -509,6 +509,9 @@
debuglevel = 0;
debugmode = optarg;
thisServer.bootopt |= BOOT_DEBUG;
+#ifndef DEBUGMODE
+ printf("WARNING: DEBUGMODE disabled; -x has no effect.\n");
+#endif
break;
default:
Index: ircu2.10/ircd/s_conf.c
diff -u ircu2.10/ircd/s_conf.c:1.95 ircu2.10/ircd/s_conf.c:1.96
--- ircu2.10/ircd/s_conf.c:1.95 Sun Feb 25 08:12:45 2007
+++ ircu2.10/ircd/s_conf.c Sat Mar 17 14:33:37 2007
@@ -19,7 +19,7 @@
*/
/** @file
* @brief ircd configuration file driver
- * @version $Id: s_conf.c,v 1.95 2007/02/25 16:12:45 entrope Exp $
+ * @version $Id: s_conf.c,v 1.96 2007/03/17 21:33:37 entrope Exp $
*/
#include "config.h"
@@ -662,6 +662,7 @@
else if (!ipmask_check(&cli_ip(cptr), &tmp->address.addr, tmp->addrbits))
continue;
if ((tmp->status & CONF_OPERATOR)
+ && (MaxLinks(tmp->conn_class) > 0)
&& (tmp->clients >= MaxLinks(tmp->conn_class)))
continue;
return tmp;
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
