[IRC-Dev CVS] [CVS] Module ircd-ircdev: Change committed

[Toni G. <zo...@us...>]

Committer  : zolty
CVSROOT    : /cvsroot/irc-dev
Module     : ircd-ircdev
Commit time: 2007-09-21 11:10:41 UTC

Modified files:
     doc/en/features.txt doc/ircd.sample-en.conf

Log message:

Actualizacion de archivos de configuracion en ingles

---------------------- diff included ----------------------
Index: ircd-ircdev/doc/en/features.txt
diff -u ircd-ircdev/doc/en/features.txt:1.4 ircd-ircdev/doc/en/features.txt:1.5
--- ircd-ircdev/doc/en/features.txt:1.4	Tue Oct 25 02:52:43 2005
+++ ircd-ircdev/doc/en/features.txt	Fri Sep 21 04:10:30 2007
@@ -1,4 +1,4 @@
-$Id: features.txt,v 1.4 2005/10/25 09:52:43 zolty Exp $
+$Id: features.txt,v 1.5 2007/09/21 11:10:30 zolty Exp $
 
 Many of the old compile-time options are now configured through the
 server configuration file, ircd.conf. This file is intended to
@@ -7,6 +7,7 @@
 NOTE THAT THESE NAMES ARE CASE SENSITIVE! Values are not case sensitive
 unless stated otherwise in the documentation for that feature.
 
+
 DOMAINNAME
  * Type: string
  * Default: picked by ./configure from /etc/resolv.conf
@@ -206,6 +207,14 @@
 connections.
 
 
+NOIDENT
+ * Type: boolean
+ * Default: FALSE
+
+NOIDENT disables RFC 1413 (ident protocol) lookups of clients'
+usernames.
+
+
 RANDOM_SEED
  * Type: string
  * Default: none
@@ -285,25 +294,47 @@
  * Type: boolean
  * Default: TRUE
 
-Bla.
+This allows local users to set the +A and +U modes (admin and user
+passwords, respectively) on channels where they are marked as channel
+managers. This feature must be disabled until all servers on the
+network are able to interpret and handle these modes correctly.
+
+
+ZANNELS
+ * Type: boolean
+ * Default: TRUE
+
+This preserves empty channels with no admin password so that it is
+impractical to become the channel manager by clearing out the channel.
+It must be set to FALSE if there are both 2.10.11.x servers and
+2.10.12.y servers on the network where y < 4. It should be set to
+TRUE whenever the OPLEVELS features is TRUE.
 
 
 LOCAL_CHANNELS
-  * Type: boolean
-  * Default: TRUE
+ * Type: boolean
+ * Default: TRUE
 
 If set, allow users to create local channels.
 
 
 TOPIC_BURST
-  * Type: boolean
-  * Default: FALSE
+ * Type: boolean
+ * Default: FALSE
 
 If set, send the current topic value and timestamp for channels during
-burst.  This generally only makes sense for hubs to use, and it causes
+burst. This generally only makes sense for hubs to use, and it causes
 a large increase in net.burst size.
 
 
+USER_GLIST
+* Type: boolean
+* Default: FALSE
+
+Optionally removes the ability to list glines by users
+(ie /GLINE id...@ho..., shows reason, expiry time etc)
+
+
 KILLCHASETIMELIMIT
  * Type: integer
  * Default: 30
@@ -335,7 +366,7 @@
 
 NICKLEN
  * Type: integer
- * Default: 12
+ * Default: 15
 
 This is the allowed length of the nickname length. It may not be
 larger than the NICKLEN #define, and should usually be the same
@@ -343,21 +374,6 @@
 in nickname length for a network.
 
 
-CHANNELLEN
- * Type: integer
- * Default: 200
-
-This is the allowed length of locally created channels.  It may not be
-larger than the CHANNELLEN #define.  Like the NICKLEN feature, this is
-intended to ease changes in channel name length across a network.
-
-USER_GLIST
-* Type: boolean
-* Default: FALSE
-
-Optionally removes the ability to list glines by users
-(ie /GLINE id...@ho..., shows reason, expiry time etc)
-
 AVBANLEN
  * Type: integer
  * Default: 40
@@ -521,6 +537,15 @@
 considered an attack.
 
 
