Skip to content

Commit 7dff5cf

Browse files
committed
fix authentication-tests-darwinssl (#1400)
* silence `kinit` check * do not assume existence of `krb5.conf` Instead: check for presence of `kinit` command. `/etc/krb5.conf` does not appear present on macOS hosts. * regenerate Evergreen config
1 parent 78bd338 commit 7dff5cf

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.evergreen/config_generator/components/funcs/prepare_kerberos.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class PrepareKerberos(Function):
1212
working_dir='mongoc',
1313
silent=True,
1414
script='''\
15-
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
15+
if test "${keytab|}" && command -v kinit >/dev/null; then
1616
echo "${keytab}" > /tmp/drivers.keytab.base64
1717
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
1818
if touch /etc/krb5.conf 2>/dev/null; then

.evergreen/generated_configs/functions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ functions:
259259
args:
260260
- -c
261261
- |
262-
if test "${keytab|}" && [[ -f /etc/krb5.conf ]]; then
262+
if test "${keytab|}" && command -v kinit >/dev/null; then
263263
echo "${keytab}" > /tmp/drivers.keytab.base64
264264
base64 --decode /tmp/drivers.keytab.base64 > /tmp/drivers.keytab
265265
if touch /etc/krb5.conf 2>/dev/null; then

.evergreen/scripts/run-auth-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ esac
6262
: "${test_gssapi:?}"
6363
: "${ip_addr:?}"
6464

65-
if command -v kinit && [[ -f /tmp/drivers.keytab ]]; then
65+
if command -v kinit >/dev/null && [[ -f /tmp/drivers.keytab ]]; then
6666
kinit -k -t /tmp/drivers.keytab -p [email protected] || true
6767
fi
6868

0 commit comments

Comments
 (0)