5 files changed, 15 insertions, 18 deletions
diff --git a/contrib/bsnmp/lib/snmpclient.c b/contrib/bsnmp/lib/snmpclient.c
index b312a37ed3ed..d5d4af998a0c 100644
--- a/contrib/bsnmp/lib/snmpclient.c
+++ b/contrib/bsnmp/lib/snmpclient.c
@@ -981,14 +981,8 @@ open_client_local(const char *path)
 	char *ptr;
 	int stype;
 
-	if (snmp_client.chost == NULL) {
-		if ((snmp_client.chost = malloc(1 + sizeof(DEFAULT_LOCAL)))
-		    == NULL) {
-			seterr(&snmp_client, "%s", strerror(errno));
-			return (-1);
-		}
-		strcpy(snmp_client.chost, DEFAULT_LOCAL);
-	}
+	if (snmp_client.chost == NULL && path == NULL)
+		path = SNMP_DEFAULT_LOCAL;
 	if (path != NULL) {
 		if ((ptr = malloc(1 + strlen(path))) == NULL) {
 			seterr(&snmp_client, "%s", strerror(errno));
@@ -1012,7 +1006,7 @@ open_client_local(const char *path)
 	snprintf(snmp_client.local_path, sizeof(snmp_client.local_path),
 	    "%s", SNMP_LOCAL_PATH);
 
-	if (mkstemp(snmp_client.local_path) == -1) {
+	if (mktemp(snmp_client.local_path) == NULL) {
 		seterr(&snmp_client, "%s", strerror(errno));
 		(void)close(snmp_client.fd);
 		snmp_client.fd = -1;
diff --git a/contrib/bsnmp/lib/snmpclient.h b/contrib/bsnmp/lib/snmpclient.h
index a19bdb2ea653..662dc7c4a204 100644
--- a/contrib/bsnmp/lib/snmpclient.h
+++ b/contrib/bsnmp/lib/snmpclient.h
@@ -40,6 +40,7 @@
 
 
 #define SNMP_STRERROR_LEN 200
+#define	SNMP_DEFAULT_LOCAL "/var/run/snmpd.sock"
 
 #define SNMP_LOCAL_PATH	"/tmp/snmpXXXXXXXXXXXXXX"
 
diff --git a/contrib/bsnmp/lib/snmppriv.h b/contrib/bsnmp/lib/snmppriv.h
index 5b66992ca985..6ed51cf39369 100644
--- a/contrib/bsnmp/lib/snmppriv.h
+++ b/contrib/bsnmp/lib/snmppriv.h
@@ -44,4 +44,3 @@ enum snmp_code snmp_pdu_decrypt(const struct snmp_pdu *);
 
 #define DEFAULT_HOST "localhost"
 #define DEFAULT_PORT "snmp"
-#define DEFAULT_LOCAL "/var/run/snmp.sock"
diff --git a/contrib/bsnmp/snmpd/main.c b/contrib/bsnmp/snmpd/main.c
index 928b84121f82..c77572934d24 100644
--- a/contrib/bsnmp/snmpd/main.c
+++ b/contrib/bsnmp/snmpd/main.c
@@ -42,6 +42,7 @@
 #include <sys/un.h>
 #include <sys/ucred.h>
 #include <sys/uio.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -1509,7 +1510,7 @@ main(int argc, char *argv[])
 {
 	int opt;
 	FILE *fp;
-	int background = 1;
+	bool background = true;
 	struct tport *p;
 	const char *prefix = "snmpd";
 	struct lmodule *m;
@@ -1526,11 +1527,6 @@ main(int argc, char *argv[])
 		NULL
 	};
 
-	snmp_printf = snmp_printf_func;
-	snmp_error = snmp_error_func;
-	snmp_debug = snmp_debug_func;
-	asn_error = asn_error_func;
-
 	while ((opt = getopt(argc, argv, "c:dD:e:hI:l:m:p:")) != EOF)
 		switch (opt) {
 
@@ -1539,7 +1535,7 @@ main(int argc, char *argv[])
 			break;
 
 		  case 'd':
-			background = 0;
+			background = false;
 			break;
 
 		  case 'D':
@@ -1601,6 +1597,13 @@ main(int argc, char *argv[])
 			break;
 		}
 
+	if (background) {
+		snmp_printf = snmp_printf_func;
+		snmp_error = snmp_error_func;
+		snmp_debug = snmp_debug_func;
+		asn_error = asn_error_func;
+	}
+
 	openlog(prefix, LOG_PID | (background ? 0 : LOG_PERROR), LOG_USER);
 	setlogmask(LOG_UPTO(debug.logpri - 1));
 
diff --git a/contrib/bsnmp/snmpd/trans_lsock.c b/contrib/bsnmp/snmpd/trans_lsock.c
index fa3bd34d14f0..ca2311be7cc3 100644
--- a/contrib/bsnmp/snmpd/trans_lsock.c
+++ b/contrib/bsnmp/snmpd/trans_lsock.c
@@ -417,7 +417,7 @@ lsock_send(struct tport *tp, const u_char *buf, size_t len,
 		}
 	}
 
-	return (sendto(peer->input.fd, buf, len, 0, addr, addrlen));
+	return (sendto(peer->input.fd, buf, len, MSG_NOSIGNAL, addr, addrlen));
 }
 
 static void