SOURCES: iptables-20070806.patch, iptables-imq.patch, iptables-old-1.3.7.pa...
zbyniu
zbyniu at pld-linux.org
Thu Mar 26 10:12:34 CET 2009
Author: zbyniu Date: Thu Mar 26 09:12:34 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
---- Files affected:
SOURCES:
iptables-20070806.patch (1.8 -> 1.9) , iptables-imq.patch (1.2 -> 1.3) , iptables-old-1.3.7.patch (1.3 -> 1.4) , iptables-account.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/iptables-20070806.patch
diff -u SOURCES/iptables-20070806.patch:1.8 SOURCES/iptables-20070806.patch:1.9
--- SOURCES/iptables-20070806.patch:1.8 Wed Jun 4 13:30:45 2008
+++ SOURCES/iptables-20070806.patch Thu Mar 26 10:12:27 2009
@@ -154,16 +154,16 @@
+ /* strict-source-routing */
+ case '1':
+ if (invert)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ipv4options: unexpected `!' with --ssrr");
+ if (*flags & IPT_IPV4OPTION_MATCH_SSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ssrr twice");
+ if (*flags & IPT_IPV4OPTION_MATCH_LSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ssrr with --lsrr");
+ if (*flags & IPT_IPV4OPTION_DONT_MATCH_SRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ssrr with --no-srr");
+
+ info->options |= IPT_IPV4OPTION_MATCH_SSRR;
@@ -173,16 +173,16 @@
+ /* loose-source-routing */
+ case '2':
+ if (invert)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ipv4options: unexpected `!' with --lsrr");
+ if (*flags & IPT_IPV4OPTION_MATCH_SSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --lsrr twice");
+ if (*flags & IPT_IPV4OPTION_MATCH_LSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --lsrr with --ssrr");
+ if (*flags & IPT_IPV4OPTION_DONT_MATCH_SRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --lsrr with --no-srr");
+ info->options |= IPT_IPV4OPTION_MATCH_LSRR;
+ *flags |= IPT_IPV4OPTION_MATCH_LSRR;
@@ -191,16 +191,16 @@
+ /* no-source-routing */
+ case '3':
+ if (invert)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ipv4options: unexpected `!' with --no-srr");
+ if (*flags & IPT_IPV4OPTION_DONT_MATCH_SRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --no-srr twice");
+ if (*flags & IPT_IPV4OPTION_MATCH_SSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --no-srr with --ssrr");
+ if (*flags & IPT_IPV4OPTION_MATCH_LSRR)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --no-srr with --lsrr");
+ info->options |= IPT_IPV4OPTION_DONT_MATCH_SRR;
+ *flags |= IPT_IPV4OPTION_DONT_MATCH_SRR;
@@ -209,16 +209,16 @@
+ /* record-route */
+ case '4':
+ if ((!invert) && (*flags & IPT_IPV4OPTION_MATCH_RR))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --rr twice");
+ if (invert && (*flags & IPT_IPV4OPTION_DONT_MATCH_RR))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --rr twice");
+ if ((!invert) && (*flags & IPT_IPV4OPTION_DONT_MATCH_RR))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --rr with ! --rr");
+ if (invert && (*flags & IPT_IPV4OPTION_MATCH_RR))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --rr with --rr");
+ if (invert) {
+ info->options |= IPT_IPV4OPTION_DONT_MATCH_RR;
@@ -233,16 +233,16 @@
+ /* timestamp */
+ case '5':
+ if ((!invert) && (*flags & IPT_IPV4OPTION_MATCH_TIMESTAMP))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ts twice");
+ if (invert && (*flags & IPT_IPV4OPTION_DONT_MATCH_TIMESTAMP))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --ts twice");
+ if ((!invert) && (*flags & IPT_IPV4OPTION_DONT_MATCH_TIMESTAMP))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ts with ! --ts");
+ if (invert && (*flags & IPT_IPV4OPTION_MATCH_TIMESTAMP))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --ts with --ts");
+ if (invert) {
+ info->options |= IPT_IPV4OPTION_DONT_MATCH_TIMESTAMP;
@@ -257,16 +257,16 @@
+ /* router-alert */
+ case '6':
+ if ((!invert) && (*flags & IPT_IPV4OPTION_MATCH_ROUTER_ALERT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ra twice");
+ if (invert && (*flags & IPT_IPV4OPTION_DONT_MATCH_ROUTER_ALERT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --rr twice");
+ if ((!invert) && (*flags & IPT_IPV4OPTION_DONT_MATCH_ROUTER_ALERT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --ra with ! --ra");
+ if (invert && (*flags & IPT_IPV4OPTION_MATCH_ROUTER_ALERT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --ra with --ra");
+ if (invert) {
+ info->options |= IPT_IPV4OPTION_DONT_MATCH_ROUTER_ALERT;
@@ -281,20 +281,20 @@
+ /* any option */
+ case '7' :
+ if ((!invert) && (*flags & IPT_IPV4OPTION_MATCH_ANY_OPT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --any-opt twice");
+ if (invert && (*flags & IPT_IPV4OPTION_MATCH_ANY_OPT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --any-opt with --any-opt");
+ if (invert && (*flags & IPT_IPV4OPTION_DONT_MATCH_ROUTER_ALERT))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --any-opt twice");
+ if ((!invert) &&
+ ((*flags & IPT_IPV4OPTION_DONT_MATCH_SRR) ||
+ (*flags & IPT_IPV4OPTION_DONT_MATCH_RR) ||
+ (*flags & IPT_IPV4OPTION_DONT_MATCH_TIMESTAMP) ||
+ (*flags & IPT_IPV4OPTION_DONT_MATCH_ROUTER_ALERT)))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --any-opt with any other negative ipv4options match");
+ if (invert &&
+ ((*flags & IPT_IPV4OPTION_MATCH_LSRR) ||
@@ -302,7 +302,7 @@
+ (*flags & IPT_IPV4OPTION_MATCH_RR) ||
+ (*flags & IPT_IPV4OPTION_MATCH_TIMESTAMP) ||
+ (*flags & IPT_IPV4OPTION_MATCH_ROUTER_ALERT)))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify ! --any-opt with any other positive ipv4options match");
+ if (invert) {
+ info->options |= IPT_IPV4OPTION_DONT_MATCH_ANY_OPT;
@@ -324,7 +324,7 @@
+final_check(unsigned int flags)
+{
+ if (flags == 0)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ipv4options match: you must specify some parameters. See iptables -m ipv4options --help for help.'");
+}
+
================================================================
Index: SOURCES/iptables-imq.patch
diff -u SOURCES/iptables-imq.patch:1.2 SOURCES/iptables-imq.patch:1.3
--- SOURCES/iptables-imq.patch:1.2 Mon May 26 18:13:20 2008
+++ SOURCES/iptables-imq.patch Thu Mar 26 10:12:27 2009
@@ -52,8 +52,8 @@
+
+ switch(c) {
+ case '1':
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --todev");
+ mr->todev=atoi(optarg);
+ break;
@@ -161,8 +161,8 @@
+
+ switch(c) {
+ case '1':
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --todev");
+ mr->todev=atoi(optarg);
+ break;
================================================================
Index: SOURCES/iptables-old-1.3.7.patch
diff -u SOURCES/iptables-old-1.3.7.patch:1.3 SOURCES/iptables-old-1.3.7.patch:1.4
--- SOURCES/iptables-old-1.3.7.patch:1.3 Wed May 21 23:49:11 2008
+++ SOURCES/iptables-old-1.3.7.patch Thu Mar 26 10:12:28 2009
@@ -219,7 +219,7 @@
+ *dst = *src;
+
+ } else {
-+ exit_error(PARAMETER_PROBLEM, err1, preerr,
++ xtables_error(PARAMETER_PROBLEM, err1, preerr,
+ string, src - string + 1);
+
+ }
@@ -228,7 +228,7 @@
+ *dst = '\0';
+ if ( idup == 1 ) {
+ if ( (rpcent_ptr = getrpcbyname(dup)) == NULL )
-+ exit_error(PARAMETER_PROBLEM, err2,
++ xtables_error(PARAMETER_PROBLEM, err2,
+ preerr, dup);
+ idup = rpcent_ptr->r_number;
+ } else {
@@ -237,7 +237,7 @@
+
+ rpcinfo->i_procs++;
+ if ( rpcinfo->i_procs > IPT_RPC_MAX_ENTS )
-+ exit_error(PARAMETER_PROBLEM, err3, preerr,
++ xtables_error(PARAMETER_PROBLEM, err3, preerr,
+ IPT_RPC_MAX_ENTS);
+
+ c_procs = (char *)rpcinfo->c_procs;
@@ -272,10 +272,10 @@
+ {
+ case '1':
+ if (invert)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "%s unexpected '!' with --rpcs\n", preerr);
+ if (*flags & IPT_RPC_RPCS)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "%s repeated use of --rpcs\n", preerr);
+ parse_rpcs_string(optarg, match);
+
@@ -284,10 +284,10 @@
+
+ case '2':
+ if (invert)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "%s unexpected '!' with --strict\n", preerr);
+ if (*flags & IPT_RPC_STRC)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "%s repeated use of --strict\n", preerr);
+ rpcinfo->strict = 1;
+ *flags |= IPT_RPC_STRC;
@@ -458,19 +458,19 @@
+ switch (c) {
+ case '1':
+ if (*flags & IPT_ROUTE_OPT_OIF)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --oif twice");
+
+ if (*flags & IPT_ROUTE_OPT_IIF)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't use --oif and --iif together");
+
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --oif");
+
+ if (strlen(optarg) > sizeof(route_info->oif) - 1)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Maximum interface name length %lu",
+ sizeof(route_info->oif) - 1);
+
@@ -480,19 +480,19 @@
+
+ case '2':
+ if (*flags & IPT_ROUTE_OPT_IIF)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --iif twice");
+
+ if (*flags & IPT_ROUTE_OPT_OIF)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't use --iif and --oif together");
+
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --iif");
+
+ if (strlen(optarg) > sizeof(route_info->iif) - 1)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Maximum interface name length %lu",
+ sizeof(route_info->iif) - 1);
+
@@ -502,15 +502,15 @@
+
+ case '3':
+ if (*flags & IPT_ROUTE_OPT_GW)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --gw twice");
+
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --gw");
+
+ if (!inet_aton(optarg, (struct in_addr*)&route_info->gw)) {
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Invalid IP address %s",
+ optarg);
+ }
@@ -520,10 +520,10 @@
+
+ case '4':
+ if (*flags & IPT_ROUTE_OPT_CONTINUE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --continue twice");
+ if (*flags & IPT_ROUTE_OPT_TEE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --continue AND --tee");
+
+ route_info->flags |= IPT_ROUTE_CONTINUE;
@@ -533,10 +533,10 @@
+
+ case '5':
+ if (*flags & IPT_ROUTE_OPT_TEE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --tee twice");
+ if (*flags & IPT_ROUTE_OPT_CONTINUE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --tee AND --continue");
+
+ route_info->flags |= IPT_ROUTE_TEE;
@@ -556,11 +556,11 @@
+final_check(unsigned int flags)
+{
+ if (!flags)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ROUTE target: oif, iif or gw option required");
+
+ if ((flags & (IPT_ROUTE_OPT_CONTINUE|IPT_ROUTE_OPT_TEE)) && (flags & IPT_ROUTE_OPT_IIF))
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ROUTE target: can't continue traversing the rules with iif option");
+}
+
@@ -758,15 +758,15 @@
+ switch (c) {
+ case '1':
+ if (*flags & IP6T_ROUTE_OPT_OIF)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --oif twice");
+
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --oif");
+
+ if (strlen(optarg) > sizeof(route_info->oif) - 1)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Maximum interface name length %lu",
+ sizeof(route_info->oif) - 1);
+
@@ -775,21 +775,21 @@
+ break;
+
+ case '2':
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "--iif option not implemented");
+ break;
+
+ case '3':
+ if (*flags & IP6T_ROUTE_OPT_GW)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --gw twice");
+
-+ if (check_inverse(optarg, &invert, NULL, 0))
-+ exit_error(PARAMETER_PROBLEM,
++ if (xtables_check_inverse(optarg, &invert, NULL, 0))
++ xtables_error(PARAMETER_PROBLEM,
+ "Unexpected `!' after --gw");
+
+ if (!inet_pton(AF_INET6, optarg, (struct in6_addr*)&route_info->gw)) {
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Invalid IPv6 address %s",
+ optarg);
+ }
@@ -799,10 +799,10 @@
+
+ case '4':
+ if (*flags & IP6T_ROUTE_OPT_CONTINUE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --continue twice");
+ if (*flags & IP6T_ROUTE_OPT_TEE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --continue AND --tee");
+
+ route_info->flags |= IP6T_ROUTE_CONTINUE;
@@ -812,10 +812,10 @@
+
+ case '5':
+ if (*flags & IP6T_ROUTE_OPT_TEE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --tee twice");
+ if (*flags & IP6T_ROUTE_OPT_CONTINUE)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "Can't specify --tee AND --continue");
+
+ route_info->flags |= IP6T_ROUTE_TEE;
@@ -835,7 +835,7 @@
+final_check(unsigned int flags)
+{
+ if (!flags)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "ROUTE target: oif or gw option required");
+}
+
================================================================
Index: SOURCES/iptables-account.patch
diff -u SOURCES/iptables-account.patch:1.3 SOURCES/iptables-account.patch:1.4
--- SOURCES/iptables-account.patch:1.3 Wed May 21 23:49:11 2008
+++ SOURCES/iptables-account.patch Thu Mar 26 10:12:28 2009
@@ -90,7 +90,7 @@
+
+static void parsenetwork(const char *parameter, u_int32_t *network) {
+ if (!parseip(parameter, network))
-+ exit_error(PARAMETER_PROBLEM, "account: wrong ip in network");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong ip in network");
+}
+
+static void parsenetmaskasbits(const char *parameter, u_int32_t *netmask) {
@@ -98,14 +98,14 @@
+ u_int32_t bits;
+
+ if ((bits = strtol(parameter, (char **)NULL, 10)) < 0 || bits > 32)
-+ exit_error(PARAMETER_PROBLEM, "account: wrong netmask");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong netmask");
+
+ *netmask = 0xffffffff << (32 - bits);
+}
+
+static void parsenetmaskasip(const char *parameter, u_int32_t *netmask) {
+ if (!parseip(parameter, netmask))
-+ exit_error(PARAMETER_PROBLEM, "account: wrong ip in netmask");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong ip in netmask");
+}
+
+static void parsenetmask(const char *parameter, u_int32_t *netmask)
@@ -123,7 +123,7 @@
+
+ if (strlen(parameter) > 31)
+ /* text is to long, even for 255.255.255.255/255.255.255.255 */
-+ exit_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
+
+ strncpy(buffer, parameter, 31);
+ buffer[31] = 0;
@@ -137,7 +137,7 @@
+ parsenetwork(buffer, network);
+
+ if ((*network & *netmask) != *network)
-+ exit_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
+}
+
+
@@ -196,7 +196,7 @@
+ case 201:
+ parse_network(optarg, info);
+ if (!valid_network_and_netmask(info))
-+ exit_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
++ xtables_error(PARAMETER_PROBLEM, "account: wrong network/netmask");
+ *flags = 1;
+ break;
+
@@ -206,7 +206,7 @@
+ strncpy(info->name, optarg, IPT_ACCOUNT_NAME_LEN);
+ info->name[IPT_ACCOUNT_NAME_LEN] = '\0';
+ } else
-+ exit_error(PARAMETER_PROBLEM, "account: Too long table name");
++ xtables_error(PARAMETER_PROBLEM, "account: Too long table name");
+ break;
+ /* --ashort */
+ case 203:
@@ -221,7 +221,7 @@
+/* Final check whether network/netmask was specified */
+static void final_check(unsigned int flags) {
+ if (!flags)
-+ exit_error(PARAMETER_PROBLEM, "account: You need specify '--aaddr' parameter");
++ xtables_error(PARAMETER_PROBLEM, "account: You need specify '--aaddr' parameter");
+}
+
+/* Function used for printing rule with account match for iptables -L */
@@ -264,8 +264,8 @@
+ .next = NULL,
+ .name = "account",
+ .version = XTABLES_VERSION,
-+ .size = IPT_ALIGN(sizeof(struct t_ipt_account_info)),
-+ .userspacesize = IPT_ALIGN(sizeof(struct t_ipt_account_info)),
++ .size = XT_ALIGN(sizeof(struct t_ipt_account_info)),
++ .userspacesize = XT_ALIGN(sizeof(struct t_ipt_account_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-20070806.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-imq.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-old-1.3.7.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-account.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list