diff --git a/build_num b/build_num index b084c42b6..a39d5b2be 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2638 +#define BUILD_NUM 2641 diff --git a/doc/ChangeLog b/doc/ChangeLog index 0d51479f3..96d364a45 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,12 @@ +2010-03-01 vadim + + * PolicyCompiler_PrintRule.cpp (PrintRule::_printTimeInterval): + fixed time format for the iptables parameters --datestart, + --datestop which is supposed to be ISO 8601 "T" notation but + apparently with no support for time zone designators. Timezone + desginators are an error in iptables 1.4.1.1 and 1.4.5, did not + test newer versions. Fixes #1286 SourceForge bug #2961532 + 2010-02-28 vadim * (many files) fixed warning " format not a string literal and no @@ -7,7 +16,7 @@ * refs #1202: Main menu "Rules" does not match rule context menu Items in the main menu Rules should get disabled and enabled just like items in the context menu do. - Added action: insertRuleAction, addRuleAfterCurrentAction, + Added action: insertRuleAction, addRuleAfterCurrentAction, addToGroupAboveAction, addToGroupBelowAction Affected files: FWWindow.cpp diff --git a/src/iptlib/PolicyCompiler_PrintRule.cpp b/src/iptlib/PolicyCompiler_PrintRule.cpp index 1d63b3498..3bd5ea743 100644 --- a/src/iptlib/PolicyCompiler_PrintRule.cpp +++ b/src/iptlib/PolicyCompiler_PrintRule.cpp @@ -1266,9 +1266,13 @@ string PolicyCompiler_ipt::PrintRule::_printTimeInterval(PolicyRule *r) if (XMLTools::version_compare(version, "1.4.0")>=0) { - // in 1.4.0 date format has changed, it is now ISO 8601 - // http://www.w3.org/TR/NOTE-datetime - + /* in 1.4.0 date format has changed, it is now ISO 8601 + * http://www.w3.org/TR/NOTE-datetime + * + * --datestart YYYY[-MM[-DD[Thh[:mm[:ss]]]]] + * + * --datestop YYYY[-MM[-DD[Thh[:mm[:ss]]]]] + */ if (sday>0 && smonth>0 && syear>0) { ostr << "--datestart " @@ -1276,7 +1280,7 @@ string PolicyCompiler_ipt::PrintRule::_printTimeInterval(PolicyRule *r) << setw(2) << setfill('0') << smonth << "-" << setw(2) << setfill('0') << sday << "T" << setw(2) << setfill('0') << shour << ":" - << setw(2) << setfill('0') << smin << ":00Z "; + << setw(2) << setfill('0') << smin << ":00 "; use_timestart_timestop = false; } @@ -1287,7 +1291,7 @@ string PolicyCompiler_ipt::PrintRule::_printTimeInterval(PolicyRule *r) << setw(2) << setfill('0') << emonth << "-" << setw(2) << setfill('0') << eday << "T" << setw(2) << setfill('0') << ehour << ":" - << setw(2) << setfill('0') << emin << ":00Z "; + << setw(2) << setfill('0') << emin << ":00 "; use_timestart_timestop = false; } diff --git a/test/ipt/objects-for-regression-tests.fwb b/test/ipt/objects-for-regression-tests.fwb index f9b0b31d3..ef501063d 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -31041,7 +31041,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - +