libipt_LOG: fix ignoring all but last flags

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index a419ec91ec52d37b89d0d5b94003880486a99dbd..2b1ae2893a956744005ee8bcd42a514838d7e4d4 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -87,19 +87,19 @@ static void LOG_parse(struct xt_option_call *cb)
                                   "Newlines not allowed in --log-prefix");
                break;
        case O_LOG_TCPSEQ:
-               info->logflags = IP6T_LOG_TCPSEQ;
+               info->logflags |= IP6T_LOG_TCPSEQ;
                break;
        case O_LOG_TCPOPTS:
-               info->logflags = IP6T_LOG_TCPOPT;
+               info->logflags |= IP6T_LOG_TCPOPT;
                break;
        case O_LOG_IPOPTS:
-               info->logflags = IP6T_LOG_IPOPT;
+               info->logflags |= IP6T_LOG_IPOPT;
                break;
        case O_LOG_UID:
-               info->logflags = IP6T_LOG_UID;
+               info->logflags |= IP6T_LOG_UID;
                break;
        case O_LOG_MAC:
-               info->logflags = IP6T_LOG_MACDECODE;
+               info->logflags |= IP6T_LOG_MACDECODE;
                break;
        }
 }

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index b270bcf66f50276e9cb0aecdf748e1348e1c6d17..77f16d19e09aa1cbd494d3d6eede4cedcb5fb4c7 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -87,19 +87,19 @@ static void LOG_parse(struct xt_option_call *cb)
                                   "Newlines not allowed in --log-prefix");
                break;
        case O_LOG_TCPSEQ:
-               info->logflags = IPT_LOG_TCPSEQ;
+               info->logflags |= IPT_LOG_TCPSEQ;
                break;
        case O_LOG_TCPOPTS:
-               info->logflags = IPT_LOG_TCPOPT;
+               info->logflags |= IPT_LOG_TCPOPT;
                break;
        case O_LOG_IPOPTS:
-               info->logflags = IPT_LOG_IPOPT;
+               info->logflags |= IPT_LOG_IPOPT;
                break;
        case O_LOG_UID:
-               info->logflags = IPT_LOG_UID;
+               info->logflags |= IPT_LOG_UID;
                break;
        case O_LOG_MAC:
-               info->logflags = IPT_LOG_MACDECODE;
+               info->logflags |= IPT_LOG_MACDECODE;
                break;
        }
 }

diff --git a/tests/options-most.rules b/tests/options-most.rules
index 6c4a831347cf87ab1ec5f2ba408b10faa6a1ad30..13ee9873efb2aa80d39fd1258844e8dd287934a1 100644 (file)
--- a/tests/options-most.rules
+++ b/tests/options-most.rules
@@ -146,6 +146,8 @@
 -A matches
 -A matches -m rt --rt-segsleft 5:4294967295
 -A matches
+-A ntarg -j LOG --log-tcp-sequence --log-tcp-options --log-ip-options
+-A ntarg
 -A ntarg -j NFQUEUE --queue-num 1
 -A ntarg
 -A ntarg -j NFQUEUE --queue-balance 8:99