summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-22 01:35:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:10 -0500
commit455be8fb8271bd97058390dca5a76db81ea2928b (patch)
tree7e4f4856e5d43f07cb2a216a8ed0fc988649d1a6 /source4/lib
parentb7676c4b48f2d39446b853bc87c0b288ac368e36 (diff)
downloadsamba-455be8fb8271bd97058390dca5a76db81ea2928b.tar.gz
samba-455be8fb8271bd97058390dca5a76db81ea2928b.tar.bz2
samba-455be8fb8271bd97058390dca5a76db81ea2928b.zip
r5932: Use cli_credentials somewhat more in the Gtk+ code
Support ncacn_spx in DCE/RPC bindings. (This used to be commit a0233a3a9a83176ae46873d3a25ed601758a1511)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/cmdline/popt_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index b0b5073e62..c65c311af1 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -255,7 +255,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, popt_common_credentials_callback },
- { "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "USERNAME" },
+ { "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" },
{ "kerberos", 'k', POPT_ARG_NONE, NULL, 'k', "Use kerberos (active directory) authentication" },
{ "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },