From: Martin Schwenke <martin@meltin.net>
Date: Tue, 9 Aug 2022 03:49:42 +0000 (+1000)
Subject: ctdb-common: Stop a pcap-related crash on error
X-Git-Tag: samba-4.17.11~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c1314aae600de1c3292185b7a5ff41a76d711c0;p=thirdparty%2Fsamba.git

ctdb-common: Stop a pcap-related crash on error

errbuf can't be NULL.  Might as well use it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 40380a8042dfc2efa6f8f06ed7ac86c3c20a343f)
---

diff --git a/ctdb/common/system_socket.c b/ctdb/common/system_socket.c
index 71c60853ee3..43910e9b177 100644
--- a/ctdb/common/system_socket.c
+++ b/ctdb/common/system_socket.c
@@ -969,11 +969,14 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
 
 int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
 {
+	char errbuf[PCAP_ERRBUF_SIZE];
 	pcap_t *pt;
 
-	pt=pcap_open_live(iface, 100, 0, 0, NULL);
+	pt = pcap_open_live(iface, 100, 0, 0, errbuf);
 	if (pt == NULL) {
-		DBG_ERR("Failed to open capture device %s\n", iface);
+		DBG_ERR("Failed to open pcap capture device %s (%s)\n",
+			iface,
+			errbuf);
 		return -1;
 	}
 	*((pcap_t **)private_data) = pt;