diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-02-25 09:07:41 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-02-25 09:07:41 -0800 |
| commit | 6c9f83f6bcf081973f25c7564cc61ba07ae2cfd2 (patch) | |
| tree | 5d7f2c464c0bb85e3ca6b9e290a449d5948568ba /templates/system | |
| parent | b541f5ffa7bf1c6951e01ae4814e0cd38adc42d5 (diff) | |
| download | vyatta-cfg-system-6c9f83f6bcf081973f25c7564cc61ba07ae2cfd2.tar.gz vyatta-cfg-system-6c9f83f6bcf081973f25c7564cc61ba07ae2cfd2.zip | |
Validate domain and host name
Bug 6243
More complete validation of host name and domain name
Diffstat (limited to 'templates/system')
| -rw-r--r-- | templates/system/domain-name/node.def | 2 | ||||
| -rw-r--r-- | templates/system/host-name/node.def | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def index e5d5af7e..87f9e0fa 100644 --- a/templates/system/domain-name/node.def +++ b/templates/system/domain-name/node.def @@ -3,7 +3,7 @@ type: txt help: System domain name # Allow letter-number-hyphen in label (but can not start or end with hyphen) -syntax:expression: pattern $VAR(@) "^[a-zA-Z0-9](([-a-zA-Z0-9]*[a-zA-Z0-9])?\.)*[a-zA-Z]+$" ; "invalid domain name $VAR(@)" +syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_domainname.pl $VAR(../host-name).$VAR(@)" # also add localhost line into /etc/hosts (see host-name template)? update: sudo /opt/vyatta/sbin/vyatta_update_resolv.pl diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def index df266fad..8c733b9f 100644 --- a/templates/system/host-name/node.def +++ b/templates/system/host-name/node.def @@ -4,6 +4,9 @@ help: System host name (default: vyatta) default: "vyatta" syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$" ; "invalid host name $VAR(@)" + +syntax:expression: pattern $VAR(@) "^.{1,63}$" ; "invalid host-name length" + update: sudo sh -c " \ hostname '$VAR(@)' echo '$VAR(@)' > /etc/hostname |