diff options
| author | James Davidson <james.davidson@vyatta.com> | 2013-03-06 10:16:06 -0800 |
|---|---|---|
| committer | James Davidson <james.davidson@vyatta.com> | 2013-03-06 10:16:06 -0800 |
| commit | e4c3ae81d2d1f040a8ad363928302d72f8431ef9 (patch) | |
| tree | d410550ca2c900fb0f4bea49e4ddd9f4ce25f960 /templates/service/snmp/v3/tsm | |
| parent | c7b44a6b38f3f47f6d34efead35a9873688ad5eb (diff) | |
| download | vyatta-cfg-system-e4c3ae81d2d1f040a8ad363928302d72f8431ef9.tar.gz vyatta-cfg-system-e4c3ae81d2d1f040a8ad363928302d72f8431ef9.zip | |
Sync up SNMPv3 support
SNMP-135 store SNMP superuser password to config file
SNMP-130 add engineId for trap-target
SNMP-134 use 'stop' and 'start' instead of 'restart'
SNMP-141 change engineID syntax checking
SNMP-136 Users are lost after changing TSM port
SNMP-149 TLS Error: Permission denied
SNMP-147 Not correct priority in TSM users
SNMP-148 Configuring already use port for TSM is destroying users.
SNMP-151 Errors in logs after first snmp configuration
SNMP-152 Hide 'No such file or directory' error message
SNMP-153 Debug messages after 'delete service snmp'
SNMP-157 Run Perltidy for all Perl scripts
SNMP-158 change syntax of trap-target engineID
SNMP-163: added script to check name, apply it for user, group and view names
SNMP-161 Faulty configuration with many trap-target
SNMP-160 Look for TSM keys in /config folder
SNMP-162 CLI permit not correct oid
SNMP-163: typo in script
SNMP-160 Look for TSM keys in /config folder
SNMP-163: added support of upper case for names in the script
SNMP-163: create rule for names, permit only a-zA-Z0-9
SNMP-163: typo
Diffstat (limited to 'templates/service/snmp/v3/tsm')
| -rw-r--r-- | templates/service/snmp/v3/tsm/local-key/node.def | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/templates/service/snmp/v3/tsm/local-key/node.def b/templates/service/snmp/v3/tsm/local-key/node.def index d238d310..4bc3d07b 100644 --- a/templates/service/snmp/v3/tsm/local-key/node.def +++ b/templates/service/snmp/v3/tsm/local-key/node.def @@ -1,8 +1,12 @@ type: txt help: Defines the server certificate fingerprint or key-file name. -allowed: sudo ls /etc/snmp/tls/certs +allowed: if sudo [ -d /etc/snmp/tls/certs ]; then + sudo ls /etc/snmp/tls/certs 2> /dev/null + else + sudo ls /config/snmp/tls/certs 2> /dev/null + fi syntax:expression: pattern $VAR(@) "^[0-9A-F]{2}(:[0-9A-F]{2}){19}$" || - exec "if [ `sudo ls \"/etc/snmp/tls/certs/$VAR(@)\" 2> /dev/null` ]; \ + exec "if sudo [ -f /etc/snmp/tls/certs/$VAR(@) -o -f /config/snmp/tls/certs/$VAR(@) ]; \ then \ exit 0; \ else \ |