On Tuesday 2009-02-10 07:38, Amos Jeffries wrote:
> Jan Engelhardt wrote:
>> +{
>> + xtables_libdir = getenv("XTABLES_LIBDIR");
>> + if (xtables_libdir != NULL)
>> + return;
>> + xtables_libdir = getenv("IPTABLES_LIB_DIR");
>> + if (xtables_libdir != NULL) {
>> + fprintf(stderr, "IPTABLES_LIB_DIR is deprecated, "
>> + "use XTABLES_LIBDIR.\n");
>> + return;
>> + }
>> + xtables_libdir = XTABLES_LIBDIR;
>> +}
>
> You appear to be consolidating both IPTABLES_LIB_DIR and IP6TABLES_LIB_DIR into
> this function, yet it does not handle the IP6TABLES_LIB_DIR cases.
Thanks for noticing. I added a patch that adds it back
(/me still wanting to pull in jamal's stuff for the next pull).
+++ b/xtables.c
@@ -110,6 +110,19 @@ void xtables_init(void)
"use XTABLES_LIBDIR.\n");
return;
}
+ /*
+ * Well yes, IP6TABLES_LIB_DIR is of lower priority over
+ * IPTABLES_LIB_DIR since this moved to libxtables; I think that is ok
+ * for these env vars are deprecated anyhow, and in light of the
+ * (shared) libxt_*.so files, makes less sense to have
+ * IPTABLES_LIB_DIR != IP6TABLES_LIB_DIR.
+ */
+ xtables_libdir = getenv("IP6TABLES_LIB_DIR");
+ if (xtables_libdir != NULL) {
+ fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated, "
+ "use XTABLES_LIBDIR.\n");
+ return;
+ }
xtables_libdir = XTABLES_LIBDIR;
}
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
