Commit Diff

Commit:
efd37145daca2646b4ed8c8d1c3eb319000c95df
From:
smytht <smytht@users.noreply.github.com>
Via:
GitHub <noreply@github.com>
Date:
Message:
remove snmp trap command that references legacy removed binary /usr/sbin/snmpctl I would have love to been able to modify snmp trap command to use the snmp client binary but this requires further thought in the mean time to keep the code clean Im removing that defunct functionality thanks to ryan-sg who raised the issue https://github.com/yellowman/nsh/issues/146
Actions:
Patch | Tree
commit - f2d2d8611103b65f1d2fde42d1cdc5c1c23dac92
commit + efd37145daca2646b4ed8c8d1c3eb319000c95df
blob - d8d9e210e900e38322ae61e42335b5789eae6811
blob + f5b393c9d71f9dbe31718db7682a8101876ed4cf
--- ctl.c
+++ ctl.c
@@ -470,8 +470,6 @@ struct ctl ctl_snmp[] = {
 	    T_HANDLER_FILL1 },
 	{ "config-test",   "test staged OpenSNMPD config",
             { SNMPD, "-nvf", REQTEMP, NULL }, NULL, 0, T_EXEC },
-	{ "trap",	   "send traps",
-	    { SNMPCTL, "trap", "send", REQ, OPT, NULL }, NULL, 0, T_EXEC },
 	{ 0, 0, { 0 }, 0, 0, 0 }
 };
 
blob - 016abaae50e11fbd1d3585543f0a51c23e3fcfc2
blob + 912dbe18ab09e19ad069cbb8f326af4aeaadc82b
--- ctl.h
+++ ctl.h
@@ -58,7 +58,6 @@
 #define IKECTL          "/usr/sbin/ikectl"
 #define DVMRPCTL        "/usr/sbin/dvmrpctl"
 #define RELAYCTL        "/usr/sbin/relayctl"
-#define SNMPCTL         "/usr/sbin/snmpctl"
 #define SMTPCTL         "/usr/sbin/smtpctl"
 #define LDAPCTL         "/usr/sbin/ldapctl"
 
blob - c9db309076e09acdd713fbdfca7542d75872d607
blob + eef6496ff45a00493920b48445d4ad089a9ab9a3
--- nsh.8
+++ nsh.8
@@ -1355,12 +1355,12 @@ is restarted.
 .Tg snmpd
 .Tg snmp
 .Ic snmp
-.Op Cm  \&? | enable | disable | edit | trap
+.Op Cm  \&? | enable | disable | edit
 .Op Ar options
 .Pp
 Enable or disable or configure the
 .Xr snmpd 8
-Lightweight Directory Access Protocol daemon.
+Simple Network Monitoring Protocol daemon.
 The configuration of
 .Ic snmp
 daemon can be edited with
@@ -1368,7 +1368,7 @@ daemon can be edited with
 command, the configuration syntax of
 .Ic snmp
 daemon is documented in
-.Xr snmpd.conf 5 .
+.Xr snmpd.conf 5 
 .Pp
 .Tg ldapd
 .Tg ldap
@@ -5012,7 +5012,7 @@ options are used.
 .%A Chris Cappuccio
 .%T https://github.com/yellowman/nsh
 .%D 2022
-.\" The second edition of the above book (1995) is about ksh93,
+.\" The second edition of the below book (1995) is about ksh93,
 .\" but the OpenBSD ksh is a descendant from ksh88 via pdksh.
 .Re
 .Rs