iptables branch, master, updated. v1.4.9-29-ga905ea5
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Mon Nov 15 14:46:45 CET 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "iptables".
The branch, master has been updated
via a905ea5c97149da9d76cd278b0447e3316087a45 (commit)
via 710a132ce9fbecedbf9447f2b2a134f2359a583c (commit)
via 59e8114c6792242e80785f4461d5e663fb9a3d64 (commit)
from e84f131b5f992577119bd3679241f69ec394e0a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a905ea5c97149da9d76cd278b0447e3316087a45
Merge: 710a132ce9fbecedbf9447f2b2a134f2359a583c 59e8114c6792242e80785f4461d5e663fb9a3d64
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Nov 15 14:39:50 2010 +0100
Merge branch 'master' of git://dev.medozas.de/iptables into m2
commit 710a132ce9fbecedbf9447f2b2a134f2359a583c
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Nov 15 14:39:35 2010 +0100
Revert "Revert "libxtables: change option precedence order to be intuitive""
This reverts commit e84f131b5f992577119bd3679241f69ec394e0a7.
Solution follows.
commit 59e8114c6792242e80785f4461d5e663fb9a3d64
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Nov 15 13:19:48 2010 +0100
iptables: fix longopt reecognition and workaround getopt(3) behavior
* On the first call to getopt, opts was NULL, so long options would
not be recognized until a match/target was loaded.
Whacky getopt behavior:
* If the longopts parameter is NULL, getopt fails to recognize unknown
options, such that `iptables-multi main --append` will print a garbage
help message ("main needs an argument").
* If the longopts parameter is NULL on the first call, but not on
subsequent calls, it completely screws up option parsing, taking
the --dport in `iptables-multi main -A INPUT -p tcp --dport 1000`
as --destination instead, but not accepting "--destination 1.2.3.4"
either.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
-----------------------------------------------------------------------
Summary of changes:
include/xtables.h.in | 5 +++--
ip6tables.c | 6 +++---
iptables.c | 12 +++++++++---
xtables.c | 49 ++++++++++++++++++++++++++++---------------------
4 files changed, 43 insertions(+), 29 deletions(-)
hooks/post-receive
--
iptables
More information about the netfilter-cvslog
mailing list