Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-03-19 04:40:10 UTC
Modified files:
Tag: u2_10_12_branch
ChangeLog ircd/convert-conf.c
Log message:
Do not convert F:FEATURENAME to "FEATURENAME" = ;
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.81 ircu2.10/ChangeLog:1.710.2.82
--- ircu2.10/ChangeLog:1.710.2.81 Sat Mar 18 20:03:55 2006
+++ ircu2.10/ChangeLog Sat Mar 18 20:40:00 2006
@@ -1,5 +1,10 @@
2006-06-18 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/convert-conf.c (finish_features): Do not emit a feature
+ setting that has no values.
+
+2006-06-18 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/channel.c (mode_parse_key): Outside of burst, allow
overwriting of keys by a service when a key is already set.
(mode_parse_upass): Likewise. Instead, ignore new Upass during
Index: ircu2.10/ircd/convert-conf.c
diff -u ircu2.10/ircd/convert-conf.c:1.2.2.6
ircu2.10/ircd/convert-conf.c:1.2.2.7
--- ircu2.10/ircd/convert-conf.c:1.2.2.6 Fri Jan 6 16:54:09 2006
+++ ircu2.10/ircd/convert-conf.c Sat Mar 18 20:40:00 2006
@@ -354,6 +354,14 @@
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)
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
