r23912: We always accept / as a seperator, and it is far less confusing

compared with a shell-escape (\).

Fixes bug #4765

Andrew Bartlett
(This used to be commit 417e0ef87fdf8ea69c66089485bd4e0f7b4ca495)

diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index b53392e3024d7d1fedbddfc0d44a380621c903f1..e4931cd1ce618d1e25db1a5db248fcbfa93b8a9d 100644 (file)
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -131,7 +131,7 @@ static void popt_common_credentials_callback(poptContext con,
 
 struct poptOption popt_common_credentials[] = {
        { NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void *)popt_common_credentials_callback },
-       { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN\\]USERNAME[%PASSWORD]" },
+       { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "[DOMAIN/]USERNAME[%PASSWORD]" },
        { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, True, "Don't ask for a password" },
        { "password", 0, POPT_ARG_STRING, NULL, OPT_PASSWORD, "Password" },
        { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },