From nobody Thu Jul 17 16:01:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bjd2z6nBTz61x0h; Thu, 17 Jul 2025 16:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bjd2z0LSkz3dCL; Thu, 17 Jul 2025 16:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752768107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiNdDBpUIt8WsgdLRgmvhcEFljtFNvjQgWcrY6iiA4o=; b=W9FLR7uuQT/LutaTIFsh7MIV8G+29kwbPbrMZ7Qjhgu14CLY7MgulhZ+E3l3UXd7OYtH6k Aan4EpHmg61tnWSFaE5mbOdRtvydrOqrrhnOyRplQndcLFR6p2bEmL/amPRhun9xYmx1W7 m6hQAhKxnM2WFsY3/Jwt+Ai2pfWPfnTVmiIB8KsjgKAP6+RP0NvLTTjbaz+/6KUoSJa3OO OemNdi+RkpNstYDKmUlg8LSJ0IDnaJ7Bkx47/LHdYqSF1iuUFWx8LqBiVuDIzqA6FA8t7O SDcJ5s/dkqiGtsOfcI/GnXZHbfTRGw4rocAf2nT/QPmlppwGfkdo74SY21a6QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752768107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CiNdDBpUIt8WsgdLRgmvhcEFljtFNvjQgWcrY6iiA4o=; b=VV95JNmJ+uC833ID6TSaARd0GeIUK0gFc40XII09ZladBloKcReif3TccDuSX+FPGFE1Qj NZEU6h1WyGx/LKy+qGMVnu05AaevT21AyxZPMfNRuwlzzcwcdZUpVxgA83Hpya6EJIa6Us S/50QW7z7PSu/ehBitHCsBOxM2TesPLpUmlme34it5NoX9o4G1W2AQO/rSdm+nj19t0P3F /OEe0RmjZWv6PTswHmLHKFAXlKIE9HUZzSUe4mNCCAhvmSBZn5ZKxCy7rBHcL522xDcf5L OEDaeNizTKu2TRst6yc0M0o3/l1suloY9TFNbZGxa0zlryw+YCBoIHdSncN41g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752768107; a=rsa-sha256; cv=none; b=UQD+Xhhtb+WzOUZCp97bc0ec302AkJU0xoJp/EdtVb5IsVwDAe/e775eLVtjE6bgLpKaPo QEzNsOJk8AS1xwI+BlfiawfWwqO277CQ+2uBlad7SlGzU5zDGypRIzDIoOIDc4cyR9R5bK Ul5SUAXilvE1sZw6yki9SJ4T58ROSPyMwV28cNxiTr3P94zVU8H6YZxD0IPDXnXaQY9nX1 oB4/7K2BpfJ0gfV4GdlpJcs9MU4YuhzF2s9M/9unw/cHtHQ0Wgtu/At0V6UhXcCQ7leIX6 AxSmOdx3XyQW3vB2FH246bsFNAHowYsWPwmTRFTPzp2sMfkMZqoQnRA6km16VA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bjd2y6b8kz12Fs; Thu, 17 Jul 2025 16:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56HG1kNl032775; Thu, 17 Jul 2025 16:01:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56HG1kAj032772; Thu, 17 Jul 2025 16:01:46 GMT (envelope-from git) Date: Thu, 17 Jul 2025 16:01:46 GMT Message-Id: <202507171601.56HG1kAj032772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 665877ced9ea - main - libbsnmp: define SNMP_DEFAULT_LOCAL that matches default server config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 665877ced9ea53f838f80176739a8621a61d40c6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=665877ced9ea53f838f80176739a8621a61d40c6 commit 665877ced9ea53f838f80176739a8621a61d40c6 Author: Gleb Smirnoff AuthorDate: 2025-07-17 15:59:44 +0000 Commit: Gleb Smirnoff CommitDate: 2025-07-17 15:59:44 +0000 libbsnmp: define SNMP_DEFAULT_LOCAL that matches default server config The default /etc/snmpd.config we install for decades has: begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4 However, libbsnmp internally used DEFAULT_LOCAL set to "/var/run/snmp.sock" (note missing "d") to fill server pathname in case if API user didn't provide one. This results with default server config never working with an application that uses default initializer. The libbsnmptools has a workaround for that, it defines internally SNMP_DEFAULT_LOCAL that matches /etc/snmpd.config. Bring this all to an order: - Make a public define SNMP_DEFAULT_LOCAL in libbsnmp. - Point it to what /etc/snmpd.config has in. - Remove workaround from libbsnmptools. Reviewed by: harti Differential Revision: https://reviews.freebsd.org/D51071 --- contrib/bsnmp/lib/snmpclient.c | 10 ++-------- contrib/bsnmp/lib/snmpclient.h | 1 + contrib/bsnmp/lib/snmppriv.h | 1 - usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c | 9 --------- usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/contrib/bsnmp/lib/snmpclient.c b/contrib/bsnmp/lib/snmpclient.c index a7556527ad51..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)); 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/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c index fb09e1ac785e..b4613763fff5 100644 --- a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c +++ b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c @@ -790,15 +790,6 @@ parse_server(char *opt_arg) 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); } diff --git a/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h b/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h index 2874f311fbd0..54a087491a4f 100644 --- 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