summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-17 05:40:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:09 -0500
commit1ce5642baefd0d62db2b60ad36c5924f58e74bb1 (patch)
tree2835864cef9988582133430a1065fc27fec8b7a8
parentd1bfe56048e6dca7057b8687262714156e230af0 (diff)
downloadsamba-1ce5642baefd0d62db2b60ad36c5924f58e74bb1.tar.gz
samba-1ce5642baefd0d62db2b60ad36c5924f58e74bb1.tar.bz2
samba-1ce5642baefd0d62db2b60ad36c5924f58e74bb1.zip
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)
-rw-r--r--source4/lib/cmdline/popt_credentials.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index b53392e302..e4931cd1ce 100644
--- 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" },