From 8bf2342d5e186f4effaad63e0b8b61b7c0a5baf0 Mon Sep 17 00:00:00 2001
From: Timo Pollmeier <timo.pollmeier@greenbone.net>
Date: Mon, 27 May 2019 16:31:03 +0200
Subject: [PATCH 1/2] Sort command line options alphabetically

---
 src/gvmd.c | 304 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 223 insertions(+), 81 deletions(-)

diff --git a/src/gvmd.c b/src/gvmd.c
index c4cabe309..a6c74ab4d 100644
--- a/src/gvmd.c
+++ b/src/gvmd.c
@@ -1745,98 +1745,240 @@ main (int argc, char** argv)
   GOptionContext *option_context;
   static GOptionEntry option_entries[]
     = {
-        { "backup", '\0', 0, G_OPTION_ARG_NONE, &backup_database, "Backup the database.", NULL },
-        { "check-alerts", '\0', 0, G_OPTION_ARG_NONE, &check_alerts, "Check SecInfo alerts.", NULL },
+        { "backup", '\0', 0, G_OPTION_ARG_NONE,
+          &backup_database,
+          "Backup the database.",
+          NULL },
+        { "check-alerts", '\0', 0, G_OPTION_ARG_NONE,
+          &check_alerts,
+          "Check SecInfo alerts.",
+          NULL },
         { "client-watch-interval", '\0', 0, G_OPTION_ARG_INT,
           &client_watch_interval,
           "Check if client connection was closed every <number> seconds."
           " 0 to disable. Defaults to "
           G_STRINGIFY (DEFAULT_CLIENT_WATCH_INTERVAL) " seconds.",
           "<number>" },
-        { "database", 'd', 0, G_OPTION_ARG_STRING, &database, "Use <file/name> as database for SQLite/Postgres.", "<file/name>" },
-        { "disable-cmds", '\0', 0, G_OPTION_ARG_STRING, &disable, "Disable comma-separated <commands>.", "<commands>" },
+        { "create-scanner", '\0', 0, G_OPTION_ARG_STRING,
+          &create_scanner,
+          "Create global scanner <scanner> and exit.",
+          "<scanner>" },
+        { "create-user", '\0', 0, G_OPTION_ARG_STRING,
+          &create_user,
+          "Create admin user <username> and exit.",
+          "<username>" },
+        { "database", 'd', 0, G_OPTION_ARG_STRING,
+          &database,
+          "Use <file/name> as database for SQLite/Postgres.",
+          "<file/name>" },
+        { "decrypt-all-credentials", '\0', G_OPTION_FLAG_HIDDEN,
+          G_OPTION_ARG_NONE,
+          &decrypt_all_credentials,
+          NULL,
+          NULL },
+        { "delete-scanner", '\0', 0, G_OPTION_ARG_STRING,
+          &delete_scanner,
+          "Delete scanner <scanner-uuid> and exit.",
+          "<scanner-uuid>" },
+        { "delete-user", '\0', 0, G_OPTION_ARG_STRING,
+          &delete_user,
+          "Delete user <username> and exit.",
+          "<username>" },
+        { "dh-params", '\0', 0, G_OPTION_ARG_STRING,
+          &dh_params,
+          "Diffie-Hellman parameters file",
+          "<file>" },
+        { "disable-cmds", '\0', 0, G_OPTION_ARG_STRING,
+          &disable,
+          "Disable comma-separated <commands>.",
+          "<commands>" },
         { "disable-encrypted-credentials", '\0', 0, G_OPTION_ARG_NONE,
           &disable_encrypted_credentials,
-          "Do not encrypt or decrypt credentials.", NULL },
-        {"disable-password-policy", '\0', 0, G_OPTION_ARG_NONE,
-         &disable_password_policy, "Do not restrict passwords to the policy.",
-         NULL},
-        { "disable-scheduling", '\0', 0, G_OPTION_ARG_NONE, &disable_scheduling, "Disable task scheduling.", NULL },
-        { "create-user", '\0', 0, G_OPTION_ARG_STRING, &create_user, "Create admin user <username> and exit.", "<username>" },
-        { "delete-user", '\0', 0, G_OPTION_ARG_STRING, &delete_user, "Delete user <username> and exit.", "<username>" },
-        { "get-users", '\0', 0, G_OPTION_ARG_NONE, &get_users, "List users and exit.", NULL },
-        { "create-scanner", '\0', 0, G_OPTION_ARG_STRING, &create_scanner,
-          "Create global scanner <scanner> and exit.", "<scanner>" },
-        { "modify-scanner", '\0', 0, G_OPTION_ARG_STRING, &modify_scanner,
-          "Modify scanner <scanner-uuid> and exit.", "<scanner-uuid>" },
-        { "scanner-name", '\0', 0, G_OPTION_ARG_STRING, &scanner_name, "Name for --modify-scanner.", "<name>" },
-        { "scanner-host", '\0', 0, G_OPTION_ARG_STRING, &scanner_host,
-          "Scanner host for --create-scanner and --modify-scanner. Default is " OPENVASSD_ADDRESS ".",
-          "<scanner-host>" },
-        { "scanner-port", '\0', 0, G_OPTION_ARG_STRING, &scanner_port,
-          "Scanner port for --create-scanner and --modify-scanner. Default is " G_STRINGIFY (OPENVASSD_PORT) ".",
-          "<scanner-port>" },
-        { "scanner-type", '\0', 0, G_OPTION_ARG_STRING, &scanner_type,
-          "Scanner type for --create-scanner and --modify-scanner. Either 'OpenVAS' or 'OSP'.",
-          "<scanner-type>" },
-        { "scanner-ca-pub", '\0', 0, G_OPTION_ARG_STRING, &scanner_ca_pub,
-          "Scanner CA Certificate path for --[create|modify]-scanner.", "<scanner-ca-pub>" },
-        { "scanner-key-pub", '\0', 0, G_OPTION_ARG_STRING, &scanner_key_pub,
-          "Scanner Certificate path for --[create|modify]-scanner.", "<scanner-key-public>" },
-        { "scanner-key-priv", '\0', 0, G_OPTION_ARG_STRING, &scanner_key_priv,
-          "Scanner private key path for --[create|modify]-scanner.", "<scanner-key-private>" },
-        { "verify-scanner", '\0', 0, G_OPTION_ARG_STRING, &verify_scanner,
-          "Verify scanner <scanner-uuid> and exit.", "<scanner-uuid>" },
-        { "delete-scanner", '\0', 0, G_OPTION_ARG_STRING, &delete_scanner, "Delete scanner <scanner-uuid> and exit.", "<scanner-uuid>" },
-        { "get-scanners", '\0', 0, G_OPTION_ARG_NONE, &get_scanners, "List scanners and exit.", NULL },
-        { "secinfo-commit-size", '\0', 0, G_OPTION_ARG_INT, &secinfo_commit_size, "During CERT and SCAP sync, commit updates to the database every <number> items, 0 for unlimited, default: " G_STRINGIFY (SECINFO_COMMIT_SIZE_DEFAULT), "<number>" },
-        { "schedule-timeout", '\0', 0, G_OPTION_ARG_INT, &schedule_timeout, "Time out tasks that are more than <time> minutes overdue. -1 to disable, 0 for minimum time, default: " G_STRINGIFY (SCHEDULE_TIMEOUT_DEFAULT), "<time>" },
-        {"slave-commit-size",
-         '\0',
-         0,
-         G_OPTION_ARG_INT,
-         &slave_commit_size,
-         "During slave updates, commit after every <number> updated results and"
-         " hosts, 0 for unlimited",
-         "<number>"},
-        { "foreground", 'f', 0, G_OPTION_ARG_NONE, &foreground, "Run in foreground.", NULL },
-        { "inheritor", '\0', 0, G_OPTION_ARG_STRING, &inheritor, "Have <username> inherit from deleted user.", "<username>" },
-        { "listen", 'a', 0, G_OPTION_ARG_STRING, &manager_address_string, "Listen on <address>.", "<address>" },
-        { "listen2", '\0', 0, G_OPTION_ARG_STRING, &manager_address_string_2, "Listen also on <address>.", "<address>" },
-        { "listen-owner", '\0', 0, G_OPTION_ARG_STRING, &listen_owner,
-          "Owner of the unix socket", "<string>" },
-        { "listen-group", '\0', 0, G_OPTION_ARG_STRING, &listen_group,
-          "Group of the unix socket", "<string>" },
-        { "listen-mode", '\0', 0, G_OPTION_ARG_STRING, &listen_mode,
-          "File mode of the unix socket", "<string>" },
-        { "max-ips-per-target", '\0', 0, G_OPTION_ARG_INT, &max_ips_per_target, "Maximum number of IPs per target.", "<number>"},
-        { "max-email-attachment-size", '\0', 0, G_OPTION_ARG_INT, &max_email_attachment_size, "Maximum size of alert email attachments, in bytes.", "<number>"},
-        { "max-email-include-size", '\0', 0, G_OPTION_ARG_INT, &max_email_include_size, "Maximum size of inlined content in alert emails, in bytes.", "<number>"},
-        { "max-email-message-size", '\0', 0, G_OPTION_ARG_INT, &max_email_message_size, "Maximum size of user-defined message text in alert emails, in bytes.", "<number>"},
-        { "migrate", 'm', 0, G_OPTION_ARG_NONE, &migrate_database, "Migrate the database and exit.", NULL },
-        { "modify-setting", '\0', 0, G_OPTION_ARG_STRING, &modify_setting,
-          "Modify setting <uuid> and exit.", "<uuid>" },
+          "Do not encrypt or decrypt credentials.",
+          NULL },
+        { "disable-password-policy", '\0', 0, G_OPTION_ARG_NONE,
+          &disable_password_policy,
+          "Do not restrict passwords to the policy.",
+          NULL },
+        { "disable-scheduling", '\0', 0, G_OPTION_ARG_NONE,
+          &disable_scheduling,
+          "Disable task scheduling.",
+          NULL },
         { "encrypt-all-credentials", '\0', 0, G_OPTION_ARG_NONE,
-          &encrypt_all_credentials, "(Re-)Encrypt all credentials.", NULL },
-        { "decrypt-all-credentials", '\0',
-          G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
-          &decrypt_all_credentials, NULL, NULL },
-        { "new-password", '\0', 0, G_OPTION_ARG_STRING, &new_password, "Modify user's password and exit.", "<password>" },
-        { "osp-vt-update", '\0', 0, G_OPTION_ARG_STRING, &osp_vt_update,
+          &encrypt_all_credentials,
+          "(Re-)Encrypt all credentials.",
+          NULL },
+        { "foreground", 'f', 0, G_OPTION_ARG_NONE,
+          &foreground,
+          "Run in foreground.",
+          NULL },
+        { "get-scanners", '\0', 0, G_OPTION_ARG_NONE,
+          &get_scanners,
+          "List scanners and exit.",
+          NULL },
+        { "get-users", '\0', 0, G_OPTION_ARG_NONE,
+          &get_users,
+          "List users and exit.",
+          NULL },
+        { "gnutls-priorities", '\0', 0, G_OPTION_ARG_STRING,
+          &priorities,
+          "Sets the GnuTLS priorities for the Manager socket.",
+          "<priorities-string>" },
+        { "inheritor", '\0', 0, G_OPTION_ARG_STRING,
+          &inheritor,
+          "Have <username> inherit from deleted user.",
+          "<username>" },
+        { "listen", 'a', 0, G_OPTION_ARG_STRING,
+          &manager_address_string,
+          "Listen on <address>.",
+          "<address>" },
+        { "listen2", '\0', 0, G_OPTION_ARG_STRING,
+          &manager_address_string_2,
+          "Listen also on <address>.",
+          "<address>" },
+        { "listen-group", '\0', 0, G_OPTION_ARG_STRING,
+          &listen_group,
+          "Group of the unix socket",
+          "<string>" },
+        { "listen-mode", '\0', 0, G_OPTION_ARG_STRING,
+          &listen_mode,
+          "File mode of the unix socket",
+          "<string>" },
+        { "listen-owner", '\0', 0, G_OPTION_ARG_STRING,
+          &listen_owner,
+          "Owner of the unix socket",
+          "<string>" },
+        { "max-email-attachment-size", '\0', 0, G_OPTION_ARG_INT,
+          &max_email_attachment_size,
+          "Maximum size of alert email attachments, in bytes.",
+          "<number>" },
+        { "max-email-include-size", '\0', 0, G_OPTION_ARG_INT,
+          &max_email_include_size,
+          "Maximum size of inlined content in alert emails, in bytes.",
+          "<number>" },
+        { "max-email-message-size", '\0', 0, G_OPTION_ARG_INT,
+          &max_email_message_size,
+          "Maximum size of user-defined message text in alert emails,"
+          " in bytes.",
+          "<number>" },
+        { "max-ips-per-target", '\0', 0, G_OPTION_ARG_INT,
+          &max_ips_per_target,
+          "Maximum number of IPs per target.",
+          "<number>" },
+        { "migrate", 'm', 0, G_OPTION_ARG_NONE,
+          &migrate_database,
+          "Migrate the database and exit.",
+          NULL },
+        { "modify-scanner", '\0', 0, G_OPTION_ARG_STRING,
+          &modify_scanner,
+          "Modify scanner <scanner-uuid> and exit.",
+          "<scanner-uuid>" },
+        { "modify-setting", '\0', 0, G_OPTION_ARG_STRING,
+          &modify_setting,
+          "Modify setting <uuid> and exit.",
+          "<uuid>" },
+        { "new-password", '\0', 0, G_OPTION_ARG_STRING,
+          &new_password,
+          "Modify user's password and exit.",
+          "<password>" },
+        { "optimize", '\0', 0, G_OPTION_ARG_STRING,
+          &optimize,
+          "Run an optimization: vacuum, analyze, cleanup-config-prefs,"
+          " cleanup-port-names, cleanup-result-severities,"
+          " cleanup-schedule-times, rebuild-report-cache or"
+          " update-report-cache.",
+          "<name>" },
+        { "osp-vt-update", '\0', 0, G_OPTION_ARG_STRING,
+          &osp_vt_update,
           "Unix socket for OSP NVT update.  Default is to do an OTP update.",
           "<scanner-socket>" },
