Merge pull request #54 from cwh42/master

Fix handling of trailing spaces in named.conf (bsc#976643)
yast · May 4, 2016 · df1d197 · df1d197
2 parents f88659c + 4f864c5
commit df1d197
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package/yast2-dns-server.changes b/package/yast2-dns-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  4 08:45:09 UTC 2016 - cwh@suse.com
+
+- Fix handling of trailing spaces in named.conf (bsc#976643)
+- 3.1.20
+
 -------------------------------------------------------------------
 Fri Nov 27 09:35:39 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-dns-server.spec b/package/yast2-dns-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-dns-server
-Version:        3.1.19
+Version:        3.1.20
 Release:        0
 Url:            https://github.com/yast/yast-dns-server
 

diff --git a/src/scrconf/dns_named.scr b/src/scrconf/dns_named.scr
@@ -22,7 +22,7 @@
 	    "comments"	: [ "^[ \t]*#.*$", "^[ \t]*$" ],
 	    "params"    : [
 		$[
-		    "match" : [ "([^ \t]+)[ \t]([^ \t]+(.*[^ \t]+)+)[ \t]*;$", "%s %s;" ],
+		    "match" : [ "([^ \t]+)[ \t]([^ \t]+(.*[^ \t]+)+)[ \t]*;", "%s %s;" ],
 		    // This enables multiline parameters
 		    "multiline" : [ "([^ \t]+)[ \t]+([^}]*)", "([^}]*\\}[ \t]*;)[ \t]*" ],
 		],