+CHANNELLEN
+ * Type: integer
+ * Default: 200
+
+This is the allowed length of locally created channels. It may not be
+larger than the CHANNELLEN #define. Like the NICKLEN feature, this is
+intended to ease changes in channel name length across a network.
+
+
 MPATH
  * Type: string
  * Default: "ircd.motd"
@@ -550,6 +575,13 @@
 ps(1) isn't necessary.
 
 
+DDBPATH
+ * Type: string
+ * Default: "database"
+
+DDBPATH is the directory for Distributed DataBases.
+
+
 TOS_SERVER
  * Type: integer
  * Default: 0x08
@@ -674,207 +706,205 @@
 This removes /TRACE from users.
 
 
-HIS_STATS_a
+HIS_STATS_NAMESERVERS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS a from users.
 
 
-HIS_STATS_c
+HIS_STATS_DDB
+ * Type: boolean
+ * Default: TRUE
+
+This removes /STATS b from users.
+
+
+HIS_STATS_CONNECT
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS c from users.
 
 
-HIS_STATS_d
+HIS_STATS_CRULES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS d from users.
 
 
-HIS_STATS_e
+HIS_STATS_ENGINE
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS e from users.
 
 
-HIS_STATS_f
+HIS_STATS_FEATURES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS f from users.
 
 
-HIS_STATS_g
+HIS_STATS_GLINES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS g from users.
 
 
-HIS_STATS_h
+HIS_STATS_HISTOGRAM
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS h from users.
 
 
-HIS_STATS_i
+HIS_STATS_ACCESS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS i from users.
 
 
-HIS_STATS_j
+HIS_STATS_JUPES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS j from users.
 
 
-HIS_STATS_k
+HIS_STATS_KLINES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS k from users.
 
 
-HIS_STATS_k
- * Type: boolean
- * Default: TRUE
-
-This removes /STATS k from users.
-
-
-HIS_STATS_l
+HIS_STATS_LINKS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS l from users.
 
 
-HIS_STATS_L
+HIS_STATS_MODULES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS L from users.
 
 
-HIS_STATS_m
+HIS_STATS_COMMANDS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS m from users.
 
 
-HIS_STATS_M
- * Type: boolean
- * Default: TRUE
-
-This removes /STATS M from users.
-
-
-HIS_STATS_o
+HIS_STATS_OPERATORS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS o from users.
 
 
-HIS_STATS_p
+HIS_STATS_PORTS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS p from users.
 
 
-HIS_STATS_q
+HIS_STATS_QUARANTINES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS q from users.
 
 
-HIS_STATS_r
+HIS_STATS_USAGE
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS r from users.
 
 
-HIS_STATS_R
+HIS_STATS_MAPPINGS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS R from users.
 
 
-HIS_STATS_t
+HIS_STATS_LOCALS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS t from users.
 
 
-HIS_STATS_T
+HIS_STATS_MOTDS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS T from users.
 
 
-HIS_STATS_u
+HIS_STATS_UPTIME
  * Type: boolean
  * Default: FALSE
 
 This removes /STATS u from users.
 
 
-HIS_STATS_U
+HIS_STATS_UWORLD
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS U from users.
 
 
-HIS_STATS_v
+HIS_STATS_VSERVERS
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS v from users.
 
 
-HIS_STATS_w
+HIS_STATS_USERLOAD
  * Type: boolean
  * Default: FALSE
 
 This removes /STATS w from users.
 
 
-HIS_STATS_x
+HIS_STATS_MEMUSAGE
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS x from users.
 
 
-HIS_STATS_y
+HIS_STATS_CLASSES
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS y from users.
 
 
-HIS_STATS_z
+HIS_STATS_MEMORY
  * Type: boolean
  * Default: TRUE
 
 This removes /STATS z from users.
+HIS_STATS_IAUTH
+ * Type: boolean
+ * Default: TRUE
+
+This disables /STATS IAUTH and /STATS IAUTHCONF from users.
 
 
 HIS_WHOIS_SERVERNAME
@@ -912,6 +942,13 @@
 This replaces hopcount to a static 3 in replies to /WHO.
 
 
+HIS_MODEWHO
+ * Type: boolean
+ * Default: TRUE
+
+This doesn't show which server performed a channel mode change.
+
+
 HIS_BANWHO
  * Type: boolean
  * Default: TRUE
@@ -947,13 +984,6 @@
 This removes server names in net break sign-offs.
 
 