-        { "optimize", '\0', 0, G_OPTION_ARG_STRING, &optimize, "Run an optimization: vacuum, analyze, cleanup-config-prefs, cleanup-port-names, cleanup-result-severities, cleanup-schedule-times, rebuild-report-cache or update-report-cache.", "<name>" },
-        { "password", '\0', 0, G_OPTION_ARG_STRING, &password, "Password, for --create-user.", "<password>" },
-        { "port", 'p', 0, G_OPTION_ARG_STRING, &manager_port_string, "Use port number <number>.", "<number>" },
-        { "port2", '\0', 0, G_OPTION_ARG_STRING, &manager_port_string_2, "Use port number <number> for address 2.", "<number>" },
-        { "role", '\0', 0, G_OPTION_ARG_STRING, &role, "Role for --create-user and --get-users.", "<role>" },
-        { "unix-socket", 'c', 0, G_OPTION_ARG_STRING, &manager_address_string_unix, "Listen on UNIX socket at <filename>.", "<filename>" },
-        { "user", '\0', 0, G_OPTION_ARG_STRING, &user, "User for --new-password.", "<username>" },
-        { "gnutls-priorities", '\0', 0, G_OPTION_ARG_STRING, &priorities, "Sets the GnuTLS priorities for the Manager socket.", "<priorities-string>" },
-        { "dh-params", '\0', 0, G_OPTION_ARG_STRING, &dh_params, "Diffie-Hellman parameters file", "<file>" },
-        { "value", '\0', 0, G_OPTION_ARG_STRING, &value, "Value for --modify-setting.", "<value>" },
-        { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Has no effect.  See INSTALL.md for logging config.", NULL },
-        { "version", '\0', 0, G_OPTION_ARG_NONE, &print_version, "Print version and exit.", NULL },
+        { "password", '\0', 0, G_OPTION_ARG_STRING,
+          &password,
+          "Password, for --create-user.",
+          "<password>" },
+        { "port", 'p', 0, G_OPTION_ARG_STRING,
+          &manager_port_string,
+          "Use port number <number>.",
+          "<number>" },
+        { "port2", '\0', 0, G_OPTION_ARG_STRING,
+          &manager_port_string_2,
+          "Use port number <number> for address 2.",
+          "<number>" },
+        { "role", '\0', 0, G_OPTION_ARG_STRING,
+          &role,
+          "Role for --create-user and --get-users.",
+          "<role>" },
+        { "scanner-ca-pub", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_ca_pub,
+          "Scanner CA Certificate path for --[create|modify]-scanner.",
+          "<scanner-ca-pub>" },
+        { "scanner-host", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_host,
+          "Scanner host for --create-scanner and --modify-scanner."
+          " Default is " OPENVASSD_ADDRESS ".",
+          "<scanner-host>" },
+        { "scanner-key-priv", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_key_priv,
+          "Scanner private key path for --[create|modify]-scanner.",
+          "<scanner-key-private>" },
+        { "scanner-key-pub", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_key_pub,
+          "Scanner Certificate path for --[create|modify]-scanner.",
+          "<scanner-key-public>" },
+        { "scanner-name", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_name,
+          "Name for --modify-scanner.",
+          "<name>" },
+        { "scanner-port", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_port,
+          "Scanner port for --create-scanner and --modify-scanner."
+          " Default is " G_STRINGIFY (OPENVASSD_PORT) ".",
+          "<scanner-port>" },
+        { "scanner-type", '\0', 0, G_OPTION_ARG_STRING,
+          &scanner_type,
+          "Scanner type for --create-scanner and --modify-scanner."
+          " Either 'OpenVAS' or 'OSP'.",
+          "<scanner-type>" },
+        { "schedule-timeout", '\0', 0, G_OPTION_ARG_INT,
+          &schedule_timeout,
+          "Time out tasks that are more than <time> minutes overdue."
+          " -1 to disable, 0 for minimum time, default: "
+          G_STRINGIFY (SCHEDULE_TIMEOUT_DEFAULT),
+          "<time>" },
+        { "secinfo-commit-size", '\0', 0, G_OPTION_ARG_INT,
+          &secinfo_commit_size,
+          "During CERT and SCAP sync, commit updates to the database every"
+          " <number> items, 0 for unlimited, default: "
+          G_STRINGIFY (SECINFO_COMMIT_SIZE_DEFAULT), "<number>" },
+        { "slave-commit-size", '\0', 0, G_OPTION_ARG_INT,
+          &slave_commit_size,
+          "During slave updates, commit after every <number> updated results"
+          " and hosts, 0 for unlimited",
+          "<number>"},
+        { "unix-socket", 'c', 0, G_OPTION_ARG_STRING,
+          &manager_address_string_unix,
+          "Listen on UNIX socket at <filename>.",
+          "<filename>" },
+        { "user", '\0', 0, G_OPTION_ARG_STRING,
+          &user,
+          "User for --new-password.",
+          "<username>" },
+        { "value", '\0', 0, G_OPTION_ARG_STRING,
+          &value,
+          "Value for --modify-setting.",
+          "<value>" },
+        { "verbose", 'v', 0, G_OPTION_ARG_NONE,
+          &verbose,
+          "Has no effect.  See INSTALL.md for logging config.",
+          NULL },
+        { "verify-scanner", '\0', 0, G_OPTION_ARG_STRING,
+          &verify_scanner,
+          "Verify scanner <scanner-uuid> and exit.",
+          "<scanner-uuid>" },
+        { "version", '\0', 0, G_OPTION_ARG_NONE,
+          &print_version,
+          "Print version and exit.",
+          NULL },
         { NULL }
       };
 

