Do not convert F:FEATURENAME to "FEATURENAME" = ;

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

diff --git a/ChangeLog b/ChangeLog
index d2ea5f837448bd10b366f5e594bab4673b6efd74..a4537aa5b212105741049c2b9da30466b5b092b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-18  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/convert-conf.c (finish_features): Do not emit a feature
+       setting that has no values.
+
 2006-06-18  Michael Poole <mdpoole@troilus.org>
 
        * ircd/channel.c (mode_parse_key): Outside of burst, allow

diff --git a/ircd/convert-conf.c b/ircd/convert-conf.c
index 7947fff9f1b318dc12d29d4dbd6d5651b1ee5d9a..9aa92575e9136e7ca4cff8b44e9ba41210d2149c 100644 (file)
--- a/ircd/convert-conf.c
+++ b/ircd/convert-conf.c
@@ -354,6 +354,14 @@ static void finish_features(void)
             continue;
         }
 
+        /* If it had no value before, drop it now since the lexer does
+         * not accept empty strings and the grammar does not accept
+         * empty stringlists.*/
+        if (!feat->values) {
+            fprintf(stdout, "# Above feature had no value.\n");
+            continue;
+        }
+
         /* Wasn't remapped, wasn't removed: print it out. */
         fprintf(stdout, "\t\"%s\" =", feat->name);
         for (sl = feat->values; sl; sl = sl->next)