From be468c25514fcde800c7fadce1d8f33dd8191bd0 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Wed, 22 Oct 2025 14:58:02 +0800 Subject: [PATCH] make socketdir and mech on the command line configurable --- cyrus-sasl.spec | 7 +++++-- saslauthd.service | 2 +- saslauthd.sysconfig | 7 +++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index f9c7243..174b8c7 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -6,7 +6,7 @@ Name: cyrus-sasl Version: 2.1.28 -Release: 7 +Release: 8 Summary: The Cyrus SASL API Implementation License: BSD with advertising @@ -237,7 +237,6 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %files lib %{_libdir}/libsasl*.so.* %dir %{_sysconfdir}/sasl2 -%{_libdir}/libsasl*.so.* %dir %{_libdir}/sasl2/ %{_libdir}/sasl2/*anonymous*.so* %{_libdir}/sasl2/*sasldb*.so* @@ -264,6 +263,10 @@ getent passwd %{username} >/dev/null || useradd -r -g %{username} -d %{homedir} %changelog +* Wed Oct 22 2025 yixiangzhike - 2.1.28-8 +- make socketdir and mech on the command line configurable +- cleanup warning "File listed twice" when building + * Tue Oct 14 2025 yixiangzhike - 2.1.28-7 - fix saslpasswd2 coredump when enable srp-setpass diff --git a/saslauthd.service b/saslauthd.service index 436c835..8531559 100644 --- a/saslauthd.service +++ b/saslauthd.service @@ -4,7 +4,7 @@ Description=SASL authentication daemon. [Service] Type=forking EnvironmentFile=/etc/sysconfig/saslauthd -ExecStart=/usr/sbin/saslauthd -m /run/saslauthd -a pam $FLAGS +ExecStart=/usr/sbin/saslauthd -m $SOCKETDIR -a $MECH $FLAGS RuntimeDirectory=saslauthd Restart=always RestartSec=1s diff --git a/saslauthd.sysconfig b/saslauthd.sysconfig index c5d8db6..7ee7b79 100644 --- a/saslauthd.sysconfig +++ b/saslauthd.sysconfig @@ -1 +1,8 @@ +# Saslauthd's homedir for socket file, pid file and so on. +SOCKETDIR=/run/saslauthd + +# Which mechanism to use. +MECH=pam + +# Additional flags for saslauthd command line. FLAGS= -- Gitee