compat_xtables: return bool for match_check and target_check in 2.6.23..34

Reported-by: Tomasz Pala <gotar@polanet.pl>

diff --git a/extensions/compat_xtables.c b/extensions/compat_xtables.c
index 8514af8758ac1357c52a165dabb1606c7d2f8707..9e96c0d7de5c3c2349678b9e502587d9e2613ea8 100644 (file)
--- 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