diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-09-03 03:08:59 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-09-03 03:08:59 +0700 |
| commit | c3ef70583eb2c60b5c83e1c5711906be2b496da4 (patch) | |
| tree | c9a90bfcc906652068e2fada793911e4a25e3f46 | |
| parent | 7ba1d3672cf9d7d34135ebec447b4a95766457bb (diff) | |
| parent | 3e62229285ce90c6b56eab5f79f1559c4156641d (diff) | |
| download | vyatta-cfg-system-c3ef70583eb2c60b5c83e1c5711906be2b496da4.tar.gz vyatta-cfg-system-c3ef70583eb2c60b5c83e1c5711906be2b496da4.zip | |
Merge pull request #20 from cyclops8456/helium
Bug #261: vyatta-cfg-system: remove quotes from SysContact and SysLocation
| -rwxr-xr-x | scripts/snmp/vyatta-snmp.pl | 6 | ||||
| -rw-r--r-- | templates/service/snmp/contact/node.def | 4 | ||||
| -rw-r--r-- | templates/service/snmp/description/node.def | 4 | ||||
| -rw-r--r-- | templates/service/snmp/location/node.def | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/scripts/snmp/vyatta-snmp.pl b/scripts/snmp/vyatta-snmp.pl index a39b517b..6423db15 100755 --- a/scripts/snmp/vyatta-snmp.pl +++ b/scripts/snmp/vyatta-snmp.pl @@ -224,17 +224,17 @@ sub snmp_get_values { $config->setLevel($snmp_level); my $contact = $config->returnValue("contact"); if (defined $contact) { - print "syscontact \"$contact\" \n"; + print "SysContact $contact \n"; } my $description = $config->returnValue("description"); if (defined $description) { - print "sysdescr \"$description\" \n"; + print "SysDescr $description \n"; } my $location = $config->returnValue("location"); if (defined $location) { - print "syslocation \"$location\" \n"; + print "SysLocation $location \n"; } } diff --git a/templates/service/snmp/contact/node.def b/templates/service/snmp/contact/node.def index 039cd548..63a368cc 100644 --- a/templates/service/snmp/contact/node.def +++ b/templates/service/snmp/contact/node.def @@ -1,2 +1,6 @@ type: txt help: Contact information + +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \ + "Contact information is limited to 255 characters or less" + diff --git a/templates/service/snmp/description/node.def b/templates/service/snmp/description/node.def index 61ec96b6..cd88099a 100644 --- a/templates/service/snmp/description/node.def +++ b/templates/service/snmp/description/node.def @@ -1,2 +1,6 @@ type: txt help: Description information + +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \ + "Description is limited to 255 characters or less" + diff --git a/templates/service/snmp/location/node.def b/templates/service/snmp/location/node.def index a5b234ea..903b405f 100644 --- a/templates/service/snmp/location/node.def +++ b/templates/service/snmp/location/node.def @@ -1,3 +1,6 @@ type: txt help: Location information +syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \ + "Location is limited to 255 characters or less" + |