-HIS_WHOIS_LOCALCHAN
- * Type: boolean
- * Default: TRUE
-
-This removes local channels in replies to /WHOIS.
-
-
 HIS_SERVERNAME
  * Type: string
  * Default: "*.irc-dev.net"
@@ -988,3 +1018,45 @@
  * Default: "ftp://ftp.irc.org/pub/irc/clients"
 
 This defines a URL that users may visit to find compatible IRC clients.
+
+
+URLREG
+ * Type: string
+ * Default: "http://cservice.undernet.org/live/"
+
+This defines a URL that is used in server response 477 (ERR_NEEDREGGEDNICK) to
+let users know which website they must visit to obtain a proper account for
+authentication.
+
+
+SPAM_OPER_COUNTDOWN
+ * Type: integer
+ * Default: 5
+
+Number of times a user may continue to join in a spambot-like fashion
+between snotices.
+
+
+SPAM_EXPIRE_TIME
+ * Type: integer
+ * Default: 120
+
+Number of seconds before a spambot-like join is "forgotten".
+
+
+SPAM_JOINED_TIME
+ * Type: integer
+ * Default: 60
+
+Number of seconds a client must stay in channels before a join/part
+sequence is not considered spambot-like. This can be set to zero to
+disable spambot warnings.
+
+
+SPAM_FJP_COUNT
+ * Type: integer
+ * Default: 5
+
+Number of fast join-part sequences before a client is judged to look
+like a spambot.
+
Index: ircd-ircdev/doc/ircd.sample-en.conf
diff -u ircd-ircdev/doc/ircd.sample-en.conf:1.24 ircd-ircdev/doc/ircd.sample-en.conf:1.25
--- ircd-ircdev/doc/ircd.sample-en.conf:1.24	Wed Oct 26 08:13:27 2005
+++ ircd-ircdev/doc/ircd.sample-en.conf	Fri Sep 21 04:10:30 2007
@@ -1,6 +1,6 @@
 # ircd.conf - configuration file for IRC-Dev's IRCD.
 #
-# Last Updated:  25, October 2005.
+# Last Updated:  21, September 2007.
 #
 # Written by Niels <ni...@un...>, based on the original example.conf,
 # server code and some real-life (ahem) experience.
@@ -57,6 +57,10 @@
 #         vhost = "ipv6vhost";
 #         description = "description";
 #         numeric = numericnumber;
+#         dns vhost = "ipv4vhost";
+#         dns vhost = "ipv6vhost";
+#         dns server = "ipaddress";
+#         dns server = "ipaddress2";
 # };
 #
 # If present, "vhost" must contain a valid address in dotted
@@ -72,6 +76,15 @@
 #
 # Note that "numeric" field has to be unique on the network your server
 # is running on, must be between 0 and 4095, and is not updated on a rehash.
+#
+# The two DNS lines allow you to specify the local IP address to use
+# for DNS lookups "dns vhost" and one or more DNS server addresses
+# to use.  If the "vhost" is ambiguous for some reason, you may list
+# IPV4 and/or IPV6 between the equals sign and the address string.
+# The default DNS vhost is to let the operating system assign the
+# address, and the default DNS servers are read from /etc/resolv.conf.
+# In most cases, you do not need to specify either the dns vhost or
+# the dns server.
 General {
          name = "gmsis.irc-dev.net";
          description = "IRC-Dev.Net devel server.";
@@ -93,10 +106,8 @@
 #
 # All connections to the server are associated with a certain "connection
 # class", be they incoming or outgoing (initiated by the server), be they
-# clients, servers or Martians. (Note that ircd doesn't have direct support
-# Recommended client classes:
-# for Martians (yet?); they will have to register as normal users. ;-)
-# Take the following class blocks only as a guide.
+# clients or servers.
+#
 # Class {
 #  name = "<class>";
 #  pingfreq = time;
@@ -106,8 +117,12 @@
 #  usermode = "+i";
 # };
 #
-# The "maxlinks" field 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.
+# 
 # The "connectfreq" field 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 
@@ -150,9 +165,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;
@@ -166,11 +179,6 @@
  sendq = 160000;
  maxlinks = 400;
 };
