diff options
| author | Andreas Schneider <asn@samba.org> | 2014-11-14 09:31:51 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-12-08 10:16:13 +0100 |
| commit | 8ca520e6b4fba0365e31df6c6b3c28ec66feb3e7 (patch) | |
| tree | 0bd3434da103113e2822ec103afa9616532722a5 | |
| parent | 6e030c2c21f605e4364af05afa08dabd8001fdfd (diff) | |
| download | samba-8ca520e6b4fba0365e31df6c6b3c28ec66feb3e7.tar.gz | |
s3-lib: Do not require a password with --use-ccache.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10279
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit 1e148a91fd20053f823b57e19d757665fa30c53d)
| -rw-r--r-- | source3/lib/util_cmdline.c | 3 | ||||
| -rwxr-xr-x | source3/script/tests/test_smbclient_s3.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c index d15f32535bf..80c3ecdb462 100644 --- a/source3/lib/util_cmdline.c +++ b/source3/lib/util_cmdline.c @@ -251,7 +251,8 @@ void set_cmdline_auth_info_getpass(struct user_auth_info *auth_info) TALLOC_CTX *frame; if (get_cmdline_auth_info_got_pass(auth_info) || - get_cmdline_auth_info_use_kerberos(auth_info)) { + get_cmdline_auth_info_use_ccache(auth_info) || + get_cmdline_auth_info_use_kerberos(auth_info)) { /* Already got one... */ return; } diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index 596cd425ff9..f73643f4480 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -602,7 +602,7 @@ test_ccache_access() return fi - $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}%" \ + $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}" \ -c quit 2>&1 ret=$? @@ -621,7 +621,7 @@ test_ccache_access() return fi - $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}%" \ + $SMBCLIENT //$SERVER_IP/tmp -C -U "${USERNAME}" \ -c quit 2>&1 ret=$? |