diff --git a/contrib/bsnmp/lib/snmpclient.h b/contrib/bsnmp/lib/snmpclient.h
--- 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/snmpclient.c b/contrib/bsnmp/lib/snmpclient.c
--- a/contrib/bsnmp/lib/snmpclient.c
+++ b/contrib/bsnmp/lib/snmpclient.c
@@ -981,14 +981,8 @@
 	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));
diff --git a/contrib/bsnmp/lib/snmppriv.h b/contrib/bsnmp/lib/snmppriv.h
--- a/contrib/bsnmp/lib/snmppriv.h
+++ b/contrib/bsnmp/lib/snmppriv.h
@@ -44,4 +44,3 @@
 
 #define DEFAULT_HOST "localhost"
 #define DEFAULT_PORT "snmp"
-#define DEFAULT_LOCAL "/var/run/snmp.sock"
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
@@ -43,7 +43,6 @@
 #define	MAX_BUFF_SIZE		(ASN_MAXOCTETSTRING + 50)
 
 #define	SNMP_DEFS_DIR		"/usr/share/snmp/defs/"
-#define	SNMP_DEFAULT_LOCAL	"/var/run/snmpd.sock"
 
 #define	SNMP_MAX_REPETITIONS	10
 
diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
--- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
+++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
@@ -790,15 +790,6 @@
 	if (snmp_parse_server(&snmp_client, opt_arg) < 0)
 		return (-1);
 
-	if (snmp_client.trans > SNMP_TRANS_UDP && snmp_client.chost == NULL) {
-		if ((snmp_client.chost = malloc(strlen(SNMP_DEFAULT_LOCAL) + 1))
-		    == NULL) {
-			syslog(LOG_ERR, "malloc() failed: %s", strerror(errno));
-			return (-1);
-		}
-		strcpy(snmp_client.chost, SNMP_DEFAULT_LOCAL);
-	}
-
 	return (2);
 }