Fix Admin block documentation and behavior (SF bug#1477672).

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1644 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 87f490198905c928fb110112b2bb414c3b57263f..fd6237cd7bfc506525ad136ceccd4af46b62b5d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-28  Michael Poole <mdpoole@troilus.org>
+
+       * 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 <mdpoole@troilus.org>
 
        * ircd/s_auth.c (start_auth): Add client to list after getting

diff --git a/doc/example.conf b/doc/example.conf
index 46f2f9bfbd44ffe2ad8c4a70e7a373abdbe6765c..2833ca09a4f93b4ba45d6c7ab3a3d843decf712c 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -82,9 +82,9 @@ General {
 # 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 <irc@london.ac.uk>";
 };
 

diff --git a/ircd/ircd_parser.y b/ircd/ircd_parser.y
index 692616b66ab79e73654b439fa0a88a4480eabfe7..758e080a5b4f3e3d89818bf854ca70d4a1914d1d 100644 (file)
--- a/ircd/ircd_parser.y
+++ b/ircd/ircd_parser.y
@@ -320,7 +320,14 @@ generalvhost: VHOST '=' QSTRING ';'
   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, "");