-Client
-{
- class = "Other";
- username = "*";
-};
 Class {
  name = "Telefonica";
  pingfreq = 1 minutes 30 seconds;
@@ -209,6 +217,7 @@
  # local_gline (can set a G-line for this server only)
  # local_badchan (can set a Gchan for this server only)
  # see_chan (can see users in +s channels in /WHO)
+ # list_chan (can see +s channels with /LIST S)
  # wide_gline (can use ! to force a wide G-line)
  # see_opers (can see opers without DISPLAY privilege)
  # local_opmode (can use OPMODE/CLEARMODE on local channels)
@@ -223,8 +232,9 @@
  #
  # For global opers (with propagate = yes or local = no), the default
  # is to grant all of the above privileges EXCEPT walk_lchan,
- # unlimit_query, set, badchan, local_badchan and apass_opmode.  For.
- # local opers, the default is to grant ONLY the following privileges:  
+ # unlimit_query, set, badchan, local_badchan and apass_opmode.
+ # For local opers, the default is to grant ONLY the following
+ # privileges:
  #  chan_limit, mode_lchan, show_invis, show_all_invis, local_kill,
  #  rehash, local_gline, local_jupe, local_opmode, whox, display,
  #  force_local_opmode
@@ -241,8 +251,8 @@
 # other domains in the same toplevel, thus setting up some sort of "reverse
 # Kill block".
 # Client {
-#  host = "host";
-#  ip = "ip";
+#  host = "user@host";
+#  ip = "user@ip";
 #  password = "password";
 #  class = "classname";
 # };
@@ -250,22 +260,22 @@
 # Technical description (for examples, see below):
 # For every connecting client, the IP address is known.  A reverse lookup
 # on this IP-number is done to get the (/all) hostname(s).
-# Each hostname that belongs to this IP-number is matched to "host" field,
+# Each hostname that belongs to this IP-number is matched to "hostmask" field,
 # and the "Client" block is used when any matches; the client will then show
 # with this particular hostname.  If none of the hostnames match, then
-# the IP-number is matched against the "ip" field, if this matches then the
+# the IP-number is matched against the "ipmask" field, if this matches then the
 # "Client" block is used nevertheless and the client will show with the
 # first (main) hostname if any; if the IP-number did not resolve then the
 # client will show with the dot notation of the IP-number.
 # There is a special case for the UNIX domain sockets and localhost connections
-# though; in this case the "ip" field is compared with the name of the server 
+# though; in this case the "ip mask" field is compared with the name of the server 
 # (thus not with any IP-number representation). The name of the server is the
 # one returned in the numeric 002 reply, for example:
 # 002 Your host is 2.irc-dev.net[jolan.ppro], running version ...
 # Then the "jolan.ppro" is the name used for matching.
 # Therefore, unix domain sockets, and connections to localhost would
 # match this block:
-# host = "jolan.ppro";
+# host = "*@jolan.ppro";
 #
 # This is the "fallback" entry. All .uk, .nl, and all unresolved are
 # in these two lines.
@@ -275,14 +285,14 @@
 Client
 {
  class = "Other";
- ip = "*";
+ ip = "*@*";
 };
 
 
 Client
 {
  class = "Other";
- host = "*";
+ host = "*@*";
 };
 # If you don't want unresolved dudes to be able to connect to your
 # server, do not specify any "ip = " settings.
@@ -290,7 +300,7 @@
 # Here, take care of all Spain's Telefonica users.
 Client
 {
- host = "*.pooles.rima-tde.net";
+ host = "*.rima-tde.net";
  class = "Telefonica";
 };
 
@@ -311,13 +321,13 @@
 # way around - K-lining every single ISP in the US.
 # I wish people in Holland just got a .nl domain, and not try to be
 # cool and use .com...
-Client { host = "*.wirehub.net"; class = "Other";};
-Client { host = "*.planete.net"; class = "Other";};
-Client { host = "*.ivg.com"; class = "Other";};
-Client { host = "*.ib.com"; class = "Other";};
-Client { host = "*.ibm.net"; class = "Other";};
-Client { host = "*.hydro.com"; class = "Other";};
-Client { host = "*.nl.net"; class = "Local";};
+Client { host = "*@*.wirehub.net"; class = "Other";};
+Client { host = "*@*.planete.net"; class = "Other";};
+Client { host = "*@*.ivg.com"; class = "Other";};
+Client { host = "*@*.ib.com"; class = "Other";};
+Client { host = "*@*.ibm.net"; class = "Other";};
+Client { host = "*@*.hydro.com"; class = "Other";};
+Client { host = "*@*.nl.net"; class = "Local";};
 
 # You can request a more complete listing, including the "list of standard
 # Kill blocks" from the Routing Committee; it will also be sent to you if
@@ -327,33 +337,33 @@
 # the server is (hopefully).
 Client
 {
- host = "*.pooles.rima-tde.net";
- ip = "80.59.0.0/16";
+ host = "*.rima-tde.net";
+ ip = "*@80.59.0.0/16";
  class = "Local";
 };
 
-# You can put an expression in the maxlinks, which will make ircd
+# You can put an expression in the "maxlinks" value, which will make ircd
 # only accept a client when the total number of connections to the network
 # from the same IP number doesn't exceed this number.
 # The following example would accept at most one connection per IP number
 # from "*.ono.com" and at most two connections from dial up accounts
 # that have "dial??.*" as host mask:
 # Client {
-#  host = "*.ono.com";
-#  maxlinks = "1";
+#  host = "*@*.ono.com";
+#  maxlinks = 1;
 #  class = "Other";
 # };
 # Client {
-#  host = "dial??.*";
-#  maxlinks = "2";
+#  host = "*@dial??.*";
+#  maxlinks = 2;
 #  class = "Other";
 # };
 #
 # If you are not worried about who connects, this line will allow everyone
 # to connect.
 Client {
- host = "*";
- ip = "*";
+ host = "*@*";
+ ip = "*@*";
  class = "Other";
 };
 
@@ -368,6 +378,10 @@
 #  file = "path/to/motd/file";
 # };
 #
+# More than one host = "mask"; entry may be present in one block; this
+# has the same effect as one "Motd" block for each host entry, but makes
+# it easier to update the messages's filename.
+#
 # DPATH/net_com.motd contains a special MOTD where users are encouraged
 # to register their domains and get their own "Client" blocks if they're in
 # Europe, or move to US.irc-dev.net if they're in the USA.
@@ -414,7 +428,7 @@
 # If you're on IRC-Dev, you MUST have these lines. I cannnot stress
 # this enough.  If all of the servers don't have the same lines, the
 # servers will try to undo the mode hacks that Uworld does.  Make SURE that
-# all of the servers have the EXACT same Uworld blocks.
+# all of the servers have the EXACT same "UWorld" blocks.
 #
 # If your server starts on a bit larger network, you'll probably get
 # assigned one or two uplinks to which your server can connect.
@@ -423,7 +437,7 @@
 # See the Connect block documentation for details on how to do that.
 
 UWorld {
- name = "luz.irc-dev.net";
+ name = "gmsis.irc-dev.net";
  name = "services.irc-dev.net";
 };
 
@@ -515,6 +529,7 @@
 # Connect {
 #  name = "servername";
 #  host = "hostnameORip";
+#  vhost = "localIP";
 #  password = "passwd";
 #  port = portno;
 #  class = "classname";
@@ -525,16 +540,20 @@
 #
 # The "port" field defines the default port the server tries to connect
 # to if an operator uses /connect without specifying a port. This is also
-# the port used when the server attempts to auto-connect to the remote 
+# the port used when the server attempts to auto-connect to the remote
 # server. (See "Class" blocks for more informationa about auto-connects).
 # You may tell ircu to not automatically connect to a server by adding
 # "autoconnect = no;"; the default is to autoconnect.
 #
+# If the "vhost" field is present, the server will use that IP as the
+# local end of connections that it initiates to this server.  This
+# overrides the vhost value from the General block.
+#
 # The "maxhops" field causes an SQUIT if a hub tries to introduce
-# servers farther away than that; the element "leaf," is an alias for
-# "maxhops = 0,".  The "hub" field limits the names of servers that may
-# be introduced by a hub; the element "hub;" is an alias for
-# "hub = "*";".
+# servers farther away than that; the element 'leaf;' is an alias for
+# 'maxhops = 0;'.  The "hub" field limits the names of servers that may
+# be introduced by a hub; the element 'hub;' is an alias for
+# 'hub = "*";'.
 #
 # Our primary uplink.
 Connect {
@@ -546,36 +565,20 @@
  hub;
 };
 
-
 # [Crule]
 #
 # For an advanced, real-time rule-based routing decision making system
 # you can use "Crule" blocks. For more information, see doc/en/crules.txt.
-# Crule
-# {
-#  server = "servermask";
-#  rule = "connectrule";
-#  # Setting all to yes makes the rule always apply. Otherwise it only
-#  # applies to autoconnects.
-#  all = yes;
-# };
-Crule
-{
- server = "*.US.irc-dev.net";
- rule = "connected(*.US.irc-dev.net)";
-};
-Crule
-{
- server = "*.EU.irc-dev.net";
- rule = "connected(Vigo.ES.EU.*)";
-};
+# Including the "all" modifier makes the rule always apply.  Otherwise
+# it only applies to outbound autoconnects.
+#
+# CRule "servermask" all connectrule;
+# CRule "servermask" connectrule;
+CRule "*.US.irc-dev.net" connected("*.US.irc-dev.net");
+CRule "*.EU.irc-dev.net" connected("Vigo.ES.EU.*");
 
-# The following block is recommended for leaf servers:
-Crule
-{
- server = "*";
- rule = "directcon(*)";
-};
+# The following CRule is recommended for leaf servers:
+CRule "*" directcon("*");
 
 # [Operator]
 #
@@ -593,6 +596,11 @@
 # is not not passed along to other servers. On IRC-Dev, this prevents
 # them from using Uworld as well.
 #
+# More than one host = "mask"; entry may be present in one block; this
+# has the same effect as one "Operator" block for each host entry, but
+# makes it easier to update operator nicks, passwords, classes, and
+# privileges.
+#
 # Operator {
 #  host = "host/IP mask";
 #  name = "opername";
@@ -607,7 +615,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
@@ -615,13 +624,13 @@
 # find.
 Operator {
  local = no;
- host = "*@*.pooles.rima-tde.net";
+ host = "*@*.rima-tde.net";
  password = "$CRYPT$KI88nphRm0UPw";
  name = "zoltan";
  class = "Local";
 };
-Operator {   
- host = "*@*.ttd.es";
+Operator {
+ host = "*@*.rima-tde.net";
  password = "$PLAIN$notencryptedpass";
  name = "zolty";
  class = "Opers";
@@ -648,17 +657,24 @@
 # IANA says we should use port 194, but that requires us to run as root,
 # so we don't do that.
 #
+#
 # Port {
-#  port = number;
+#  port = [ipv4] [ipv6] number;
 #  mask = "ipmask";
 #  # Use this to control the interface you bind to.
-#  vhost = "virtualhostip";
+#  vhost = [ipv4] [ipv6] "virtualhostip";
+#  # You can specify both virtual host and port number in one entry.
+#  vhost = [ipv4] [ipv6] "virtualhostip" number;
 #  # Setting to yes makes this server only.
 #  server = yes;
 #  # Setting to yes makes the port "hidden" from stats.
 #  hidden = yes;
 # };
 #
+# The port and vhost lines allow you to specify one or both of "ipv4"
+# and "ipv6" as address families to use for the port.  The default is
+# to listen on both IPv4 and IPv6.
+#
 # The mask setting allows you to specify a range of IP addresses that
 # you will allow connections from. This should only contain IP addresses
 # and '*' if used. This field only uses IP addresses. This does not use
@@ -678,11 +694,11 @@
  port = 4400;
 };
 
-# This is a Server port that is Hidden
+# This is an IPv4-only Server port that is Hidden
 Port {
  server = yes;
  hidden = yes;
- port = 4401;
+ port = ipv4 4401;
 };
 
 # The following are normal client ports
@@ -701,6 +717,14 @@
  port = 7000;
 };
 
+# More than one vhost may be present in a single Port block; in this case,
+# we recommend listing the port number on the vhost line for clarity.
+Port {
+ vhost = "172.16.0.1" 6667;
+ vhost = "172.16.3.1" 6668;
+ hidden = no;
+};
+
 # Quarantine blocks disallow operators from using OPMODE and CLEARMODE
 # on certain channels.  Opers with the force_opmode (for local
 # channels, force_local_opmode) privilege may override the quarantine
@@ -728,13 +752,34 @@
 };
 
 # You can ask a separate server whether to allow users to connect.
