From 91cd6d614b149b675bdf068c189f904dea642af3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C5=82awomir=20Paszkiewicz?= Date: Fri, 15 Oct 2010 15:02:41 +0000 Subject: [PATCH] - applied upstream Changed files: xtables-addons-pre2.6.35-checkentry.patch -> 1.3 --- xtables-addons-pre2.6.35-checkentry.patch | 46 ----------------------- 1 file changed, 46 deletions(-) delete mode 100644 xtables-addons-pre2.6.35-checkentry.patch diff --git a/xtables-addons-pre2.6.35-checkentry.patch b/xtables-addons-pre2.6.35-checkentry.patch deleted file mode 100644 index 44f642e..0000000 --- a/xtables-addons-pre2.6.35-checkentry.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c -index 8514af8..9e96c0d 100644 ---- a/extensions/compat_xtables.c -+++ b/extensions/compat_xtables.c -@@ -105,7 +105,11 @@ static bool xtnu_match_check(const char *table, const void *entry, - return false; - if (nm->checkentry == NULL) - return true; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - return nm->checkentry(&local_par); -+#else -+ return nm->checkentry(&local_par) == 0; -+#endif - } - #endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && \ -@@ -118,7 +122,7 @@ static bool xtnu_match_check(const struct xt_mtchk_param *par) - return false; - if (nm->checkentry == NULL) - return true; -- return nm->checkentry(par) == 0 ? true : false; -+ return nm->checkentry(par) == 0; - } - #endif - -@@ -313,7 +317,11 @@ static bool xtnu_target_check(const char *table, const void *entry, - if (nt->checkentry == NULL) - /* this is valid, just like if there was no function */ - return true; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - return nt->checkentry(&local_par); -+#else -+ return nt->checkentry(&local_par) == 0; -+#endif - } - #endif - -@@ -327,7 +335,7 @@ static bool xtnu_target_check(const struct xt_tgchk_param *par) - return false; - if (nt->checkentry == NULL) - return true; -- return nt->checkentry(par) == 0 ? true : false; -+ return nt->checkentry(par) == 0; - } - #endif - -- 2.43.0