The branch, master has been updated
via 16d43ccfddf lib:cmdline: Fix -k option which doesn't expect anything
via 5c6640470aa testprogs: Use new cmdline option for kerberos
from 2be0a19d448 Revert "samba-tool: Pick local host if calling
samba-tool from DC"
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 16d43ccfddf0e67a0ae87e3f13b3114c858d64ac
Author: Andreas Schneider <a...@cryptomilk.org>
Date: Wed Oct 27 13:45:15 2021 +0200
lib:cmdline: Fix -k option which doesn't expect anything
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14846
Signed-off-by: Andreas Schneider <a...@cryptomilk.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
Autobuild-User(master): Ralph Böhme <s...@samba.org>
Autobuild-Date(master): Thu Oct 28 13:23:34 UTC 2021 on sn-devel-184
commit 5c6640470aa845780fbf17961e67b0d9302c2fbc
Author: Andreas Schneider <a...@cryptomilk.org>
Date: Wed Oct 27 15:30:20 2021 +0200
testprogs: Use new cmdline option for kerberos
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14846
Signed-off-by: Andreas Schneider <a...@cryptomilk.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/cmdline/cmdline.c | 2 +-
testprogs/blackbox/test_kpasswd_heimdal.sh | 6 +++---
testprogs/blackbox/test_kpasswd_mit.sh | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index 5dd543f244d..753cec27c3f 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",
},
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
--
Samba Shared Repository