-IAuth {
- pass = "ircd-iauth";
- host = "127.0.0.1";
- port = 7700;
- connectfreq = 30;
- timeout = 60;
-};
+# Uncomment this ONLY if you have an iauth helper program.
+# IAuth {
+#  program = "../path/to/iauth" "-n" "options go here";
+# };
+
+# [Include]
+# You can include certain kinds of configuration snippets from other
+# files.  The basic directive, which allows any kind of block or
+# recursive include, is:
+#
+#   Include "filename";
+#
+# You can limit the file to certain types of configuration blocks by
+# using the block name(s), optionally separated by commas.  For
+# example:
+#
+#   Include uworld, jupe, quarantine, kill from "linesync.conf";
+#   Include operator from "opers.conf";
+#   Include include from "include.conf";
+#
+# The restrictions are transitive across includes.  This means that
+# the last example is not very useful: the only thing include.conf may
+# do is include other include files, and none of them may have any
+# other kind of block!
+#
+# Well-formed but disallowed configuration blocks generate a warning
+# but do not break the file.  The other syntax rules must still be
+# followed, because a syntax error will break the file.
 
 # [Features]
 # IRC servers have a large number of options and features.  Most of these
@@ -773,6 +818,7 @@
 #  "HUB" = "FALSE";
 #  "WALLOPS_OPER_ONLY" = "FALSE";
 #  "NODNS" = "FALSE";
