Re: [PATCH] cleanup

[Patrick McHardy <kaber@trash.net>]

Thomas Woerner wrote:
> 
> Hello,
> 
> 
> I got this patch for iptables in bugzilla #131848 from Steve Grubb. Are 
> including it in the next version?

This doesn't look like cleanup and I'm not going to dig
up bugreports from redhat bugzilla. What is this patch
supposed to fix ?

Regards
Patrick

> 
> 
> Thanks in advance,
> Thomas
> 
> 
> ------------------------------------------------------------------------
> 
> diff -ur iptables-1.2.11.orig/extensions/libipt_REJECT.c iptables-1.2.11/extensions/libipt_REJECT.c
> --- iptables-1.2.11.orig/extensions/libipt_REJECT.c	2004-09-05 11:27:49.000000000 -0400
> +++ iptables-1.2.11/extensions/libipt_REJECT.c	2004-09-05 11:28:17.000000000 -0400
> @@ -147,13 +147,16 @@
>  {
>  	const struct ipt_reject_info *reject
>  		= (const struct ipt_reject_info *)target->data;
> -	unsigned int i;
> +	unsigned int i, limit=sizeof(reject_table)/sizeof(struct reject_names);
>  
> -	for (i = 0; i < sizeof(reject_table)/sizeof(struct reject_names); i++) {
> +	for (i = 0; i < limit; i++) {
>  		if (reject_table[i].with == reject->with)
>  			break;
>  	}
> -	printf("reject-with %s ", reject_table[i].name);
> +	if (i < limit)
> +		printf("reject-with %s ", reject_table[i].name);
> +	else
> +		printf("reject-with: error reject->with not found ");
>  }
>  
>  /* Saves ipt_reject in parsable form to stdout. */
> @@ -161,13 +164,15 @@
>  {
>  	const struct ipt_reject_info *reject
>  		= (const struct ipt_reject_info *)target->data;
> -	unsigned int i;
> +	unsigned int i, limit=sizeof(reject_table)/sizeof(struct reject_names);
>  
> -	for (i = 0; i < sizeof(reject_table)/sizeof(struct reject_names); i++)
> +	for (i = 0; i < limit; i++)
>  		if (reject_table[i].with == reject->with)
>  			break;
> -
> -	printf("--reject-with %s ", reject_table[i].name);
> +	if (i < limit)
> +		printf("--reject-with %s ", reject_table[i].name);
> +	else
> +		fprintf(stderr, "--reject-with error reject->with not found");
>  }
>  
>  static
> diff -ur iptables-1.2.11.orig/extensions/libipt_rpc.c iptables-1.2.11/extensions/libipt_rpc.c
> --- iptables-1.2.11.orig/extensions/libipt_rpc.c	2004-09-05 11:27:50.000000000 -0400
> +++ iptables-1.2.11/extensions/libipt_rpc.c	2004-09-05 11:41:11.000000000 -0400
> @@ -252,7 +252,7 @@
>  
>  			idup = 0;
>  			memset(buf, 0, sizeof(buf));
> -			dst = (char *)buf - 1;
> +			dst = (char *)buf;
>  		}
>  	}
>