From 6c10d0a75641065660cd754bd26b5f697e8390a8 Mon Sep 17 00:00:00 2001 From: martijn Date: Sat, 4 Nov 2023 09:42:17 +0000 Subject: [PATCH] With the move of SNMPv2-SMI::snmpV2 into application_internal.c, it's no longer possible to register objects underneath this region. This effectively made a few snmp(1) regress tests unusable, which essentially don't belong here. Simply remove these tests. --- regress/usr.sbin/snmpd/snmpd.sh | 36 +-------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/regress/usr.sbin/snmpd/snmpd.sh b/regress/usr.sbin/snmpd/snmpd.sh index 2066260099f..29438e33cc4 100644 --- a/regress/usr.sbin/snmpd/snmpd.sh +++ b/regress/usr.sbin/snmpd/snmpd.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: snmpd.sh,v 1.18 2022/01/19 11:02:38 martijn Exp $ +# $OpenBSD: snmpd.sh,v 1.19 2023/11/04 09:42:17 martijn Exp $ #/* # * Copyright (c) Rob Pierce # * @@ -271,8 +271,6 @@ read-write community non-default-rw oid 1.3.6.1.4.1.30155.42.1 name myName read-only string "humppa" oid 1.3.6.1.4.1.30155.42.2 name myStatus read-only integer 1 # No need to place a full index, we just need the object -oid 1.3.6.1.6.3.15.1.2.2.1.3.1 name Reyk read-only string "Reyk Fl${oe}ter" -oid 1.3.6.1.6.3.15.1.2.2.1.3.2 name broken read-only string "br${boe}ken" EOF (cd ${OBJDIR} && nohup snmpd -dvf ./snmpd.conf > snmpd.log 2>&1) & @@ -345,38 +343,6 @@ fi # FAILED=1 #fi -snmp_command="snmp get -Oqv -v2c -c non-default-rw localhost \ - usmUserSecurityName.1.0" -echo ======= $snmp_command -reyk="$(eval LC_ALL=en_US.UTF-8 $snmp_command)" -if [ "$reyk" != "Reyk Fl${oe}ter" ] -then - echo "Printing of UTF-8 string in UTF-8 locale failed" - FAILED=1 -fi -reyk="$(eval LC_ALL=C $snmp_command)" -if [ "$reyk" != "Reyk Fl.ter" ] -then - echo "Printing of UTF-8 string in C locale failed" - FAILED=1 -fi - -snmp_command="snmp get -Oqv -v2c -c non-default-rw localhost \ - usmUserSecurityName.2.0" -echo ======= $snmp_command -broken="$(eval LC_ALL=en_US.UTF-8 $snmp_command)" -if [ "$broken" != "br${replacement}ken" ] -then - echo "Printing of UTF-8 replacement character failed" - FAILED=1 -fi -broken="$(eval LC_ALL=C $snmp_command)" -if [ "$broken" != "br?ken" ] -then - echo "Printing of question mark in C locale failed" - FAILED=1 -fi - kill $(pgrep snmpd) >/dev/null 2>&1 case $FAILED in -- 2.20.1