+#  "NOIDENT" = "FALSE";
 #  "RANDOM_SEED" = "<you should set one explicitly>";
 #  "DEFAULT_LIST_PARAM" = "TRUE";
 #  "NICKNAMEHISTORYLENGTH" = "800";
@@ -781,12 +827,13 @@
 #  "HIDDEN_IP" = "127.0.0.1";
 #  "CONNEXIT_NOTICES" = "FALSE";
 #  "OPLEVELS" = "TRUE";
+#  "ZANNELS" = "TRUE";
 #  "LOCAL_CHANNELS" = "TRUE";
 #  "TOPIC_BURST" = "FALSE";
+#  "USER_GLINE" = "TRUE";
 #  "KILLCHASETIMELIMIT" = "30";
 #  "MAXCHANNELSPERUSER" = "10";
-#  "NICKLEN" = "12";
-#  "CHANNELLEN" = "200";
+#  "NICKLEN" = "15";
 #  "AVBANLEN" = "40";
 #  "MAXBANS" = "45";
 #  "MAXSILES" = "15";
@@ -804,9 +851,11 @@
 #  "IPCHECK_CLONE_LIMIT = "24";
 #  "IPCHECK_CLONE_PERIOD = "40";
 #  "IPCHECK_CLONE_DELAY = "600";