From f878c391ec0fcbdbb6200a23d3a52bdb3ac6ad97 Mon Sep 17 00:00:00 2001
From: Timo Pollmeier <timo.pollmeier@greenbone.net>
Date: Tue, 28 May 2019 11:16:32 +0200
Subject: [PATCH 2/2] Update command line options in gvmd man page

This adds missing command line options to the man page and HTML help for
gvmd and sorts all the options alphabetically.
---
 doc/gvmd.8     | 180 ++++++++++++++++++-------
 doc/gvmd.8.xml | 358 +++++++++++++++++++++++++++++++++++++------------
 doc/gvmd.html  | 358 +++++++++++++++++++++++++++++++++++++------------
 3 files changed, 671 insertions(+), 225 deletions(-)

diff --git a/doc/gvmd.8 b/doc/gvmd.8
index 38a6cb1d1..c963b74af 100644
--- a/doc/gvmd.8
+++ b/doc/gvmd.8
@@ -10,84 +10,170 @@ The Greenbone Vulnerability Manager is the central management service between se
 It manages the storage of any vulnerability management configurations and of the scan results. Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP). The primary scanner 'OpenVAS Scanner' is controlled directly via protocol OTP while any other remote scanner is coupled with the Open Scanner Protocol (OSP). 
 .SH OPTIONS
 .TP
