[Openvas-commits] r6774 - in trunk/gsa: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-02-18 13:18:53 +0100 (Thu, 18 Feb 2010)
New Revision: 6774

Modified:
   trunk/gsa/ChangeLog
   trunk/gsa/src/gsad.c
Log:
	* src/gsad.c (init_validator): Extend the "port" rule to allow ports like
	"port-name (111/tcp)".

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2010-02-18 12:16:29 UTC (rev 6773)
+++ trunk/gsa/ChangeLog	2010-02-18 12:18:53 UTC (rev 6774)
@@ -1,5 +1,10 @@
 2010-02-18  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/gsad.c (init_validator): Extend the "port" rule to allow ports like
+	"port-name (111/tcp)".
+
+2010-02-18  Matthew Mundell <matthew.mundell at intevation.de>
+
 	* src/html/src/omp.xsl (html-report-details, report, task)
 	(html-create-note-form, note-detailed, result-detailed): Pass the "notes"
 	flag when requesting a report.  Preserve the notes flag across new_note

Modified: trunk/gsa/src/gsad.c
===================================================================
--- trunk/gsa/src/gsad.c	2010-02-18 12:16:29 UTC (rev 6773)
+++ trunk/gsa/src/gsad.c	2010-02-18 12:18:53 UTC (rev 6774)
@@ -252,7 +252,7 @@
   openvas_validator_add (validator, "page",       "^[_[:alnum:] ]{1,40}$");
   openvas_validator_add (validator, "package_format", "^(key)|(rpm)|(deb)|(exe)$");
   openvas_validator_add (validator, "password",   "^[[:alnum:], \\./]{0,40}$");
-  openvas_validator_add (validator, "port",       "^[[:alnum:]_/]{1,400}$");
+  openvas_validator_add (validator, "port",       "^[-[:alnum:] \\(\\)_/]{1,400}$");
   /** @todo Better regex. */
   openvas_validator_add (validator, "preference_name", "^(.*){0,400}$");
   openvas_validator_add (validator, "pw",         "^[[:alnum:]]{1,10}$");