+#  "CHANNELLEN" = "200";
 #  "MPATH" = "ircd.motd";
 #  "RPATH" = "remote.motd";
 #  "PPATH" = "ircd.pid";
+#  "BDDPATH" = "database";
 #  "TOS_SERVER" = "0x08";
 #  "TOS_CLIENT" = "0x08";
 #  "POLLS_PER_LOOP" = "200";
@@ -822,56 +871,60 @@
 #  "HIS_MAP" = "TRUE";
 #  "HIS_LINKS" = "TRUE";
 #  "HIS_TRACE" = "TRUE";
-#  "HIS_STATS_a" = "TRUE";
-#  "HIS_STATS_b" = "TRUE";
-#  "HIS_STATS_c" = "TRUE";
-#  "HIS_STATS_d" = "TRUE";
-#  "HIS_STATS_e" = "TRUE";
-#  "HIS_STATS_f" = "TRUE";
-#  "HIS_STATS_g" = "TRUE";
-#  "HIS_STATS_i" = "TRUE";
-#  "HIS_STATS_j" = "TRUE";
-#  "HIS_STATS_J" = "TRUE";
-#  "HIS_STATS_k" = "TRUE";
-#  "HIS_STATS_l" = "TRUE";
-#  "HIS_STATS_L" = "TRUE";
-#  "HIS_STATS_m" = "TRUE";
-#  "HIS_STATS_M" = "TRUE";
-#  "HIS_STATS_o" = "TRUE";
-#  "HIS_STATS_p" = "TRUE";
-#  "HIS_STATS_q" = "TRUE";
-#  "HIS_STATS_r" = "TRUE";
-#  "HIS_STATS_R" = "TRUE";
-#  "HIS_STATS_t" = "TRUE";
-#  "HIS_STATS_T" = "TRUE";
-#  "HIS_STATS_u" = "FALSE";
-#  "HIS_STATS_U" = "TRUE";
-#  "HIS_STATS_v" = "TRUE";
-#  "HIS_STATS_w" = "TRUE";
-#  "HIS_STATS_x" = "TRUE";
-#  "HIS_STATS_y" = "TRUE";
-#  "HIS_STATS_z" = "TRUE";
+#  "HIS_STATS_NAMESERVERS" = "TRUE";
+#  "HIS_STATS_BDD" = "TRUE";
+#  "HIS_STATS_CONNECT" = "TRUE";
+#  "HIS_STATS_CRULES" = "TRUE";
+#  "HIS_STATS_ENGINE" = "TRUE";
+#  "HIS_STATS_FEATURES" = "TRUE";
+#  "HIS_STATS_GLINES" = "TRUE";
+#  "HIS_STATS_ACCESS" = "TRUE";
+#  "HIS_STATS_HISTOGRAM" = "TRUE";
+#  "HIS_STATS_JUPES" = "TRUE";
+#  "HIS_STATS_KLINES" = "TRUE";
+#  "HIS_STATS_LINKS" = "TRUE";
+#  "HIS_STATS_MODULES" = "TRUE";
+#  "HIS_STATS_COMMANDS" = "TRUE";
+#  "HIS_STATS_OPERATORS" = "TRUE";
+#  "HIS_STATS_PORTS" = "TRUE";
+#  "HIS_STATS_QUARANTINES" = "TRUE";
+#  "HIS_STATS_MAPPINGS" = "TRUE";
+#  "HIS_STATS_USAGE" = "TRUE";
+#  "HIS_STATS_LOCALS" = "TRUE";
+#  "HIS_STATS_MOTDS" = "TRUE";
+#  "HIS_STATS_UPTIME" = "FALSE";
+#  "HIS_STATS_UWORLD" = "TRUE";
+#  "HIS_STATS_VSERVERS" = "TRUE";
+#  "HIS_STATS_USERLOAD" = "TRUE";
+#  "HIS_STATS_MEMUSAGE" = "TRUE";
+#  "HIS_STATS_CLASSES" = "TRUE";
+#  "HIS_STATS_MEMORY" = "TRUE";
+#  "HIS_STATS_IAUTH" = "TRUE";
 #  "HIS_WHOIS_SERVERNAME" = "TRUE";
 #  "HIS_WHOIS_IDLETIME" = "TRUE";
 #  "HIS_WHOIS_LOCALCHAN" = "TRUE";
 #  "HIS_WHO_SERVERNAME" = "TRUE";
 #  "HIS_WHO_HOPCOUNT" = "TRUE";