-\fB-a, --listen=\fIADDRESS\fB\f1
-Listen on ADDRESS.
+\fB--backup\f1
+Backup the database.
+.TP
+\fB--check-alerts\f1
+Check SecInfo alerts.
+.TP
+\fB--client-watch-interval=\fINUMBER\fB\f1
+Check if client connection was closed every NUMBER seconds. 0 to disable. Defaults to 1 second.
+.TP
+\fB--create-scanner=\fISCANNER\fB\f1
+Create global scanner SCANNER and exit.
 .TP
 \fB--create-user=\fIUSERNAME\fB\f1
 Create admin user USERNAME and exit.
 .TP
-\fB--role=\fIROLE\fB\f1
-Role for --create-user option.
+\fB-d, --database=\fIFILE/NAME\fB\f1
+Use FILE/NAME as database for SQLite/Postgres.
+.TP
+\fB--delete-scanner=\fISCANNER-UUID\fB\f1
+Delete scanner SCANNER-UUID and exit.
 .TP
 \fB--delete-user=\fIUSERNAME\fB\f1
 Delete user USERNAME and exit.
 .TP
+\fB--dh-params=\fIFILE\fB\f1
+Diffie-Hellman parameters file
+.TP
+\fB--disable-cmds=\fICOMMANDS\fB\f1
+Disable comma-separated COMMANDS.
+.TP
+\fB--disable-encrypted-credentials\f1
+Do not encrypt or decrypt credentials.
+.TP
+\fB--disable-password-policy\f1
+Do not restrict passwords to the policy.
+.TP
+\fB--disable-scheduling\f1
+Disable task scheduling.
+.TP
+\fB--encrypt-all-credentials\f1
+(Re-)Encrypt all credentials.
+.TP
+\fB-f, --foreground\f1
+Run in foreground.
+.TP
+\fB--get-scanners\f1
+List scanners and exit.
+.TP
 \fB--get-users\f1
 List users and exit.
 .TP
-\fB--create-scanner=\fINAME\fB\f1
-Create scanner NAME and exit.
+\fB--gnutls-priorities=\fIPRIORITIES-STRING\fB\f1
+Sets the GnuTLS priorities for the Manager socket.
 .TP
-\fB--scanner-host=\fIHOST\fB\f1
-Scanner host for --create-scanner, --rebuild and --update. Default is 127.0.0.1.
+\fB--inheritor=\fIUSERNAME\fB\f1
+Have USERNAME inherit from deleted user.
 .TP
-\fB--scanner-port=\fIPORT\fB\f1
-Scanner port for --create-scanner, --rebuild and --update. Default is 9391.
+\fB-a, --listen=\fIADDRESS\fB\f1
+Listen on ADDRESS.
 .TP
-\fB--scanner-type=\fITYPE\fB\f1
-Type for --create-scanner option. Could be "OpenVAS Scanner" or "OSP Ovaldi".
+\fB--listen2=\fIADDRESS\fB\f1
+Listen also on ADDRESS.
 .TP
-\fB--scanner-ca-pub=\fICAPUB\fB\f1
-Scanner CA public key path for --create-scanner.
+\fB--listen-group=\fISTRING\fB\f1
+Group of the unix socket
 .TP
-\fB--scanner-key-pub=\fIKEYPUB\fB\f1
-Scanner public key path for --create-scanner.
+\fB--listen-mode=\fISTRING\fB\f1
+File mode of the unix socket
 .TP
-\fB--scanner-key-priv=\fIKEYPRIV\fB\f1
-Scanner private key path for --create-scanner.
+\fB--listen-owner=\fISTRING\fB\f1
+Owner of the unix socket
 .TP
-\fB--delete-scanner=\fIUUID\fB\f1
-Delete scanner with UUID and exit.
+\fB--max-email-attachment-size=\fINUMBER\fB\f1
+Maximum size of alert email attachments, in bytes.
 .TP
-\fB--get-scanners\f1
-List scanners and exit.
+\fB--max-email-include-size=\fINUMBER\fB\f1
+Maximum size of inlined content in alert emails, in bytes.
 .TP
-\fB--gnutls-priorities=\fIPRIORITY\fB\f1
-Set the GnuTLS priority string to PRIORITY.
+\fB--max-email-message-size=\fINUMBER\fB\f1
+Maximum size of user-defined message text in alert emails, in bytes.
 .TP
-\fB--dh-params=\fIFILE\fB\f1
-Path to file containing Diffie-Hellman parameters which are needed for DHE-RSA. This file could be generated using openssl or certtool.
+\fB--max-ips-per-target=\fINUMBER\fB\f1
+Maximum number of IPs per target.
 .TP
-\fB--max-email-attachment-size=\fISIZE\fB\f1
-Maximum number of bytes permitted in alert email attachments. 
-
-0 to use the default, negative to allow any size. 
+\fB-m, --migrate\f1
+Migrate the database and exit.
 .TP
-\fB--max-email-include-size=\fISIZE\fB\f1
-Maximum number of bytes permitted in reports inlined in alert email attachments. 
-
-0 to use the default, negative to allow any size. 
+\fB--modify-scanner=\fISCANNER-UUID\fB\f1
+Modify scanner SCANNER-UUID and exit.
+.TP
+\fB--modify-setting=\fIUUID\fB\f1
+Modify setting UUID and exit.
+.TP
+\fB--new-password=\fIPASSWORD\fB\f1
+Modify user's password and exit.
+.TP
+\fB--new-password=\fIPASSWORD\fB\f1
+Modify user's password and exit.
+.TP
+\fB--optimize=\fINAME\fB\f1
+Run an optimization: vacuum, analyze, cleanup-config-prefs, cleanup-port-names, cleanup-result-severities, cleanup-schedule-times, rebuild-report-cache or update-report-cache.
 .TP
-\fB--max-ips-per-target=\fISIZE\fB\f1
-Maximum number of IPs per target. 
+\fB--osp-vt-update=\fISCANNER-SOCKET\fB\f1
+Unix socket for OSP NVT update. Default is to do an OTP update.
 .TP
-\fB-u, --update\f1
-Updates the database with information from a running scanner (openvassd) and exits.
+\fB--password=\fIPASSWORD\fB\f1
+Password, for --create-user.
 .TP
 \fB-p, --port=\fINUMBER\fB\f1
-Listen on port number \fINUMBER\f1.
+Use port number NUMBER.
 .TP
