From 054fd2315aa55861d20de47fee5c754ae9715635 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 18 Sep 2015 12:30:12 +0200
Subject: [PATCH] openvz: improve configuration parser

---
 PVE/OpenVZ.pm | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/PVE/OpenVZ.pm b/PVE/OpenVZ.pm
index 4956ff65..e003baef 100644
--- a/PVE/OpenVZ.pm
+++ b/PVE/OpenVZ.pm
@@ -736,6 +736,17 @@ sub parse_integer {
     return undef;
 };
 
+# use this for dns-name/ipv4/ipv6 (or lists of them)
+sub parse_simple_string {
+    my ($key, $text) = @_;
+
+    if ($text =~ m/^([a-zA-Z0-9\-\,\;\:\.\s]*)$/) {
+	return { value => $1 };
+    }
+    
+    return undef;
+}
+
 my $ovz_ressources = {
     numproc => \&parse_res_num_ignore,
     numtcpsock => \&parse_res_num_ignore,
@@ -776,9 +787,9 @@ my $ovz_ressources = {
 
     ip_address => 'string',
     netif => 'string',
-    hostname => 'string',
-    nameserver => 'string',
-    searchdomain => 'string',
+    hostname => \&parse_simple_string,
+    nameserver => \&parse_simple_string,
+    searchdomain => \&parse_simple_string,
 
     name => 'string',
     description => 'string',
@@ -1055,6 +1066,12 @@ sub update_ovz_config {
 	$newvalue = defined($newvalue) ? $newvalue : $param->{$name};
 	return if !defined($newvalue);
 
+	my $parser = $ovz_ressources->{$name};
+	if ($parser && ref($parser)) {
+	    my $ok = &$parser($name, $newvalue);
+	    die "invalid format - unable to parse property '$name'\n" if !defined($ok);
+	}
+
 	my $oldvalue = $veconf->{$name}->{value};
 	if (!defined($oldvalue) || ($oldvalue ne $newvalue)) {
 	    $veconf->{$name}->{value} = $newvalue;
-- 
2.39.5