3 files changed, 4 insertions, 10 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"