-\fB--rebuild\f1
-Rebuild the database with information from a running scanner (openvassd) and exits.
+\fB--port2=\fINUMBER\fB\f1
+Use port number NUMBER for address 2.
 .TP
-\fB--version\f1
-Print version.
+\fB--role=\fIROLE\fB\f1
+Role for --create-user and --get-users.
+.TP
+\fB--scanner-ca-pub=\fISCANNER-CA-PUB\fB\f1
+Scanner CA Certificate path for --[create|modify]-scanner.
+.TP
+\fB--scanner-host=\fISCANNER-HOST\fB\f1
+Scanner host for --create-scanner and --modify-scanner.
+.TP
+\fB--scanner-key-priv=\fISCANNER-KEY-PRIVATE\fB\f1
+Scanner private key path for --[create|modify]-scanner.
+.TP
+\fB--scanner-key-pub=\fISCANNER-KEY-PUBLIC\fB\f1
+Scanner Certificate path for --[create|modify]-scanner.
 .TP
-\fB-v, --verbose\f1
-Print progress messages.
+\fB--scanner-name=\fINAME\fB\f1
+Name for --modify-scanner.
 .TP
-\fB-?, --help\f1
-Show help.
+\fB--scanner-port=\fISCANNER-PORT\fB\f1
+Scanner port for --create-scanner and --modify-scanner.
+.TP
+\fB--scanner-type=\fISCANNER-TYPE\fB\f1
+Scanner type for --create-scanner and --modify-scanner.
+.TP
+\fB--schedule-timeout=\fITIME\fB\f1
+Time out tasks that are more than TIME minutes overdue. -1 to disable, 0 for minimum time.
+.TP
+\fB--secinfo-commit-size=\fINUMBER\fB\f1
+During CERT and SCAP sync, commit updates to the database every NUMBER items, 0 for unlimited.
+.TP
+\fB--slave-commit-size=\fINUMBER\fB\f1
+During slave updates, commit after every NUMBER updated results and hosts, 0 for unlimited.
+.TP
+\fB-c, --unix-socket=\fIFILENAME\fB\f1
+Listen on UNIX socket at FILENAME.
+.TP
+\fB--user=\fIUSERNAME\fB\f1
+User for --new-password.
+.TP
+\fB--value=\fIVALUE\fB\f1
+User for --new-password.
+.TP
+\fB--verbose\f1
+Has no effect. See INSTALL.md for logging config.
+.TP
+\fB--verify-scanner=\fISCANNER-UUID\fB\f1
+Verify scanner SCANNER-UUID and exit.
+.TP
+\fB--version\f1
+Print version and exit.
 .SH SIGNALS
 SIGHUP causes gvmd to rebuild the database with information from the Scanner (openvassd).
 .SH EXAMPLES
diff --git a/doc/gvmd.8.xml b/doc/gvmd.8.xml
index f01cbe0a4..43d3b1602 100644
--- a/doc/gvmd.8.xml
+++ b/doc/gvmd.8.xml
@@ -48,162 +48,342 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
   <options>
     <option>
-      <p><opt>-a, --listen=<arg>ADDRESS</arg></opt></p>
-      <optdesc><p>Listen on ADDRESS.</p></optdesc>
+      <p><opt>--backup</opt></p>
+      <optdesc>
+        <p>Backup the database.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--check-alerts</opt></p>
+      <optdesc>
+        <p>Check SecInfo alerts.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--client-watch-interval=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>Check if client connection was closed every NUMBER seconds.
+           0 to disable. Defaults to 1 second.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--create-scanner=<arg>SCANNER</arg></opt></p>
+      <optdesc>
+        <p>Create global scanner SCANNER and exit.</p>
+      </optdesc>
     </option>
-
     <option>
       <p><opt>--create-user=<arg>USERNAME</arg></opt></p>
-      <optdesc><p>Create admin user USERNAME and exit.</p></optdesc>
+      <optdesc>
+        <p>Create admin user USERNAME and exit.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--role=<arg>ROLE</arg></opt></p>
-      <optdesc><p>Role for --create-user option.</p></optdesc>
+      <p><opt>-d, --database=<arg>FILE/NAME</arg></opt></p>
+      <optdesc>
+        <p>Use FILE/NAME as database for SQLite/Postgres.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--delete-scanner=<arg>SCANNER-UUID</arg></opt></p>
+      <optdesc>
+        <p>Delete scanner SCANNER-UUID and exit.</p>
+      </optdesc>
     </option>
-
     <option>
       <p><opt>--delete-user=<arg>USERNAME</arg></opt></p>
-      <optdesc><p>Delete user USERNAME and exit.</p></optdesc>
+      <optdesc>
+        <p>Delete user USERNAME and exit.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--dh-params=<arg>FILE</arg></opt></p>
+      <optdesc>
+        <p>Diffie-Hellman parameters file</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--disable-cmds=<arg>COMMANDS</arg></opt></p>
+      <optdesc>
+        <p>Disable comma-separated COMMANDS.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--disable-encrypted-credentials</opt></p>
+      <optdesc>
+        <p>Do not encrypt or decrypt credentials.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--disable-password-policy</opt></p>
+      <optdesc>
+        <p>Do not restrict passwords to the policy.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--disable-scheduling</opt></p>
+      <optdesc>
+        <p>Disable task scheduling.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--encrypt-all-credentials</opt></p>
+      <optdesc>
+        <p>(Re-)Encrypt all credentials.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>-f, --foreground</opt></p>
+      <optdesc>
+        <p>Run in foreground.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--get-scanners</opt></p>
+      <optdesc>
+        <p>List scanners and exit.</p>
+      </optdesc>
     </option>
-
     <option>
       <p><opt>--get-users</opt></p>
-      <optdesc><p>List users and exit.</p></optdesc>
+      <optdesc>
+        <p>List users and exit.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--create-scanner=<arg>NAME</arg></opt></p>
-      <optdesc><p>Create scanner NAME and exit.</p></optdesc>
+      <p><opt>--gnutls-priorities=<arg>PRIORITIES-STRING</arg></opt></p>
+      <optdesc>
+        <p>Sets the GnuTLS priorities for the Manager socket.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-host=<arg>HOST</arg></opt></p>
+      <p><opt>--inheritor=<arg>USERNAME</arg></opt></p>
       <optdesc>
-        <p>Scanner host for --create-scanner, --rebuild and --update. Default is 127.0.0.1.</p>
+        <p>Have USERNAME inherit from deleted user.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-port=<arg>PORT</arg></opt></p>
+      <p><opt>-a, --listen=<arg>ADDRESS</arg></opt></p>
       <optdesc>
