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"
+