From 2aa8e492d72ee48b1ea88425ac0026d592161ef7 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sun, 19 Mar 2006 04:40:00 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ircd/convert-conf.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index d2ea5f8..a4537aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-18 Michael Poole + + * ircd/convert-conf.c (finish_features): Do not emit a feature + setting that has no values. + 2006-06-18 Michael Poole * ircd/channel.c (mode_parse_key): Outside of burst, allow diff --git a/ircd/convert-conf.c b/ircd/convert-conf.c index 7947fff..9aa9257 100644 --- 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) -- 2.20.1