From ad3f4a9f8bc90e9f0a47c4633e7ae2010f9d53c7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 27 Oct 2021 15:30:20 +0200 Subject: [PATCH 1/2] testprogs: Use new cmdline option for kerberos BUG: https://bugzilla.samba.org/show_bug.cgi?id=14846 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme (cherry picked from commit 5c6640470aa845780fbf17961e67b0d9302c2fbc) --- testprogs/blackbox/test_kpasswd_heimdal.sh | 6 +++--- testprogs/blackbox/test_kpasswd_mit.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testprogs/blackbox/test_kpasswd_heimdal.sh b/testprogs/blackbox/test_kpasswd_heimdal.sh index 1cf61e5d07d..43f38b09de2 100755 --- a/testprogs/blackbox/test_kpasswd_heimdal.sh +++ b/testprogs/blackbox/test_kpasswd_heimdal.sh @@ -71,10 +71,10 @@ testit "kinit with user password" \ do_kinit $TEST_PRINCIPAL $TEST_PASSWORD || failed=`expr $failed + 1` test_smbclient "Test login with user kerberos ccache" \ - "ls" "$SMB_UNC" -k yes || failed=`expr $failed + 1` + "ls" "$SMB_UNC" --use-kerberos=required || failed=`expr $failed + 1` testit "change user password with 'samba-tool user password' (unforced)" \ - $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -U$TEST_USERNAME%$TEST_PASSWORD -k no --newpassword=$TEST_PASSWORD_NEW || failed=`expr $failed + 1` + $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -U$TEST_USERNAME%$TEST_PASSWORD --use-kerberos=off --newpassword=$TEST_PASSWORD_NEW || failed=`expr $failed + 1` TEST_PASSWORD_OLD=$TEST_PASSWORD TEST_PASSWORD=$TEST_PASSWORD_NEW @@ -84,7 +84,7 @@ testit "kinit with user password" \ do_kinit $TEST_PRINCIPAL $TEST_PASSWORD || failed=`expr $failed + 1` test_smbclient "Test login with user kerberos ccache" \ - "ls" "$SMB_UNC" -k yes || failed=`expr $failed + 1` + "ls" "$SMB_UNC" --use-kerberos=required || failed=`expr $failed + 1` ########################################################### ### check that a short password is rejected diff --git a/testprogs/blackbox/test_kpasswd_mit.sh b/testprogs/blackbox/test_kpasswd_mit.sh index 0d1dcf2eae4..df0f53e0041 100755 --- a/testprogs/blackbox/test_kpasswd_mit.sh +++ b/testprogs/blackbox/test_kpasswd_mit.sh @@ -74,7 +74,7 @@ test_smbclient "Test login with user kerberos ccache" \ "ls" "$SMB_UNC" --use-krb5-ccache=$KRB5CCNAME || failed=`expr $failed + 1` testit "change user password with 'samba-tool user password' (unforced)" \ - $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -U$TEST_USERNAME%$TEST_PASSWORD -k no --newpassword=$TEST_PASSWORD_NEW || failed=`expr $failed + 1` + $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -U$TEST_USERNAME%$TEST_PASSWORD --use-kerberos=off --newpassword=$TEST_PASSWORD_NEW || failed=`expr $failed + 1` TEST_PASSWORD_OLD=$TEST_PASSWORD TEST_PASSWORD=$TEST_PASSWORD_NEW -- 2.33.1 From d1c913b2e21f4b2b06e087d11093aa843c76101a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 27 Oct 2021 13:45:15 +0200 Subject: [PATCH 2/2] lib:cmdline: Fix -k option which doesn't expect anything BUG: https://bugzilla.samba.org/show_bug.cgi?id=14846 RN: Fix -k legacy option for client tools like smbclient, rpcclient, net, etc. Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme (cherry picked from commit 16d43ccfddf0e67a0ae87e3f13b3114c858d64ac) --- lib/cmdline/cmdline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c index 40292a6a332..63e81bc0a7f 100644 --- a/lib/cmdline/cmdline.c +++ b/lib/cmdline/cmdline.c @@ -1251,7 +1251,7 @@ static struct poptOption popt_legacy_s3[] = { { .longName = "kerberos", .shortName = 'k', - .argInfo = POPT_ARG_STRING, + .argInfo = POPT_ARG_NONE, .val = 'k', .descrip = "DEPRECATED: Migrate to --use-kerberos", }, -- 2.33.1