add options to use auxprop with sql.

3 files changed, 57 insertions, 21 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index f837078210b1..d7a6065f65f3 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.46 2004/08/27 00:16:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.47 2004/08/27 06:02:45 langthang Exp $
+
+  26 Aug 2004; Tuan Van <langthang@gentoo.org> files/imapd.conf:
+  add options to use auxprop with sql.
 
 *cyrus-imapd-2.2.8 (27 Aug 2004)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 9e68d3d96222..d6508d9eee9c 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,32 +1,42 @@
-MD5 e69560ddd16f2baf3219cbbbb438ad04 ChangeLog 9503
-MD5 cd65423d236df0ea84d39c68c735d674 cyrus-imapd-2.1.12.ebuild 6860
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e5bb7e5821f9b2b9ecb24998f731a007 cyrus-imapd-2.1.13.ebuild 6868
-MD5 790311e06d810db05f12e0a9783e760f cyrus-imapd-2.1.14.ebuild 6999
-MD5 99e75457cd862847a84466ddf5ad9f3c cyrus-imapd-2.1.15-r1.ebuild 7036
 MD5 10c1bb9bddc6970c1bb557721ddc5e66 cyrus-imapd-2.1.15.ebuild 6980
+MD5 cd65423d236df0ea84d39c68c735d674 cyrus-imapd-2.1.12.ebuild 6860
+MD5 99e75457cd862847a84466ddf5ad9f3c cyrus-imapd-2.1.15-r1.ebuild 7036
+MD5 790311e06d810db05f12e0a9783e760f cyrus-imapd-2.1.14.ebuild 6999
+MD5 e28dfbd6a82e32da36db3c7c42e3c588 cyrus-imapd-2.2.8.ebuild 5296
 MD5 bdc2f0c872314dabaaafe5891dcdf73b cyrus-imapd-2.2.3.ebuild 5237
+MD5 6d3c6bec86f20675e80092522569fc0c ChangeLog 9608
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 e28dfbd6a82e32da36db3c7c42e3c588 cyrus-imapd-2.2.8.ebuild 5296
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
-MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
 MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
-MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
 MD5 375e343e1080fa924b085d5495e13588 files/cyrus.rc6 556
-MD5 a2bcd5a2f5919eb602240b429c764d3a files/cyrus.rc6_2 614
 MD5 bc1ec4f1a5502b3381283e7d2765896e files/cyrus_2.conf 1345
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
-MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
-MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
+MD5 75e1eaf365d192b2992bac8d61595a79 files/cyrus-imapd-2.1.15-db4.patch 2759
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15-r1 155
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
+MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
+MD5 a2bcd5a2f5919eb602240b429c764d3a files/cyrus.rc6_2 614
+MD5 c6c0c19a7fdab57bee419fac05f20f36 files/cyrus-imapd-2.1.14-db4.patch 2756
 MD5 7780b2b09779674f551f030be3cdb34d files/gentestcrt.sh 8804
 MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
-MD5 fb335e67152d5b24e1405c01a24f0978 files/imapd.conf 875
-MD5 c46d8460abec45aa38562cebc6edb434 files/imapd_2.conf 770
 MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
-MD5 dc1f65f55fac1a36aadf276f5c716f2f files/pam.d-imap 214
 MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
+MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imapd-2.2.3 70
 MD5 6453c70342b78c99a073a06292b7e757 files/digest-cyrus-imapd-2.2.8 70
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
+MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
+MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imapd-2.1.14 155
+MD5 1bf166e9ac57420dc010bddacd3dfe98 files/digest-cyrus-imapd-2.1.15 155
+MD5 dc1f65f55fac1a36aadf276f5c716f2f files/pam.d-imap 214
+MD5 c46d8460abec45aa38562cebc6edb434 files/imapd_2.conf 770
+MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
+MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+
+iD8DBQFBLtGt5FrxP71izLARAvc1AJ4lE4xVDCak/ZykPBCDOMsT4SksWgCfajhv
+QYoEGeYo31JiSYLCEqxY1bs=
+=ebR/
+-----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
index 5fc185370d79..f4db3a462e15 100644
--- a/net-mail/cyrus-imapd/files/imapd.conf
+++ b/net-mail/cyrus-imapd/files/imapd.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd.conf,v 1.4 2004/07/18 04:02:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd.conf,v 1.5 2004/08/27 06:02:45 langthang Exp $
 
 # Don't forget to use chattr +S (if you are using ext[23]) 
 # when you change these directories (read the docs).
@@ -27,3 +27,26 @@ allowplaintext:		no
 # But be warned: login with DIGEST-MD5 or CRAM-MD5 
 # is not possible using pam.
 #sasl_pwcheck_method:	saslauthd
+
+####################################################
+## This is a recommended authentication method if you
+## emerge cyrus-sasl with 'postgres' or 'mysql'
+## To use with mysql database uncomment those lines below.
+
+#sasl_pwcheck_method: auxprop
+#sasl_auxprop_plugin: sql
+
+## possible values for sasl_auxprop_plugin 'mysql', 'pgsql', 'sqlite'.
+#sasl_sql_engine: mysql
+
+## all possible values.
+#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
+## or limit to CRAM-MD5 only
+#sasl_mech_list: CRAM-MD5
+
+## change below to suit your setup.
+sasl_sql_user: mailsqluser
+sasl_sql_passwd: password
+sasl_sql_database: mailsqldb
+sasl_sql_hostnames: localhost
+sasl_sql_select: SELECT clear FROM users WHERE email = '%u@%r'