diff options
| -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 d15f32535b..80c3ecdb46 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 67ac94a0d8..f6f370588c 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=$? |