[Openvas-commits] r5488 - in trunk/openvas-administrator: . src

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2009-10-12 10:42:47 +0200 (Mon, 12 Oct 2009)
New Revision: 5488

Modified:
   trunk/openvas-administrator/ChangeLog
   trunk/openvas-administrator/src/openvasad.c
Log:
* src/openvasad.c (main): Modified short options for --password, --role
and --account to resolve conflicts. Removed short options for
--rules-file, --users-dir and --config-file for now.


Modified: trunk/openvas-administrator/ChangeLog
===================================================================
--- trunk/openvas-administrator/ChangeLog	2009-10-12 08:41:58 UTC (rev 5487)
+++ trunk/openvas-administrator/ChangeLog	2009-10-12 08:42:47 UTC (rev 5488)
@@ -1,3 +1,9 @@
+2009-10-12  Michael Wiegand <michael.wiegand at intevation.de>
+
+	* src/openvasad.c (main): Modified short options for --password, --role
+	and --account to resolve conflicts. Removed short options for
+	--rules-file, --users-dir and --config-file for now.
+
 2009-09-29  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
 	Post release version bump.

Modified: trunk/openvas-administrator/src/openvasad.c
===================================================================
--- trunk/openvas-administrator/src/openvasad.c	2009-10-12 08:41:58 UTC (rev 5487)
+++ trunk/openvas-administrator/src/openvasad.c	2009-10-12 08:42:47 UTC (rev 5488)
@@ -425,20 +425,20 @@
           "OAP command (e.g. add_user, remove_user, list_users)", "<command>" },
         { "name", 'n', 0, G_OPTION_ARG_STRING, &name,
           "Username when creating, editing or removing a user", "<name>" },
-        { "password", 'p', 0, G_OPTION_ARG_STRING, &password,
+        { "password", 'w', 0, G_OPTION_ARG_STRING, &password,
           "Password for the new user", "<password>" },
-        { "role", 'n', 0, G_OPTION_ARG_STRING, &role,
+        { "role", 'r', 0, G_OPTION_ARG_STRING, &role,
           "Role when creating or modifying a user (User or Admin)", "<role>" },
-        { "account", 'a', 0, G_OPTION_ARG_STRING, &account,
-          "Username and password for new user (overrides -n and -p)",
+        { "account", 't', 0, G_OPTION_ARG_STRING, &account,
+          "Username and password for new user (overrides -n and -w)",
           "<username:password>" },
-        { "rules-file", 'r', 0, G_OPTION_ARG_FILENAME, &rules_file,
+        { "rules-file", 0, 0, G_OPTION_ARG_FILENAME, &rules_file,
           "File containing the rules for the user",
           "<rules-file>" },
-        { "users-dir", 'u', 0, G_OPTION_ARG_FILENAME, &users_dir,
+        { "users-dir", 0, 0, G_OPTION_ARG_FILENAME, &users_dir,
           "Directory containing the OpenVAS user data (default: " OPENVAS_USERS_DIR ")",
           "<users-dir>" },
-        { "config-file", 'f', 0, G_OPTION_ARG_FILENAME, &config_file,
+        { "config-file", 0, 0, G_OPTION_ARG_FILENAME, &config_file,
           "File containing the OpenVAS configuration (default: " OPENVAS_CONFIG_FILE ")",
           "<config-file>" },
         { NULL }