Move snmpd regress test from snmpctl(8) to snmp(1).

1 files changed, 41 insertions, 38 deletions

diff --git a/regress/usr.sbin/snmpd/snmpd.sh b/regress/usr.sbin/snmpd/snmpd.sh
index 97f78287206..5d0007e1b2e 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.8 2018/07/20 21:59:53 claudio Exp $
+# $OpenBSD: snmpd.sh,v 1.9 2019/08/09 07:58:26 martijn Exp $
 #/*
 # * Copyright (c) Rob Pierce <rob@openbsd.org>
 # *
@@ -82,9 +82,9 @@ sleep ${SLEEP}
 # pf (also checks "oid all" which obtains privileged kernel data
 
 pf_enabled="$(pfctl -si | grep ^Status | awk '{ print $2 }' | tr [A-Z] [a-z])"
-snmpctl_command="snmpctl snmp walk localhost oid all"
-echo ======= $snmpctl_command
-enabled="$(eval $snmpctl_command | grep -vi parameters | grep -i pfrunning | awk -F= '{ print $2 }')"
+snmp_command="snmp walk -Oq -v2c -cpublic localhost 1.3"
+echo ======= $snmp_command
+enabled="$(eval $snmp_command | grep -vi parameters | grep -i pfrunning | awk '{ print $2 }')"
 if [ "${PF[$enabled]}" != "${PF[enabled]}" ]
 then
 	if [ "${PF[$enabled]}" != "${PF[disabled]}" ]
@@ -97,9 +97,9 @@ fi
 # hostname
 
 sys_name=$(hostname)
-snmpctl_command="snmpctl snmp get localhost oid 1.3.6.1.2.1.1.5.0"
-echo ======= $snmpctl_command
-name="$(eval $snmpctl_command | awk -F= '{ print $2 }' | sed 's/"//g')"
+snmp_command="snmp get -Oqv -v2c -cpublic localhost 1.3.6.1.2.1.1.5.0"
+echo ======= $snmp_command
+name="$(eval $snmp_command)"
 if [ "$name" != "$sys_name" ]
 then
 	echo "Retrieval of hostname failed."
@@ -109,9 +109,10 @@ fi
 # carp allow
 
 carp="$(sysctl net.inet.carp.allow | awk -F= '{ print $2 }')"
-snmpctl_command="snmpctl snmp get localhost oid 1.3.6.1.4.1.30155.6.1.1.0"
-echo ======= $snmpctl_command
-carp_allow="$(eval $snmpctl_command | awk -F= '{ print $2 }')"
+snmp_command="snmp get -On -v2c -cpublic localhost 1.3.6.1.4.1.30155.6.1.1.0"
+echo ======= $snmp_command
+carp_allow="$(eval $snmp_command)"
+carp_allow="${carp_allow##.1.3.6.1.4.1.30155.6.1.1.0 = INTEGER: }"
 if [ "$carp" -ne "$carp_allow" ]
 then
 	echo "Retrieval of carp.allow failed."
@@ -121,9 +122,10 @@ fi
 # carp allow with default ro community string
 
 carp="$(sysctl net.inet.carp.allow | awk -F= '{ print $2 }')"
-snmpctl_command="snmpctl snmp get localhost community public oid 1.3.6.1.4.1.30155.6.1.1.0"
-echo ======= $snmpctl_command
-carp_allow="$(eval $snmpctl_command | awk -F= '{ print $2 }')"
+snmp_command="snmp getnext -Onq -v2c -cpublic localhost 1.3.6.1.4.1.30155.6.1.1"
+echo ======= $snmp_command
+carp_allow="$(eval $snmp_command)"
+carp_allow="${carp_allow##.1.3.6.1.4.1.30155.6.1.1.0 }"
 if [ "$carp" -ne "$carp_allow" ]
 then
 	echo "Retrieval of carp.allow with default ro cummunity string failed."
@@ -133,9 +135,9 @@ fi
 # trap handler with command execution
 
 rm -f ${TMPFILE}
-snmpctl_command="snmpctl trap send 1.2.3.4"
-echo ======= $snmpctl_command
-eval $snmpctl_command
+snmp_command="snmp trap -v2c -cpublic 127.0.0.1 '' 1.2.3.4"
+echo ======= $snmp_command
+eval $snmp_command
 sleep ${SLEEP}
 if [ ! -f "${TMPFILE}" ]
 then
@@ -149,9 +151,10 @@ puffy="puffy@openbsd.org"
 snmpset_command="snmpset -c private -v 1 localhost system.sysContact.0 s $puffy"
 echo ======= $snmpset_command
 eval $snmpset_command > /dev/null 2>&1
