summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2022-08-08 11:30:15 +1000
committerAmitay Isaacs <amitay@samba.org>2022-09-20 10:43:37 +0000
commitad445abebdea55f71b0c79eb31c0e6b0aee06763 (patch)
tree9d3ec90d48d05db70341a0e7d4205713108df83c /ctdb
parentc522f4f6045b48bffe47a12a246f356e71fbeec0 (diff)
downloadsamba-ad445abebdea55f71b0c79eb31c0e6b0aee06763.tar.gz
ctdb-common: Do not use raw socket when ENABLE_PCAP is defined
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/common/system_socket.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c
index 13e346a8866..ced2b17fc21 100644
--- a/ctdb/common/system_socket.c
+++ b/ctdb/common/system_socket.c
@@ -864,7 +864,7 @@ static int tcp6_extract(const uint8_t *ip_pkt,
* wscript has checked to make sure that pcap is available if needed.
*/
-#ifdef HAVE_AF_PACKET
+#if defined(HAVE_AF_PACKET) && !defined(ENABLE_PCAP)
/*
* This function is used to open a raw socket to capture from
@@ -963,7 +963,7 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
return ENOMSG;
}
-#else /* HAVE_AF_PACKET */
+#else /* defined(HAVE_AF_PACKET) && !defined(ENABLE_PCAP) */
#include <pcap.h>
@@ -1043,4 +1043,4 @@ int ctdb_sys_read_tcp_packet(int s,
return ENOMSG;
}
-#endif /* HAVE_AF_PACKET */
+#endif /* defined(HAVE_AF_PACKET) && !defined(ENABLE_PCAP) */