From nobody Fri Feb 21 09:11:27 2025 X-Original-To: dev-commits-src-main@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 4Yzkrv5QXxz5pS7t; Fri, 21 Feb 2025 09:11:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yzkrv2PR1z3Yft; Fri, 21 Feb 2025 09:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740129087; 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=fIyKBBDWPSsbD7UqJEuOcPU8l9GfRGgDZ26seQ5VOC8=; b=CkIXPG2coZrbBgWHUT6FQvlhi5l7FMp2sTPZV+HvdRFOWF+3PUiuUrFDPnlqr0RSLlVt0K 7YY3Agl1DTWn5ExkfjrJ1EQggawRu/MeWpp+KOn905exiiCKI4SOpONzsyfqK7r+bF7hFu kTc8QgIe06khXOSA/SqtkyVyV07/YRnA4iq+u7/aJdwpg8pQZFQZvXYNO+P9vvfAAZSrlz p5HhsgBKUnR4p1YMd4Lif0ZPWVl3pLXHO/qWc7eqHrHcSw4rqNuvk2lU5ezFZi2aobOgah LhRT4EDqxpuIOgKHpL0c0KYLkkeVvcEkOGh5/YhUm4gCooopUGdTDDVVIflTyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740129087; a=rsa-sha256; cv=none; b=Dtrq4sfeQJ1gdApsxPjQllTVzr65//IIUrGywNGeF8e7lo2Zb0obaJ5Ob00BzA2m86uorf ngoWMVjSHBWHK1Tgob1MC4+UddawgESovWItky4JCBfRSrrUs4LVhCSRvuf4kXAMkrGJmw LTWauHWSLSa3uDgsm1+Wi1B80CI8qeKQrm5+tVLApnwpd3CBcSOjR9mi2WtJpM4fyUoYNc 2ElAp4HPhq1b+edpiBWrn4nkvCsygGPa6OSCFibV6/wnaSbIvIba+1Iu0JynnWc7M0uAjC BDzrVAlJfjLr2ok9GObaLJJQS2wy3W9KoRGpaTVUePI5f3Flkofjka1XpQYYHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740129087; 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=fIyKBBDWPSsbD7UqJEuOcPU8l9GfRGgDZ26seQ5VOC8=; b=Az88a6mQmawH8ciTG79wlmA+S1IODsVtKpKTmCBBOI2Dz9LGsWHXcUV0Gblg4L2XebUfHE Gky29Uj+5eVKUajZXksTeAUq2CemHVo0SKDK5fdkhAGGFrTzMzCcMNv4JZGZ3F+M2Nb0RR MbJ8EMwYMQ1wjgGrTr3SQvzKG9+X0vhmuJK/FsXl+Z/9z38+Prc0y027DwToeTmkgSCm8e +SFpQVt+kWiYs1S61/vWA87lBfbfht9qbMkPjj++HPTUedg+CZNCsmSyMkE169jJjrBiEd 1G6uB2UdPR0HdW6iGBaTxcKvLQOXTLhqaYKopZdQ4trfEw9g1xuPjhDwHK61xg== 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 4Yzkrv1vm9z1Ml; Fri, 21 Feb 2025 09:11:27 +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 51L9BRu6086683; Fri, 21 Feb 2025 09:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L9BRBQ086680; Fri, 21 Feb 2025 09:11:27 GMT (envelope-from git) Date: Fri, 21 Feb 2025 09:11:27 GMT Message-Id: <202502210911.51L9BRBQ086680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 08d01204175d - main - snmp_pf: fix rules->label use List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08d01204175dae496742e9ccd570363b267284e8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=08d01204175dae496742e9ccd570363b267284e8 commit 08d01204175dae496742e9ccd570363b267284e8 Author: Kristof Provost AuthorDate: 2025-02-21 08:49:06 +0000 Commit: Kristof Provost CommitDate: 2025-02-21 08:49:06 +0000 snmp_pf: fix rules->label use We now support multiple lables on a rule, so 'rule' is an array of strings, not just one string. Adjust the check for 'is there a label?'. CID: 1471808 Sponsored by: Rubicon Communications, LLC ("Netgate") --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 782e5503c8a3..0e40bcfb843e 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1531,7 +1531,7 @@ pfl_scan_ruleset(const char *path) goto err; } - if (rule.label[0]) { + if (rule.label[0][0]) { e = (struct pfl_entry *)malloc(sizeof(*e)); if (e == NULL) goto err;