-        <p>Scanner port for --create-scanner, --rebuild and --update. Default is 9391.</p>
+        <p>Listen on ADDRESS.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-type=<arg>TYPE</arg></opt></p>
-      <optdesc><p>Type for --create-scanner option.
-                  Could be "OpenVAS Scanner" or "OSP Ovaldi".</p></optdesc>
+      <p><opt>--listen2=<arg>ADDRESS</arg></opt></p>
+      <optdesc>
+        <p>Listen also on ADDRESS.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-ca-pub=<arg>CAPUB</arg></opt></p>
-      <optdesc><p>Scanner CA public key path for --create-scanner.</p></optdesc>
+      <p><opt>--listen-group=<arg>STRING</arg></opt></p>
+      <optdesc>
+        <p>Group of the unix socket</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-key-pub=<arg>KEYPUB</arg></opt></p>
-      <optdesc><p>Scanner public key path for --create-scanner.</p></optdesc>
+      <p><opt>--listen-mode=<arg>STRING</arg></opt></p>
+      <optdesc>
+        <p>File mode of the unix socket</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--scanner-key-priv=<arg>KEYPRIV</arg></opt></p>
-      <optdesc><p>Scanner private key path for --create-scanner.</p></optdesc>
+      <p><opt>--listen-owner=<arg>STRING</arg></opt></p>
+      <optdesc>
+        <p>Owner of the unix socket</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--delete-scanner=<arg>UUID</arg></opt></p>
-      <optdesc><p>Delete scanner with UUID and exit.</p></optdesc>
+      <p><opt>--max-email-attachment-size=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>Maximum size of alert email attachments, in bytes.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--get-scanners</opt></p>
-      <optdesc><p>List scanners and exit.</p></optdesc>
+      <p><opt>--max-email-include-size=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>Maximum size of inlined content in alert emails, in bytes.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--gnutls-priorities=<arg>PRIORITY</arg></opt></p>
-      <optdesc><p>Set the GnuTLS priority string to PRIORITY.</p></optdesc>
+      <p><opt>--max-email-message-size=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>Maximum size of user-defined message text in alert emails,
+           in bytes.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--dh-params=<arg>FILE</arg></opt></p>
-      <optdesc><p>Path to file containing Diffie-Hellman parameters which
-                  are needed for DHE-RSA. This file could be generated using
-                  openssl or certtool.</p></optdesc>
+      <p><opt>--max-ips-per-target=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>Maximum number of IPs per target.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>--max-email-attachment-size=<arg>SIZE</arg></opt></p>
+      <p><opt>-m, --migrate</opt></p>
       <optdesc>
-        <p>
-          Maximum number of bytes permitted in alert email attachments.
-        </p>
-        <p>
-          0 to use the default, negative to allow any size.
-        </p>
+        <p>Migrate the database and exit.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>--max-email-include-size=<arg>SIZE</arg></opt></p>
+      <p><opt>--modify-scanner=<arg>SCANNER-UUID</arg></opt></p>
       <optdesc>
-        <p>
-          Maximum number of bytes permitted in reports inlined in alert email
-          attachments.
-        </p>
-        <p>
-          0 to use the default, negative to allow any size.
-        </p>
+        <p>Modify scanner SCANNER-UUID and exit.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>--max-ips-per-target=<arg>SIZE</arg></opt></p>
+      <p><opt>--modify-setting=<arg>UUID</arg></opt></p>
       <optdesc>
-        <p>
-          Maximum number of IPs per target.
-        </p>
+        <p>Modify setting UUID and exit.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>-u, --update</opt></p>
+      <p><opt>--new-password=<arg>PASSWORD</arg></opt></p>
       <optdesc>
-        <p>Updates the database with information from a running
-           scanner (openvassd) and exits.</p>
+        <p>Modify user's password and exit.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--new-password=<arg>PASSWORD</arg></opt></p>
+      <optdesc>
+        <p>Modify user's password and exit.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--optimize=<arg>NAME</arg></opt></p>
+      <optdesc>
+        <p>Run an optimization: vacuum, analyze, cleanup-config-prefs,
+           cleanup-port-names, cleanup-result-severities,
+           cleanup-schedule-times, rebuild-report-cache or
+           update-report-cache.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--osp-vt-update=<arg>SCANNER-SOCKET</arg></opt></p>
+      <optdesc>
+        <p>Unix socket for OSP NVT update.  Default is to do an OTP update.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--password=<arg>PASSWORD</arg></opt></p>
+      <optdesc>
+        <p>Password, for --create-user.</p>
       </optdesc>
     </option>
-
     <option>
       <p><opt>-p, --port=<arg>NUMBER</arg></opt></p>
       <optdesc>
-        <p>Listen on port number <arg>NUMBER</arg>.</p>
+        <p>Use port number NUMBER.</p>
       </optdesc>
     </option>
-
-        <option>
-      <p><opt>--rebuild</opt></p>
+    <option>
+      <p><opt>--port2=<arg>NUMBER</arg></opt></p>
       <optdesc>
-        <p>Rebuild the database with information from a running
-           scanner (openvassd) and exits.</p>
+        <p>Use port number NUMBER for address 2.</p>
       </optdesc>
     </option>
-
     <option>
-      <p><opt>--version</opt></p>
-      <optdesc><p>Print version.</p></optdesc>
+      <p><opt>--role=<arg>ROLE</arg></opt></p>
+      <optdesc>
+        <p>Role for --create-user and --get-users.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>-v, --verbose</opt></p>
-      <optdesc><p>Print progress messages.</p></optdesc>
+      <p><opt>--scanner-ca-pub=<arg>SCANNER-CA-PUB</arg></opt></p>
+      <optdesc>
+        <p>Scanner CA Certificate path for --[create|modify]-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--scanner-host=<arg>SCANNER-HOST</arg></opt></p>
+      <optdesc>
+        <p>Scanner host for --create-scanner and --modify-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--scanner-key-priv=<arg>SCANNER-KEY-PRIVATE</arg></opt></p>
+      <optdesc>
+        <p>Scanner private key path for --[create|modify]-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--scanner-key-pub=<arg>SCANNER-KEY-PUBLIC</arg></opt></p>
+      <optdesc>
+        <p>Scanner Certificate path for --[create|modify]-scanner.</p>
+      </optdesc>
     </option>
-
     <option>
