Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-04-23 13:49:51 UTC
Modified files:
ChangeLog doc/example.conf ircd/ircd_parser.y
Log message:
Allow more than one _functioning_ name= in a UWorld block.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.609 ircu2.10/ChangeLog:1.610
--- ircu2.10/ChangeLog:1.609 Fri Apr 22 17:10:14 2005
+++ ircu2.10/ChangeLog Sat Apr 23 06:49:39 2005
@@ -1,3 +1,10 @@
+2005-04-23 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf (UWorld): Illustrate new config extension.
+
+ * ircd/ircd_parser.y (uworldblock): Do the expected thing when
+ multiple name= entries are present.
+
2005-04-22 Michael Poole <[EMAIL PROTECTED]>
* RELEASE.NOTES: Silence exceptions use ~, not -. Oops!
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.55 ircu2.10/doc/example.conf:1.56
--- ircu2.10/doc/example.conf:1.55 Fri Apr 22 17:10:17 2005
+++ ircu2.10/doc/example.conf Sat Apr 23 06:49:41 2005
@@ -396,6 +396,8 @@
# name = "relservername";
# };
#
+# You may have have more than one name listed in each block.
+#
# Note: (1) These lines are agreed on by every server admin on Undernet;
# (2) These lines must be the same on every single server, or results
# will be disasterous; (3) This is a useful feature, not something that
@@ -413,29 +415,13 @@
UWorld {
name = "uworld.eu.undernet.org";
-};
-UWorld {
name = "uworld2.undernet.org";
-};
-UWorld {
name = "uworld.undernet.org";
-};
-UWorld {
name = "channels.undernet.org";
-};
-UWorld {
name = "channels2.undernet.org";
-};
-UWorld {
name = "channels3.undernet.org";
-};
-UWorld {
name = "channels4.undernet.org";
-};
-UWorld {
name = "channels5.undernet.org";
-};
-UWorld {
name = "channels6.undernet.org";
};
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.47 ircu2.10/ircd/ircd_parser.y:1.48
--- ircu2.10/ircd/ircd_parser.y:1.47 Sat Apr 16 19:57:57 2005
+++ ircu2.10/ircd/ircd_parser.y Sat Apr 23 06:49:41 2005
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
- * $Id: ircd_parser.y,v 1.47 2005/04/17 02:57:57 entrope Exp $
+ * $Id: ircd_parser.y,v 1.48 2005/04/23 13:49:41 entrope Exp $
*/
%{
@@ -471,26 +471,14 @@
maxlinks = $3;
};
-uworldblock: UWORLD '{' uworlditems '}' ';'
-{
- if (name)
- {
- struct ConfItem *aconf = make_conf(CONF_UWORLD);
- aconf->host = name;
- }
- else
- {
- MyFree(name);
- parse_error("Bad UWorld block");
- }
- name = NULL;
-};
+uworldblock: UWORLD '{' uworlditems '}' ';';
uworlditems: uworlditem uworlditems | uworlditem;
uworlditem: uworldname | error;
uworldname: NAME '=' QSTRING ';'
{
- MyFree(name);
- DupString(name, $3);
+ struct ConfItem *aconf;
+ aconf = make_conf(CONF_UWORLD);
+ DupString(aconf->host, $3);
};
operblock: OPER '{' operitems '}' ';'
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
