- added -I/usr/include/sasl (it's ready for sasl2 now)

- changed pwcheck_method from pam to saslauthd (required by SASLv2)
- extended pam.d/smtp file basing on pam.d/cyrus (account is required by SASLv2)
- release 2

Changed files:
    sendmail-smtp.pamd -> 1.2
    sendmail.sasl -> 1.2
    sendmail.spec -> 1.115

diff --git a/sendmail-smtp.pamd b/sendmail-smtp.pamd
index db8ee67dbba72219332e436976c0a9e1eb01a8d9..8520030d21f0d26ec72d1dae8a7f1aedaa50b55c 100644 (file)
--- a/sendmail-smtp.pamd
+++ b/sendmail-smtp.pamd
@@ -2,11 +2,16 @@
 #
 # PAM configuration file required by SASL to authenticate a PLAIN password.
 #
-# This file is required if we put "pwcheck_method:pam" in 
+# When using SASLv1, this file is used if we put "pwcheck_method:pam" in
 # /etc/sasl/Sendmail.conf
 #
-# Idea by Patryk Szajer <bayer@szpitalna.ngo.pl>.
+# When using SASLv2, this file is used if we put "pwcheck_method:saslauthd"
+# in /etc/sasl/Sendmail.conf and SASL_AUTHMECH=pam in /etc/sysconfig/saslauthd
 #
-# 2002.04.15 by Lucas 'Baseciq' Mozer <baseciq@baseciq.org>
-#
-auth   required        pam_unix.so nullok try_first_pass
+auth           required        /lib/security/pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
+auth            required        /lib/security/pam_unix.so
+auth           required        /lib/security/pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root
+auth           required        /lib/security/pam_nologin.so
+account                required        /lib/security/pam_tally.so deny=0 file=/var/log/faillog onerr=succeed no_magic_root
+account         required        /lib/security/pam_unix.so
+session         required        /lib/security/pam_unix.so

diff --git a/sendmail.sasl b/sendmail.sasl
index 44af343aeacdfae3245b167348e3677f779317c8..74ef83f212619e660e161294ff8d5d07fafe7d45 100644 (file)
--- a/sendmail.sasl
+++ b/sendmail.sasl
@@ -1 +1 @@
-pwcheck_method:pam
+pwcheck_method:saslauthd

diff --git a/sendmail.spec b/sendmail.spec
index d0d0d5861557c5655ec1a09e0669cbcee1f462d5..11b2c24c12ca1123c00d5ba1b3804536541cc12c 100644 (file)
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -16,7 +16,7 @@ Summary(tr):  Elektronik posta hizmetleri sunucusu
 Summary(uk):   ðÏÛÔÏ×ÉÊ ÔÒÁÎÓÐÏÒÔÎÉÊ ÁÇÅÎÔ sendmail
 Name:          sendmail
 Version:       8.12.7
-Release:       1
+Release:       2
 License:       BSD
 Group:         Networking/Daemons
 Source0:       ftp://ftp.sendmail.org/pub/sendmail/%{name}.%{version}.tar.gz
@@ -157,6 +157,7 @@ install %{SOURCE7} config.m4
 %build
 echo "define(\`confCC', \`%{__cc}')" >> config.m4
 echo "define(\`confOPTIMIZE', \`%{rpmcflags} -DUSE_VENDOR_CF_PATH=1 -DNETINET6')" >> config.m4
+echo "APPENDDEF(\`confINCDIRS', \`-I/usr/include/sasl')" >> config.m4
 echo "define(\`confLIBSEARCH', \`db')" >> config.m4
 %if %{?debug:0}%{!?debug:1}
 echo "define(\`confLDOPTS', \`-s')" >> config.m4