-      <p><opt>-?, --help</opt></p>
-      <optdesc><p>Show help.</p></optdesc>
+      <p><opt>--scanner-name=<arg>NAME</arg></opt></p>
+      <optdesc>
+        <p>Name for --modify-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--scanner-port=<arg>SCANNER-PORT</arg></opt></p>
+      <optdesc>
+        <p>Scanner port for --create-scanner and --modify-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--scanner-type=<arg>SCANNER-TYPE</arg></opt></p>
+      <optdesc>
+        <p>Scanner type for --create-scanner and --modify-scanner.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--schedule-timeout=<arg>TIME</arg></opt></p>
+      <optdesc>
+        <p>Time out tasks that are more than TIME minutes overdue.
+           -1 to disable, 0 for minimum time.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--secinfo-commit-size=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>During CERT and SCAP sync, commit updates to the database every
+           NUMBER items, 0 for unlimited.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--slave-commit-size=<arg>NUMBER</arg></opt></p>
+      <optdesc>
+        <p>During slave updates, commit after every NUMBER updated results and
+           hosts, 0 for unlimited.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>-c, --unix-socket=<arg>FILENAME</arg></opt></p>
+      <optdesc>
+        <p>Listen on UNIX socket at FILENAME.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--user=<arg>USERNAME</arg></opt></p>
+      <optdesc>
+        <p>User for --new-password.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--value=<arg>VALUE</arg></opt></p>
+      <optdesc>
+        <p>User for --new-password.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--verbose</opt></p>
+      <optdesc>
+        <p>Has no effect.  See INSTALL.md for logging config.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--verify-scanner=<arg>SCANNER-UUID</arg></opt></p>
+      <optdesc>
+        <p>Verify scanner SCANNER-UUID and exit.</p>
+      </optdesc>
+    </option>
+    <option>
+      <p><opt>--version</opt></p>
+      <optdesc>
+        <p>Print version and exit.</p>
+      </optdesc>
     </option>
   </options>
 
diff --git a/doc/gvmd.html b/doc/gvmd.html
index 88b9458cf..30fab8c99 100644
--- a/doc/gvmd.html
+++ b/doc/gvmd.html
@@ -31,162 +31,342 @@ <h2>Description</h2>
   <h2>Options</h2>
 
     
-      <p><b>-a, --listen=<em>ADDRESS</em></b></p>
-      <p>Listen on ADDRESS.</p>
+      <p><b>--backup</b></p>
+      
+        <p>Backup the database.</p>
+      
+    
+    
+      <p><b>--check-alerts</b></p>
+      
+        <p>Check SecInfo alerts.</p>
+      
+    
+    
+      <p><b>--client-watch-interval=<em>NUMBER</em></b></p>
+      
+        <p>Check if client connection was closed every NUMBER seconds.
+           0 to disable. Defaults to 1 second.</p>
+      
+    
+    
+      <p><b>--create-scanner=<em>SCANNER</em></b></p>
+      
+        <p>Create global scanner SCANNER and exit.</p>
+      
     
-
     
       <p><b>--create-user=<em>USERNAME</em></b></p>
-      <p>Create admin user USERNAME and exit.</p>
+      
+        <p>Create admin user USERNAME and exit.</p>
+      
     
-
     
-      <p><b>--role=<em>ROLE</em></b></p>
-      <p>Role for --create-user option.</p>
+      <p><b>-d, --database=<em>FILE/NAME</em></b></p>
+      
+        <p>Use FILE/NAME as database for SQLite/Postgres.</p>
+      
+    
+    
+      <p><b>--delete-scanner=<em>SCANNER-UUID</em></b></p>
+      
+        <p>Delete scanner SCANNER-UUID and exit.</p>
+      
     
-
     
       <p><b>--delete-user=<em>USERNAME</em></b></p>
-      <p>Delete user USERNAME and exit.</p>
+      
+        <p>Delete user USERNAME and exit.</p>
+      
+    
+    
+      <p><b>--dh-params=<em>FILE</em></b></p>
+      
+        <p>Diffie-Hellman parameters file</p>
+      
+    
+    
+      <p><b>--disable-cmds=<em>COMMANDS</em></b></p>
+      
+        <p>Disable comma-separated COMMANDS.</p>
+      
+    
+    
+      <p><b>--disable-encrypted-credentials</b></p>
+      
+        <p>Do not encrypt or decrypt credentials.</p>
+      
+    
+    
+      <p><b>--disable-password-policy</b></p>
+      
+        <p>Do not restrict passwords to the policy.</p>
+      
+    
+    
+      <p><b>--disable-scheduling</b></p>
+      
+        <p>Disable task scheduling.</p>
+      
+    
+    
+      <p><b>--encrypt-all-credentials</b></p>
+      
+        <p>(Re-)Encrypt all credentials.</p>
+      
+    
+    
+      <p><b>-f, --foreground</b></p>
+      
+        <p>Run in foreground.</p>
+      
+    
+    
+      <p><b>--get-scanners</b></p>
+      
+        <p>List scanners and exit.</p>
+      
     
-
     
       <p><b>--get-users</b></p>
-      <p>List users and exit.</p>
+      
+        <p>List users and exit.</p>
+      
     
-
     
-      <p><b>--create-scanner=<em>NAME</em></b></p>
-      <p>Create scanner NAME and exit.</p>
+      <p><b>--gnutls-priorities=<em>PRIORITIES-STRING</em></b></p>
+      
+        <p>Sets the GnuTLS priorities for the Manager socket.</p>
+      
     
-
     
-      <p><b>--scanner-host=<em>HOST</em></b></p>
+      <p><b>--inheritor=<em>USERNAME</em></b></p>
       
-        <p>Scanner host for --create-scanner, --rebuild and --update. Default is 127.0.0.1.</p>
+        <p>Have USERNAME inherit from deleted user.</p>
       
     
-
     
-      <p><b>--scanner-port=<em>PORT</em></b></p>
+      <p><b>-a, --listen=<em>ADDRESS</em></b></p>
       
-        <p>Scanner port for --create-scanner, --rebuild and --update. Default is 9391.</p>
+        <p>Listen on ADDRESS.</p>
       
     
-
     
-      <p><b>--scanner-type=<em>TYPE</em></b></p>
-      <p>Type for --create-scanner option.
-                  Could be &quot;OpenVAS Scanner&quot; or &quot;OSP Ovaldi&quot;.</p>
+      <p><b>--listen2=<em>ADDRESS</em></b></p>
+      
+        <p>Listen also on ADDRESS.</p>
+      
     
-
     
-      <p><b>--scanner-ca-pub=<em>CAPUB</em></b></p>
-      <p>Scanner CA public key path for --create-scanner.</p>
+      <p><b>--listen-group=<em>STRING</em></b></p>
+      
+        <p>Group of the unix socket</p>
+      
     
-
     
-      <p><b>--scanner-key-pub=<em>KEYPUB</em></b></p>
-      <p>Scanner public key path for --create-scanner.</p>
+      <p><b>--listen-mode=<em>STRING</em></b></p>
+      
+        <p>File mode of the unix socket</p>
+      
     
-
     
-      <p><b>--scanner-key-priv=<em>KEYPRIV</em></b></p>
-      <p>Scanner private key path for --create-scanner.</p>
+      <p><b>--listen-owner=<em>STRING</em></b></p>
+      
+        <p>Owner of the unix socket</p>
+      
     
-
     
-      <p><b>--delete-scanner=<em>UUID</em></b></p>
-      <p>Delete scanner with UUID and exit.</p>
+      <p><b>--max-email-attachment-size=<em>NUMBER</em></b></p>
+      
+        <p>Maximum size of alert email attachments, in bytes.</p>
+      
     
-
     
