[PATCH 1/3] iptables-restore(8): missing -T in synopsis

[PATCH 1/3] iptables-restore(8): missing -T in synopsis

[Jiri Popelka]

---
 iptables/iptables-restore.8.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iptables/iptables-restore.8.in b/iptables/iptables-restore.8.in
index feb57ef..4ad7a52 100644
--- a/iptables/iptables-restore.8.in
+++ b/iptables/iptables-restore.8.in
@@ -24,6 +24,7 @@ iptables-restore \(em Restore IP Tables
 ip6tables-restore \(em Restore IPv6 Tables
 .SH SYNOPSIS
 \fBiptables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP]
+[\fB\-T\fP \fIname\fP]
 .P
 \fBip6tables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP]
 [\fB\-T\fP \fIname\fP]
-- 
1.8.5.3

[PATCH 2/3] iptables-restore(8): file to read from can be specified as argument

[Jiri Popelka]

original bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=1022228
---
 iptables/iptables-restore.8.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/iptables/iptables-restore.8.in b/iptables/iptables-restore.8.in
index 4ad7a52..7a286b9 100644
--- a/iptables/iptables-restore.8.in
+++ b/iptables/iptables-restore.8.in
@@ -24,17 +24,18 @@ iptables-restore \(em Restore IP Tables
 ip6tables-restore \(em Restore IPv6 Tables
 .SH SYNOPSIS
 \fBiptables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP]
-[\fB\-T\fP \fIname\fP]
+[\fB\-T\fP \fIname\fP] [\fBfile\fP]
 .P
 \fBip6tables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP]
-[\fB\-T\fP \fIname\fP]
+[\fB\-T\fP \fIname\fP] [\fBfile\fP]
 .SH DESCRIPTION
 .PP
 .B iptables-restore
 and
 .B ip6tables-restore
-are used to restore IP and IPv6 Tables from data specified on STDIN. Use
-I/O redirection provided by your shell to read from a file
+are used to restore IP and IPv6 Tables from data specified on STDIN or in
+\fIfile\fP. Use I/O redirection provided by your shell to read from a file or
+specify \fIfile\fP as an argument.
 .TP
 \fB\-c\fR, \fB\-\-counters\fR
 restore the values of all packet and byte counters
-- 
1.8.5.3

[PATCH 3/3] iptables: save - fix getopt_long()'s optstring

[Jiri Popelka]

---
 iptables/ip6tables-save.c | 2 +-
 iptables/iptables-save.c  | 2 +-
 iptables/xtables-save.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
index a86a64a..cf56c63 100644
--- a/iptables/ip6tables-save.c
+++ b/iptables/ip6tables-save.c
@@ -137,7 +137,7 @@ int ip6tables_save_main(int argc, char *argv[])
 	init_extensions6();
 #endif
 
-	while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "cdt:M:", options, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			show_counters = 1;
diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c
index 2999c7f..ed81dfd 100644
--- a/iptables/iptables-save.c
+++ b/iptables/iptables-save.c
@@ -136,7 +136,7 @@ iptables_save_main(int argc, char *argv[])
 	init_extensions4();
 #endif
 
-	while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "cdt:M:", options, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			show_counters = 1;
diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index 42d2907..d732377 100644
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -104,7 +104,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	while ((c = getopt_long(argc, argv, "bcdt:46", options, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "cdt:M:46", options, NULL)) != -1) {
 		switch (c) {
 		case 'c':
 			show_counters = true;
-- 
1.8.5.3

Re: [PATCH 1/3] iptables-restore(8): missing -T in synopsis

[Pablo Neira Ayuso]

Applied, thanks.

Re: [PATCH 2/3] iptables-restore(8): file to read from can be specified as argument

[Pablo Neira Ayuso]

On Thu, Mar 13, 2014 at 05:01:20PM +0100, Jiri Popelka wrote:
> original bug report:
> https://bugzilla.redhat.com/show_bug.cgi?id=1022228

Applied, thanks.

Re: [PATCH 3/3] iptables: save - fix getopt_long()'s optstring

[Pablo Neira Ayuso]

Hi Jiri,

On Thu, Mar 13, 2014 at 05:01:21PM +0100, Jiri Popelka wrote:
> ---
>  iptables/ip6tables-save.c | 2 +-
>  iptables/iptables-save.c  | 2 +-
>  iptables/xtables-save.c   | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/iptables/ip6tables-save.c b/iptables/ip6tables-save.c
> index a86a64a..cf56c63 100644
> --- a/iptables/ip6tables-save.c
> +++ b/iptables/ip6tables-save.c
> @@ -137,7 +137,7 @@ int ip6tables_save_main(int argc, char *argv[])
>  	init_extensions6();
>  #endif
>  
> -	while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) {
> +	while ((c = getopt_long(argc, argv, "cdt:M:", options, NULL)) != -1) {

b is also removed.

My bet is that noone is using that, but just to make sure we break
some stupid script somewhere, just leave it there and add some warning
message to indicate that you can remove from your scripts. Thanks.