ipatests: smbclient "-k" => "--use-kerberos=desired"

Change documentation:
https://download.samba.org/pub/samba/rc/samba-4.15.0rc1.WHATSNEW.txt

As of Samba 4.15rc1, smbclient does not accept "-k" anymore.
The "-k|--kerberos" option ("Try to authenticate with kerberos.")
has been replaced with "--use-kerberos=required|desired|off".

Fixes: https://pagure.io/freeipa/issue/8926
Signed-off-by: François Cami <fcami@redhat.com>
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
This commit is contained in:
François Cami 2021-07-19 15:59:01 +02:00
parent 319aa7a4b1
commit cbe5151e12

View File

@ -166,9 +166,28 @@ class TestSMB(IntegrationTest):
encoding='utf-8') encoding='utf-8')
assert file_contents_at_server == test_string assert file_contents_at_server == test_string
# check access using smbclient utility # Detect whether smbclient uses -k or --use-kerberos=required
# https://pagure.io/freeipa/issue/8926
# then check access using smbclient.
res = run_smb_client( res = run_smb_client(
['smbclient', '-k', share['unc'], '-c', 'dir']) [
"smbclient",
"-h",
], raiseonerr=False
)
if "[-k|--kerberos]" in res.stderr_text:
smbclient_krb5_knob = "-k"
else:
smbclient_krb5_knob = "--use-kerberos=desired"
res = run_smb_client(
[
"smbclient",
smbclient_krb5_knob,
share["unc"],
"-c",
"dir",
]
)
assert test_dir in res.stdout_text assert test_dir in res.stdout_text
# check file and dir removal from client side # check file and dir removal from client side