-      <p><b>--get-scanners</b></p>
-      <p>List scanners and exit.</p>
+      <p><b>--max-email-include-size=<em>NUMBER</em></b></p>
+      
+        <p>Maximum size of inlined content in alert emails, in bytes.</p>
+      
     
-
     
-      <p><b>--gnutls-priorities=<em>PRIORITY</em></b></p>
-      <p>Set the GnuTLS priority string to PRIORITY.</p>
+      <p><b>--max-email-message-size=<em>NUMBER</em></b></p>
+      
+        <p>Maximum size of user-defined message text in alert emails,
+           in bytes.</p>
+      
     
-
     
-      <p><b>--dh-params=<em>FILE</em></b></p>
-      <p>Path to file containing Diffie-Hellman parameters which
-                  are needed for DHE-RSA. This file could be generated using
-                  openssl or certtool.</p>
+      <p><b>--max-ips-per-target=<em>NUMBER</em></b></p>
+      
+        <p>Maximum number of IPs per target.</p>
+      
     
-
     
-      <p><b>--max-email-attachment-size=<em>SIZE</em></b></p>
+      <p><b>-m, --migrate</b></p>
       
-        <p>
-          Maximum number of bytes permitted in alert email attachments.
-        </p>
-        <p>
-          0 to use the default, negative to allow any size.
-        </p>
+        <p>Migrate the database and exit.</p>
       
     
-
     
-      <p><b>--max-email-include-size=<em>SIZE</em></b></p>
+      <p><b>--modify-scanner=<em>SCANNER-UUID</em></b></p>
       
-        <p>
-          Maximum number of bytes permitted in reports inlined in alert email
-          attachments.
-        </p>
-        <p>
-          0 to use the default, negative to allow any size.
-        </p>
+        <p>Modify scanner SCANNER-UUID and exit.</p>
       
     
-
     
-      <p><b>--max-ips-per-target=<em>SIZE</em></b></p>
+      <p><b>--modify-setting=<em>UUID</em></b></p>
       
-        <p>
-          Maximum number of IPs per target.
-        </p>
+        <p>Modify setting UUID and exit.</p>
       
     
-
     
-      <p><b>-u, --update</b></p>
+      <p><b>--new-password=<em>PASSWORD</em></b></p>
       
-        <p>Updates the database with information from a running
-           scanner (openvassd) and exits.</p>
+        <p>Modify user's password and exit.</p>
+      
+    
+    
+      <p><b>--new-password=<em>PASSWORD</em></b></p>
+      
+        <p>Modify user's password and exit.</p>
+      
+    
+    
+      <p><b>--optimize=<em>NAME</em></b></p>
+      
+        <p>Run an optimization: vacuum, analyze, cleanup-config-prefs,
+           cleanup-port-names, cleanup-result-severities,
+           cleanup-schedule-times, rebuild-report-cache or
+           update-report-cache.</p>
+      
+    
+    
+      <p><b>--osp-vt-update=<em>SCANNER-SOCKET</em></b></p>
+      
+        <p>Unix socket for OSP NVT update.  Default is to do an OTP update.</p>
+      
+    
+    
+      <p><b>--password=<em>PASSWORD</em></b></p>
+      
+        <p>Password, for --create-user.</p>
       
     
-
     
       <p><b>-p, --port=<em>NUMBER</em></b></p>
       
-        <p>Listen on port number <em>NUMBER</em>.</p>
+        <p>Use port number NUMBER.</p>
       
     
-
-        
-      <p><b>--rebuild</b></p>
+    
+      <p><b>--port2=<em>NUMBER</em></b></p>
       
-        <p>Rebuild the database with information from a running
-           scanner (openvassd) and exits.</p>
+        <p>Use port number NUMBER for address 2.</p>
       
     
-
     
-      <p><b>--version</b></p>
-      <p>Print version.</p>
+      <p><b>--role=<em>ROLE</em></b></p>
+      
+        <p>Role for --create-user and --get-users.</p>
+      
     
-
     
-      <p><b>-v, --verbose</b></p>
-      <p>Print progress messages.</p>
+      <p><b>--scanner-ca-pub=<em>SCANNER-CA-PUB</em></b></p>
+      
+        <p>Scanner CA Certificate path for --[create|modify]-scanner.</p>
+      
+    
+    
+      <p><b>--scanner-host=<em>SCANNER-HOST</em></b></p>
+      
+        <p>Scanner host for --create-scanner and --modify-scanner.</p>
+      
+    
+    
+      <p><b>--scanner-key-priv=<em>SCANNER-KEY-PRIVATE</em></b></p>
+      
+        <p>Scanner private key path for --[create|modify]-scanner.</p>
+      
+    
+    
+      <p><b>--scanner-key-pub=<em>SCANNER-KEY-PUBLIC</em></b></p>
+      
+        <p>Scanner Certificate path for --[create|modify]-scanner.</p>
+      
     
-
     
-      <p><b>-?, --help</b></p>
-      <p>Show help.</p>
+      <p><b>--scanner-name=<em>NAME</em></b></p>
+      
+        <p>Name for --modify-scanner.</p>
+      
+    
+    
+      <p><b>--scanner-port=<em>SCANNER-PORT</em></b></p>
+      
+        <p>Scanner port for --create-scanner and --modify-scanner.</p>
+      
+    
+    
+      <p><b>--scanner-type=<em>SCANNER-TYPE</em></b></p>
+      
+        <p>Scanner type for --create-scanner and --modify-scanner.</p>
+      
+    
+    
+      <p><b>--schedule-timeout=<em>TIME</em></b></p>
+      
+        <p>Time out tasks that are more than TIME minutes overdue.
+           -1 to disable, 0 for minimum time.</p>
+      
+    
+    
+      <p><b>--secinfo-commit-size=<em>NUMBER</em></b></p>
+      
+        <p>During CERT and SCAP sync, commit updates to the database every
+           NUMBER items, 0 for unlimited.</p>
+      
+    
+    
+      <p><b>--slave-commit-size=<em>NUMBER</em></b></p>
+      
+        <p>During slave updates, commit after every NUMBER updated results and
+           hosts, 0 for unlimited.</p>
+      
+    
+    
+      <p><b>-c, --unix-socket=<em>FILENAME</em></b></p>
+      
+        <p>Listen on UNIX socket at FILENAME.</p>
+      
+    
+    
+      <p><b>--user=<em>USERNAME</em></b></p>
+      
+        <p>User for --new-password.</p>
+      
+    
+    
+      <p><b>--value=<em>VALUE</em></b></p>
+      
+        <p>User for --new-password.</p>
+      
+    
+    
+      <p><b>--verbose</b></p>
+      
+        <p>Has no effect.  See INSTALL.md for logging config.</p>
+      
+    
+    
+      <p><b>--verify-scanner=<em>SCANNER-UUID</em></b></p>
+      
+        <p>Verify scanner SCANNER-UUID and exit.</p>
+      
+    
+    
+      <p><b>--version</b></p>
+      
+        <p>Print version and exit.</p>
+