+#  "HIS_MODEWHO" = "TRUE";
 #  "HIS_BANWHO" = "TRUE";
 #  "HIS_KILLWHO" = "TRUE";
 #  "HIS_REWRITE" = "TRUE";
-#  "HIS_REMOTE" = "1";
-#  "HIS_NETSPLIT" = TRUE";
+#  "HIS_REMOTE" = "TRUE";
+#  "HIS_NETSPLIT" = "TRUE";
 #  "HIS_SERVERNAME" = "*.irc-dev.net";
 #  "HIS_SERVERINFO" = "IRC-Dev.Net, Desarrollo de IRC / IRC Development";
 #  "HIS_URLSERVERS" = "http://www.irc-dev.net/servers.php";
 #  "NETWORK" = "IRC-Dev";
 #  "URL_CLIENTS" = "ftp://ftp.irc.org/pub/irc/clients";
-
+#  "SPAM_OPER_COUNTDOWN" = "5";
+#  "SPAM_EXPIRE_TIME" = "120";
+#  "SPAM_JOINED_TIME" = "60";
+#  "SPAM_FJP_COUNT" = "5";
 };
 
 # Well, you have now reached the end of this sample configuration
 # file. If you have any questions, visit http://www.irc-dev.net,
-# or join the channel #irc-dev at Undernet, and feel :-)
+# or join the channel #irc-dev at IRC-Hispano, and feel :-)
 #
 # Upgrades of the ircd can be found via CVS or download on
 # http://www.irc-dev.net
----------------------- End of diff -----------------------