[Openvas-commits] r8111 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2010-06-22 00:31:30 +0200 (Tue, 22 Jun 2010)
New Revision: 8111

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/manage_sql.c
   trunk/openvas-manager/src/omp.c
Log:
	* src/manage_sql.c (create_lsc_credential): Add '_' to chars allowed in
	login name.

	* src/omp.c (omp_xml_handle_end_element): In CLIENT_CREATE_LSC_CREDENTIAL
	correct login char error message.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2010-06-21 22:04:23 UTC (rev 8110)
+++ trunk/openvas-manager/ChangeLog	2010-06-21 22:31:30 UTC (rev 8111)
@@ -1,5 +1,13 @@
 2010-06-21  Matthew Mundell <matthew.mundell at greenbone.net>
 
+	* src/manage_sql.c (create_lsc_credential): Add '_' to chars allowed in
+	login name.
+
+	* src/omp.c (omp_xml_handle_end_element): In CLIENT_CREATE_LSC_CREDENTIAL
+	correct login char error message.
+
+2010-06-21  Matthew Mundell <matthew.mundell at greenbone.net>
+
 	* src/manage_sql.c (task_trend): Add override flag.
 
 	* src/manage.h: Update header accordingly.

Modified: trunk/openvas-manager/src/manage_sql.c
===================================================================
--- trunk/openvas-manager/src/manage_sql.c	2010-06-21 22:04:23 UTC (rev 8110)
+++ trunk/openvas-manager/src/manage_sql.c	2010-06-21 22:31:30 UTC (rev 8111)
@@ -12227,7 +12227,8 @@
   assert (current_credentials.uuid);
 
   while (*s)
-    if (isalnum (*s) || (*s == '\\') || (*s == '.') || (*s == '@'))
+    if (isalnum (*s) || (*s == '\\') || (*s == '.') || (*s == '@')
+        || (*s == '_'))
       s++;
     else
       return 2;

Modified: trunk/openvas-manager/src/omp.c
===================================================================
--- trunk/openvas-manager/src/omp.c	2010-06-21 22:04:23 UTC (rev 8110)
+++ trunk/openvas-manager/src/omp.c	2010-06-21 22:31:30 UTC (rev 8111)
@@ -10396,8 +10396,8 @@
               case 2:
                 SEND_TO_CLIENT_OR_FAIL
                  (XML_ERROR_SYNTAX ("create_lsc_credential",
-                                    "Name may only contain alphanumeric"
-                                    " characters"));
+                                    "Login may only contain alphanumeric"
+                                    " characters, \\, ., @ and _"));
                 break;
               default:
                 assert (0);