diff options
| author | Steven Barth <steven@midlink.org> | 2013-09-01 13:46:10 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-09-01 13:46:10 +0000 |
| commit | 794da7c2356f4e375f4306b6f0f75e0c6df14036 (patch) | |
| tree | e0271d40136054467e0314beb0cca9ddf5c99ecf /package/network/utils/iptables/patches/400-lenient-restore.patch | |
| parent | 69e11f1a535a7e5c6893f9750f7831c886f000a1 (diff) | |
| download | upstream-794da7c2356f4e375f4306b6f0f75e0c6df14036.tar.gz upstream-794da7c2356f4e375f4306b6f0f75e0c6df14036.tar.bz2 upstream-794da7c2356f4e375f4306b6f0f75e0c6df14036.zip | |
iptables: Update to 1.4.20
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37865 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iptables/patches/400-lenient-restore.patch')
| -rw-r--r-- | package/network/utils/iptables/patches/400-lenient-restore.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/network/utils/iptables/patches/400-lenient-restore.patch b/package/network/utils/iptables/patches/400-lenient-restore.patch index 696d733225..c9c490602b 100644 --- a/package/network/utils/iptables/patches/400-lenient-restore.patch +++ b/package/network/utils/iptables/patches/400-lenient-restore.patch @@ -77,10 +77,10 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c DEBUGP("argv[%u]: %s\n", a, newargv[a]); - ret = do_command6(newargc, newargv, -- &newargv[2], &handle); +- &newargv[2], &handle, true); + if (!setjmp(jmp)) + ret = do_command6(newargc, newargv, -+ &newargv[2], &handle); ++ &newargv[2], &handle, true); + else + ret = 1; @@ -165,10 +165,10 @@ Index: iptables-1.4.18/iptables/iptables-restore.c DEBUGP("argv[%u]: %s\n", a, newargv[a]); - ret = do_command4(newargc, newargv, -- &newargv[2], &handle); +- &newargv[2], &handle, true); + if (!setjmp(jmp)) + ret = do_command4(newargc, newargv, -+ &newargv[2], &handle); ++ &newargv[2], &handle, true); + else + ret = 1; |