summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-07-02 03:04:15 +0000
committerTim Potter <tpot@samba.org>2003-07-02 03:04:15 +0000
commit1e07f860a469c6811abaa91911b319acc6a81877 (patch)
tree53f2cab8c74279261402f8e390bd05d00c763c4f
parent2d8fef88e84a819bee0586b64198abd443ff6057 (diff)
downloadsamba-1e07f860a469c6811abaa91911b319acc6a81877.tar.gz
samba-1e07f860a469c6811abaa91911b319acc6a81877.tar.bz2
samba-1e07f860a469c6811abaa91911b319acc6a81877.zip
Fix poptOption definition for --no-pass and --kerberos options. The 'value'
field for an option should be set to an identifier to use in a switch statement or zero if the the arg field is to be updated only. This fixes smbclient -k always prompting for a password which we don't need. (This used to be commit 0744e2dad372904a554019146ff6f6e31ca1b2d2)
-rw-r--r--source3/lib/popt_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 6920ef4d5f..b8e77b2d9e 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -335,8 +335,8 @@ static void popt_common_credentials_callback(poptContext con,
struct poptOption popt_common_credentials[] = {
{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE, popt_common_credentials_callback },
{ "user", 'U', POPT_ARG_STRING, NULL, 'U', "Set the network username", "USERNAME" },
- { "no-pass", 'N', POPT_ARG_NONE, &cmdline_auth_info.got_pass, True, "Don't ask for a password" },
- { "kerberos", 'k', POPT_ARG_NONE, &cmdline_auth_info.use_kerberos, True, "Use kerberos (active directory) authentication" },
+ { "no-pass", 'N', POPT_ARG_NONE, &cmdline_auth_info.got_pass, 0, "Don't ask for a password" },
+ { "kerberos", 'k', POPT_ARG_NONE, &cmdline_auth_info.use_kerberos, 'k', "Use kerberos (active directory) authentication" },
{ "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" },
POPT_TABLEEND
};