From 6ea120ada628f48a75678fbfa95b31770f4c1a2a Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Mon, 2 Dec 2013 13:13:51 +0100 Subject: [PATCH] issue #695: arangosh server.password error Documentation is fixed --- CHANGELOG | 2 ++ Documentation/UserManual/Arangosh.md | 6 +++--- Documentation/UserManual/FoxxManager.md | 10 +++++----- Documentation/man1/arangob | 4 +++- Documentation/man1/arangodump | 4 +++- Documentation/man1/arangoimp | 4 +++- Documentation/man1/arangorestore | 4 +++- Documentation/man1/arangosh | 6 +++--- Documentation/man8/arangod | 2 +- Documentation/man8/foxx-manager | 6 +++++- arangosh/ArangoShell/ArangoClient.cpp | 4 ++-- 11 files changed, 33 insertions(+), 19 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b3976af8e2..c764d6a148 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ v1.5.x (XXXX-XX-XX) ------------------- +* fixed issue #695: arangosh server.password error + * use pretty-printing in `--console` mode by defaul * added `check-server` binary for testing diff --git a/Documentation/UserManual/Arangosh.md b/Documentation/UserManual/Arangosh.md index e58f47df92..594d127c9e 100644 --- a/Documentation/UserManual/Arangosh.md +++ b/Documentation/UserManual/Arangosh.md @@ -22,9 +22,9 @@ command-line options: - `--server.database `: name of the database to connect to - `--server.endpoint `: endpoint to connect to -- `--server.username `: username -- `--server.password `: password to use (omit this and you'll be prompted for the - password) +- `--server.username `: database username +- `--server.password `: password to use when connecting +- `--server.disable-authentication `: disable password prompt and authentication For example, to connect to an ArangoDB server on IP `192.168.173.13` on port 8530 with the user `foo` and using the database `test`, use diff --git a/Documentation/UserManual/FoxxManager.md b/Documentation/UserManual/FoxxManager.md index 374131cc58..fcc03c6053 100644 --- a/Documentation/UserManual/FoxxManager.md +++ b/Documentation/UserManual/FoxxManager.md @@ -370,11 +370,11 @@ use the options of `arangosh`. To retrieve a list of the options for `arangosh`, To most relevant `arangosh` options to pass to the `foxx-manager` will be: - --server.database database name to use when connecting (default: "_system") - --server.disable-authentication disable authentication (will disable password prompt) (default: false) - --server.endpoint endpoint to connect to, use 'none' to start without a server (default: "tcp://127.0.0.1:8529") - --server.password password to use when connecting (leave empty for prompt) - --server.username username to use when connecting (default: "root") + --server.database database name to use when connecting + --server.disable-authentication disable the password prompt and authentication when connecting to the server + --server.endpoint endpoint to connect to, use 'none' to start without a server + --server.password password to use when connecting + --server.username username to use when connecting These options allow you to use the foxx-manager with a different database or with another than the default user. diff --git a/Documentation/man1/arangob b/Documentation/man1/arangob index bfd78fe491..0adb54f14b 100644 --- a/Documentation/man1/arangob +++ b/Documentation/man1/arangob @@ -36,7 +36,9 @@ database name to use when connection (default: "_system") ENDOPTION OPTION "--server.username " username to use when connecting (default "root") ENDOPTION OPTION "--server.password " -password to use when connecting. Leave empty for a password prompt ENDOPTION +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION +OPTION "--server.disable-authentication " +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES EXAMPLE COMMAND starts COMMAND with the default user and server endpoint ENDEXAMPLE diff --git a/Documentation/man1/arangodump b/Documentation/man1/arangodump index bfa6df96c2..21c78ad99a 100644 --- a/Documentation/man1/arangodump +++ b/Documentation/man1/arangodump @@ -51,6 +51,8 @@ database name to use when connection (default: "_system") ENDOPTION OPTION "--server.username " username to use when connecting (default "root") ENDOPTION OPTION "--server.password " -password to use when connecting. Leave empty for a password prompt ENDOPTION +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION +OPTION "--server.disable-authentication " +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES AUTHOR diff --git a/Documentation/man1/arangoimp b/Documentation/man1/arangoimp index c7b438d702..3dac9c72ed 100644 --- a/Documentation/man1/arangoimp +++ b/Documentation/man1/arangoimp @@ -36,6 +36,8 @@ database name to use when connection (default: "_system") ENDOPTION OPTION "--server.username " username to use when connecting (default "root") ENDOPTION OPTION "--server.password " -password to use when connecting. Leave empty for a password prompt ENDOPTION +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION +OPTION "--server.disable-authentication " +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES AUTHOR diff --git a/Documentation/man1/arangorestore b/Documentation/man1/arangorestore index 963216aff1..cae89c2a53 100644 --- a/Documentation/man1/arangorestore +++ b/Documentation/man1/arangorestore @@ -42,6 +42,8 @@ database name to use when connection (default: "_system") ENDOPTION OPTION "--server.username " username to use when connecting (default "root") ENDOPTION OPTION "--server.password " -password to use when connecting. Leave empty for a password prompt ENDOPTION +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION +OPTION "--server.disable-authentication " +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES AUTHOR diff --git a/Documentation/man1/arangosh b/Documentation/man1/arangosh index dd2c7f6c5c..7b766253a1 100644 --- a/Documentation/man1/arangosh +++ b/Documentation/man1/arangosh @@ -26,14 +26,14 @@ database name to use when connection (default: "_system") ENDOPTION OPTION "--server.username " username to use when connecting (default "root") ENDOPTION OPTION "--server.password " -password to use when connecting. Leave empty for a password prompt ENDOPTION +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION OPTION "--server.disable-authentication " -turn off autpassword to use when connecting. Leave empty for a password prompt ENDOPTION +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES EXAMPLE COMMAND starts COMMAND with the default user and server endpoint ENDEXAMPLE EXAMPLE COMMAND --server.username fuchsia -starts COMMAND with a specific user. Password prompt will follow ENDEXAMPLE +starts COMMAND with a specific user. Password prompt will follow if --server.disable-authentication is true. ENDEXAMPLE EXAMPLE COMMAND --server.username fuchsia --server.password "abcd@34" starts COMMAND with a specific user and password given on command line ENDEXAMPLE EXAMPLE COMMAND --server.endpoint tcp://192.168.173.13:8529 diff --git a/Documentation/man8/arangod b/Documentation/man8/arangod index 6dd0f45fc4..f9c8630844 100644 --- a/Documentation/man8/arangod +++ b/Documentation/man8/arangod @@ -31,7 +31,7 @@ set the log level (possible values: "fatal", "error", "warning", "info", "debug" OPTION "--server.endpoint " listen endpoint for client requests, consisting of protocol, ip address and port ENDOPTION OPTION "--server.disable-authentication " -disable the password prompt when connecting to the server ENDOPTION +disable authentication for all clients ENDOPTION OPTION "--database.directory " path to the database directory ENDOPTION EXAMPLES diff --git a/Documentation/man8/foxx-manager b/Documentation/man8/foxx-manager index 60bed41d30..ad0463f22e 100644 --- a/Documentation/man8/foxx-manager +++ b/Documentation/man8/foxx-manager @@ -11,8 +11,12 @@ More specific instructions are displayed when the program is invoked. OPTIONS OPTION "--server.database " database name to use when connection (default: "_system") ENDOPTION +OPTION "--server.username " +username to use when connecting (default "root") ENDOPTION +OPTION "--server.password " +password to use when connecting. Don't specify this option to get a password prompt ENDOPTION OPTION "--server.disable-authentication " -disable the password prompt when connecting to the server ENDOPTION +disable the password prompt and authentication when connecting to the server ENDOPTION EXAMPLES EXAMPLE COMMAND search "foobar" searches the central repository for an application "foobar"ENDEXAMPLE diff --git a/arangosh/ArangoShell/ArangoClient.cpp b/arangosh/ArangoShell/ArangoClient.cpp index e90192fe53..9fe8a7832f 100644 --- a/arangosh/ArangoShell/ArangoClient.cpp +++ b/arangosh/ArangoShell/ArangoClient.cpp @@ -235,10 +235,10 @@ void ArangoClient::setupServer (ProgramOptionsDescription& description) { clientOptions ("server.database", &_databaseName, "database name to use when connecting") - ("server.disable-authentication", &_disableAuthentication, "disable authentication (will disable password prompt)") + ("server.disable-authentication", &_disableAuthentication, "disable the password prompt and authentication when connecting") ("server.endpoint", &_endpointString, "endpoint to connect to, use 'none' to start without a server") ("server.username", &_username, "username to use when connecting") - ("server.password", &_password, "password to use when connecting (leave empty for prompt)") + ("server.password", &_password, "password to use when connecting. Don't specify this option to get a password prompt") ("server.connect-timeout", &_connectTimeout, "connect timeout in seconds") ("server.request-timeout", &_requestTimeout, "request timeout in seconds") ;