From: Eric Leblond <eric@regit.org>
Date: Fri, 7 Sep 2012 11:52:21 +0000 (+0200)
Subject: Fix invalid usage of operator.
X-Git-Tag: suricata-1.4beta2~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4f9d0e0e1de3080c062e6f5c43de12d2155bfca;p=thirdparty%2Fsuricata.git

Fix invalid usage of operator.
---

diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index 96297e46c1..5174ea9291 100644
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -167,7 +167,7 @@ TmEcode ReceivePcapFileLoop(ThreadVars *tv, void *data, void *slot)
     ptv->cb_result = TM_ECODE_OK;
 
     while (1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }
 
diff --git a/src/source-pcap.c b/src/source-pcap.c
index 75b7617e48..657e1229db 100644
--- a/src/source-pcap.c
+++ b/src/source-pcap.c
@@ -267,7 +267,7 @@ TmEcode ReceivePcapLoop(ThreadVars *tv, void *data, void *slot)
     ptv->cb_result = TM_ECODE_OK;
 
     while (1) {
-        if (suricata_ctl_flags & (SURICATA_STOP || SURICATA_KILL)) {
+        if (suricata_ctl_flags & (SURICATA_STOP | SURICATA_KILL)) {
             SCReturnInt(TM_ECODE_OK);
         }