Skip to content

Commit

Permalink
Merge pull request #354 from himmelblau-idm/stable-0.8.x_goa_crash
Browse files Browse the repository at this point in the history
Fix GOA crash when krb5.conf doesn't include /etc/krb5.conf.d - Stable 0.8.x
  • Loading branch information
dmulder authored Jan 30, 2025
2 parents 1510f5a + ea6ac33 commit 2a718bc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = [
resolver = "2"

[workspace.package]
version = "0.8.4"
version = "0.8.5"
authors = [
"David Mulder <[email protected]>"
]
Expand Down
11 changes: 11 additions & 0 deletions platform/debian/scripts/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,14 @@ if [[ -f /etc/apparmor.d/usr.lib.libreoffice.program.soffice.bin ]]; then
# Reload the AppArmor profile to apply the changes
apparmor_parser -r /etc/apparmor.d/usr.lib.libreoffice.program.soffice.bin || echo "apparmor reload failed"
fi

# Ensure `includedir /etc/krb5.conf.d` is present in /etc/krb5.conf
KRB5_CONF="/etc/krb5.conf"
KRB5_INCLUDE_LINE="includedir /etc/krb5.conf.d"

if [[ -f "$KRB5_CONF" ]]; then
if ! grep -qF "$KRB5_INCLUDE_LINE" "$KRB5_CONF"; then
printf "\n%s\n" "$KRB5_INCLUDE_LINE" >> "$KRB5_CONF"
echo "Added '$KRB5_INCLUDE_LINE' to $KRB5_CONF"
fi
fi

0 comments on commit 2a718bc

Please sign in to comment.