-snmpctl_command="snmpctl snmp get localhost oid 1.3.6.1.2.1.1.4.0"
-echo ======= $snmpctl_command
-contact="$(eval $snmpctl_command | awk -F= '{ print $2 }' | sed 's/"//g')"
+snmp_command="snmp get -v2c -cpublic localhost 1.3.6.1.2.1.1.4.0"
+echo ======= $snmp_command
+contact="$(eval $snmp_command)"
+contact="${contact##sysContact.0 = STRING: }"
 if [ "$contact" !=  "$puffy" ]
 then
 	echo "Setting with default rw community string failed."
@@ -183,9 +186,9 @@ sleep ${SLEEP}
 
 # make sure we can't get an oid with deault community string
 
-snmpctl_command="snmpctl snmp get localhost oid 1.3.6.1.2.1.1.5.0"
-echo ======= $snmpctl_command
-eval $snmpctl_command > /dev/null 2>&1
+snmp_command="snmp get -r2 -v2c -cpublic localhost 1.3.6.1.2.1.1.5.0"
+echo ======= $snmp_command
+eval $snmp_command > /dev/null 2>&1
 if [ $? -eq 0 ]
 then
 	echo "Non-defaut ro community string test failed."
@@ -270,10 +273,11 @@ sleep ${SLEEP}
 # carp allow with non-default ro community string
 
 carp="$(sysctl net.inet.carp.allow | awk -F= '{ print $2 }')"
-snmpctl_command="snmpctl snmp get localhost community non-default-ro \
-   oid 1.3.6.1.4.1.30155.6.1.1.0"
-echo ======= $snmpctl_command
-carp_allow="$(eval $snmpctl_command | awk -F= '{ print $2 }')"
+snmp_command="snmp get -OfQ -v2c -c non-default-ro localhost \
+    1.3.6.1.4.1.30155.6.1.1.0"
+echo ======= $snmp_command
+carp_allow="$(eval $snmp_command)"
+carp_allow="${carp_allow##.iso.org.dod.internet.private.enterprises.openBSD.carpMIBObjects.carpSysctl.carpAllow.0 = }"
 if [ "$carp" -ne "$carp_allow" ]
 then
 	echo "Retrieval test with default ro cummunity string failed."
@@ -287,10 +291,9 @@ snmpset_command="snmpset -c non-default-rw -v 1 localhost system.sysContact.0 \
    s $puffy"
 echo ======= $snmpset_command
 eval $snmpset_command > /dev/null 2>&1
-snmpctl_command="snmpctl snmp get localhost community non-default-ro \
-   oid 1.3.6.1.2.1.1.4.0"
-echo ======= $snmpctl_command
-contact="$(eval $snmpctl_command | awk -F= '{ print $2 }' | sed 's/"//g')"
+snmp_command="snmp get -Oqv -v2c -cnon-default-ro localhost 1.3.6.1.2.1.1.4.0"
+echo ======= $snmp_command
+contact="$(eval $snmp_command)"
 if [ "$contact" !=  "$puffy" ]
 then
 	echo "Setting with default rw community string failed."
@@ -299,20 +302,20 @@ fi
 
 # custom oids, with a ro that we should not be able to set
 
-snmpctl_command="snmpctl snmp get localhost community non-default-rw \
-   oid 1.3.6.1.4.1.30155.42.1.0"
-echo ======= $snmpctl_command
-string="$(eval $snmpctl_command | awk -F= '{ print $2 }' | sed 's/"//g')"
+snmp_command="snmp get -Oqv -v2c -cnon-default-rw localhost \
+    1.3.6.1.4.1.30155.42.1.0"
+echo ======= $snmp_command
+string="$(eval $snmp_command)"
 if [ "$string" !=  "humppa" ]
 then
 	echo "couldn't get customer oid string"
 	FAILED=1
 fi
 
-snmpctl_command="snmpctl snmp get localhost community non-default-rw \
-   oid 1.3.6.1.4.1.30155.42.2.0"
-echo ======= $snmpctl_command
-integer="$(eval $snmpctl_command | awk -F= '{ print $2 }' | sed 's/"//g')"
+snmp_command="snmp get -Oqv -v2c -c non-default-rw localhost \
+    1.3.6.1.4.1.30155.42.2.0"
+echo ======= $snmp_command
+integer="$(eval $snmp_command)"
 if [ $integer -ne  1 ]
 then
 	echo "Retrieval of customer oid integer failed."