Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-04-29 02:22:06 UTC
Modified files:
Tag: u2_10_12_branch
ircd/ircd_parser.y doc/example.conf ChangeLog
Log message:
Fix Admin block documentation and behavior (SF bug#1477672).
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.91 ircu2.10/ChangeLog:1.710.2.92
--- ircu2.10/ChangeLog:1.710.2.91 Thu Apr 6 21:00:28 2006
+++ ircu2.10/ChangeLog Fri Apr 28 19:21:56 2006
@@ -1,3 +1,11 @@
+2006-04-28 Michael Poole <[EMAIL PROTECTED]>
+
+ * doc/example.conf (Admin): Fix documentation of which line can be
+ listed twice.
+
+ * ircd/ircd_parser.y (adminblock): Allow admin information to be
+ changed via /rehash.
+
2006-04-06 Michael Poole <[EMAIL PROTECTED]>
* ircd/s_auth.c (start_auth): Add client to list after getting
Index: ircu2.10/doc/example.conf
diff -u ircu2.10/doc/example.conf:1.61.2.7 ircu2.10/doc/example.conf:1.61.2.8
--- ircu2.10/doc/example.conf:1.61.2.7 Thu Apr 6 20:43:06 2006
+++ ircu2.10/doc/example.conf Fri Apr 28 19:21:56 2006
@@ -82,9 +82,9 @@
# This sets information that can be retrieved with the /ADMIN command.
# It should contain at least an admin Email contact address.
Admin {
+ # At most two location lines are allowed...
Location = "The University of London";
- # At most two contact lines are allowed...
- Contact = "Undernet IRC server";
+ Location = "Undernet IRC server";
Contact = "IRC Admins <[EMAIL PROTECTED]>";
};
Index: ircu2.10/ircd/ircd_parser.y
diff -u ircu2.10/ircd/ircd_parser.y:1.56.2.3
ircu2.10/ircd/ircd_parser.y:1.56.2.4
--- ircu2.10/ircd/ircd_parser.y:1.56.2.3 Wed Feb 15 19:49:54 2006
+++ ircu2.10/ircd/ircd_parser.y Fri Apr 28 19:21:56 2006
@@ -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.56.2.3 2006/02/16 03:49:54 entrope Exp $
+ * $Id: ircd_parser.y,v 1.56.2.4 2006/04/29 02:21:56 entrope Exp $
*/
%{
@@ -320,7 +320,14 @@
MyFree($3);
};
-adminblock: ADMIN '{' adminitems '}' ';'
+adminblock: ADMIN
+{
+ MyFree(localConf.location1);
+ MyFree(localConf.location2);
+ MyFree(localConf.contact);
+ localConf.location1 = localConf.location2 = localConf.contact = NULL;
+}
+'{' adminitems '}' ';'
{
if (localConf.location1 == NULL)
DupString(localConf.location1, "");
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
