diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-06-07 11:46:04 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-06-07 11:46:04 +0000 |
| commit | e174cc84775ce24f3202655ca5805dd6c228c11e (patch) | |
| tree | c074be8c3a21f96c0f28d3891955f47337d3c23f /security | |
| parent | Fix breakage. (diff) | |
Sync with cyrus-sasl port. There is no functional change.
Obtained from: cyrus-sasl port
Diffstat (limited to 'security')
| -rw-r--r-- | security/cyrus-sasl2/pkg-deinstall | 15 | ||||
| -rw-r--r-- | security/cyrus-sasl2/pkg-install | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/security/cyrus-sasl2/pkg-deinstall b/security/cyrus-sasl2/pkg-deinstall index 7e4bb9b77a1a..87d620928422 100644 --- a/security/cyrus-sasl2/pkg-deinstall +++ b/security/cyrus-sasl2/pkg-deinstall @@ -15,6 +15,16 @@ SASLDB_NAME=${PKG_PREFIX}/etc/%%SASLDB%% CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} CYRUS_GROUP=${CYRUS_GROUP:=%%CYRUS_GROUP%%} +remove_file() +{ + file=$1 + + if cmp -s ${file} ${file}.tmp; then + rm -f ${file} + fi + rm -f ${file}.tmp +} + # delete sasldb database delete_sasldb() { @@ -42,10 +52,7 @@ delete_user() { sendmail_conf() { if [ -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ]; then echo "pwcheck_method: auxprop" > ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp - if cmp -s ${PKG_PREFIX}/lib/sasl2/Sendmail.conf ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp; then - rm -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf - fi - rm -f ${PKG_PREFIX}/lib/sasl2/Sendmail.conf.tmp + remove_file ${PKG_PREFIX}/lib/sasl2/Sendmail.conf fi } diff --git a/security/cyrus-sasl2/pkg-install b/security/cyrus-sasl2/pkg-install index 751b555b0bb3..627f039b6625 100644 --- a/security/cyrus-sasl2/pkg-install +++ b/security/cyrus-sasl2/pkg-install @@ -70,12 +70,6 @@ create_user() { fi echo "*** Updated user \`${USER}'." fi -# Don't know why we need the daemon user in the cyrus group -# hopefully this doesn't affect anyone. It's a leftover from -# the pre-SASL cyrus-imapd server. -# if ! ${PW} group mod ${GROUP} -m daemon; then -# echo "*** can't add user \`daemon' to group \`${GROUP}'" -# fi } create_sasldb() { |