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>

diff --git a/source3/lib/util_cmdline.c b/source3/lib/util_cmdline.c
index d15f32535bf1aafd3b1464fcdf0b8e91db47407f..80c3ecdb4622e744aff18316a978cdf3b5ef2f95 100644 (file)
--- 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 67ac94a0d85f05b519ccd25313cb20ef7af9794a..f6f370588cf341ebb1c76379ac888eb887df982b 100755 (executable)
--- 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=$?