Skip to content

Commit e8c8874

Browse files
committed
fix failing tests on fedora, ensure bash_ensure_ini_config removes duplicate keys
1 parent 7a8465b commit e8c8874

5 files changed

Lines changed: 17 additions & 6 deletions

File tree

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#!/bin/bash
2-
# packages = sssd
2+
# packages = authselect,sssd
33
# platform = multi_platform_fedora,Oracle Linux 7,Red Hat Virtualization 4,multi_platform_ubuntu
44

5+
authselect select sssd --force
6+
57
SSSD_FILE="/etc/sssd/sssd.conf"
68
echo "[pam]" > $SSSD_FILE
79
echo "pam_cert_auth = False" >> $SSSD_FILE
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
2-
# packages = sssd
2+
# packages = authselect,sssd
33
# platform = multi_platform_fedora,Oracle Linux 7,Red Hat Virtualization 4,multi_platform_ubuntu
44

5+
authselect select sssd --force
6+
57
SSSD_FILE="/etc/sssd/sssd.conf"
68
echo "[pam]" > $SSSD_FILE
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
2-
# packages = sssd
2+
# packages = authselect,sssd
33
# platform = multi_platform_fedora,Oracle Linux 7,Red Hat Virtualization 4,multi_platform_ubuntu
44

5+
authselect select sssd --force
6+
57
SSSD_FILE="/etc/sssd/sssd.conf"
68
rm -f $SSSD_FILE
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
#!/bin/bash
2-
# packages = sssd
2+
# packages = authselect,sssd
33
# platform = multi_platform_fedora,Oracle Linux 7,Red Hat Virtualization 4,multi_platform_ubuntu
44

55
SSSD_FILE="/etc/sssd/sssd.conf"
66
echo "[pam]" > $SSSD_FILE
77
echo "pam_cert_auth = True" >> $SSSD_FILE
8+
9+
authselect select sssd --force
10+
authselect enable-feature with-smartcard
11+
authselect apply-changes

shared/macros/10-bash.jinja

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,13 +2315,14 @@ for f in $(echo -n "{{{ files }}}"); do
23152315

23162316
# find key in section and change value
23172317
if grep -qzosP "(?m)^[[:space:]]*\[{{{ section }}}\]([^\n\[]*\n+)+?[[:space:]]*{{{ key }}}" "$f"; then
2318-
if ! grep -qzosP "(?m)^[[:space:]]*{{{ key }}}[[:space:]]*=[[:space:]]*{{{ value }}}" "$f"; then
23192318
{{% if no_quotes %}}
23202319
sed -i "/^[[:space:]]*{{{ key }}}/s/\([[:blank:]]*=[[:blank:]]*\).*/\1{{{ value | replace("/", "\/") }}}/" "$f"
23212320
{{% else %}}
23222321
sed -i '/^[[:space:]]*{{{ key }}}/s/\([[:blank:]]*=[[:blank:]]*\).*/\1"{{{ value | replace("/", "\/") }}}"/' "$f"
23232322
{{% endif %}}
2324-
fi
2323+
2324+
# remove duplicate key lines, keep only the first occurrence
2325+
sed -i '0,/^[[:space:]]*{{{ key }}}[[:blank:]]*=/b; /^[[:space:]]*{{{ key }}}[[:blank:]]*=/d' "$f"
23252326

23262327
found=true
23272328

0 commit comments

Comments
 (0)