--------------------- PatchSet 1813 Date: 2004/01/26 09:47:04 Author: hmh Branch: woody-fullhashdir Tag: debian_version_2_1_16-0woodyFULLHASH_3_5 Log: allow plaintext logins everywhere Members: debian/changelog:1.149.2.30.2.1->1.149.2.30.2.2 debian/executable.files:1.10.4.6->1.10.4.6.2.1 imap/imapd.c:1.39.2.13->1.39.2.13.2.1 imap/pop3d.c:1.17.2.10->1.17.2.10.2.1 imap/pop3proxyd.c:1.19.2.6->1.19.2.6.2.1 imap/proxyd.c:1.26.2.9->1.26.2.9.2.1 Index: debian/cyrus21-imapd/debian/changelog diff -u debian/cyrus21-imapd/debian/changelog:1.149.2.30.2.1 debian/cyrus21-imapd/debian/changelog:1.149.2.30.2.2 --- debian/cyrus21-imapd/debian/changelog:1.149.2.30.2.1 Sat Jan 24 15:14:50 2004 +++ debian/cyrus21-imapd/debian/changelog Mon Jan 26 11:47:04 2004 @@ -1,4 +1,4 @@ -cyrus21-imapd (2.1.16-0woodyFULLHASH.3.4) unstable; urgency=low +cyrus21-imapd (2.1.16-0woodyFULLHASH.3.5) unstable; urgency=low * WOODY BACKPORT [Fullhashdir enabled version] * New backport version naming: 0woody.unstable_version.backport_version @@ -12,8 +12,10 @@ + cyrus-sasl2 * Fix EINTR causing mupdate to die on accept() [2.1.16-4] * Make sure to stop alarm() on lib/lock* [2.1.16-4] + * Break standards compliance, and accept PLAIN over unprotected channel + (needed for murder clusters + saslauthd) - -- Henrique de Moraes Holschuh Thu, 22 Jan 2004 08:25:28 -0200 + -- Henrique de Moraes Holschuh Mon, 26 Jan 2004 11:37:56 -0200 cyrus21-imapd (2.1.16-3) unstable; urgency=low Index: debian/cyrus21-imapd/debian/executable.files diff -u debian/cyrus21-imapd/debian/executable.files:1.10.4.6 debian/cyrus21-imapd/debian/executable.files:1.10.4.6.2.1 --- debian/cyrus21-imapd/debian/executable.files:1.10.4.6 Wed Jan 21 13:52:37 2004 +++ debian/cyrus21-imapd/debian/executable.files Mon Jan 26 11:47:05 2004 @@ -1,3 +1,4 @@ +./autogen.sh ./contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl ./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl ./contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl @@ -5,13 +6,13 @@ ./contrib/cyrus-graphtools.1.0/script/run ./contrib/notify_unix/simple_notify.pl ./contrib/notify_unix/sql_notify.pl -./debian/cyrus-makedirs -./debian/cyrus21-common.postinst +./debian/cyrus21-common.cyrus21.init ./debian/cyrus21-common.postrm ./debian/cyrus21-common.prerm -./debian/rules ./debian/examples/mboxtocyrus -./debian/cyrus21-common.cyrus21.init +./debian/rules +./debian/cyrus-makedirs +./debian/cyrus21-common.postinst ./imap/xversion.sh ./lib/test/run ./makedepend/configure @@ -29,6 +30,5 @@ ./tools/undohash ./tools/upgradesieve ./configure -./autogen.sh ./install-sh ./mkinstalldirs Index: debian/cyrus21-imapd/imap/imapd.c diff -u debian/cyrus21-imapd/imap/imapd.c:1.39.2.13 debian/cyrus21-imapd/imap/imapd.c:1.39.2.13.2.1 --- debian/cyrus21-imapd/imap/imapd.c:1.39.2.13 Wed Jan 21 13:51:59 2004 +++ debian/cyrus21-imapd/imap/imapd.c Mon Jan 26 11:47:05 2004 @@ -743,8 +743,8 @@ } /* never allow plaintext, since IMAP has the LOGIN command */ - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); - sasl_setprop(imapd_saslconn, SASL_SEC_PROPS, secprops); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + sasl_setprop(imapd_saslconn, SASL_SEC_PROPS, secprops); */ sasl_setprop(imapd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf); if (imapd_haveaddr) { @@ -7534,9 +7534,9 @@ saslprops.iplocalport); if(ret != SASL_OK) return ret; - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + /* secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops); - if(ret != SASL_OK) return ret; + if(ret != SASL_OK) return ret; */ /* end of service_main initialization excepting SSF */ /* If we have TLS/SSL info, set it */ Index: debian/cyrus21-imapd/imap/pop3d.c diff -u debian/cyrus21-imapd/imap/pop3d.c:1.17.2.10 debian/cyrus21-imapd/imap/pop3d.c:1.17.2.10.2.1 --- debian/cyrus21-imapd/imap/pop3d.c:1.17.2.10 Wed Jan 21 13:51:59 2004 +++ debian/cyrus21-imapd/imap/pop3d.c Mon Jan 26 11:47:05 2004 @@ -365,8 +365,8 @@ fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); /* will always return something valid */ - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); - sasl_setprop(popd_saslconn, SASL_SEC_PROPS, secprops); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + sasl_setprop(popd_saslconn, SASL_SEC_PROPS, secprops);*/ if(iptostring((struct sockaddr *)&popd_localaddr, salen, localip, 60) == 0) { @@ -1524,9 +1524,9 @@ ret = sasl_setprop(*conn, SASL_IPLOCALPORT, saslprops.iplocalport); if(ret != SASL_OK) return ret; - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops); - if(ret != SASL_OK) return ret; + if(ret != SASL_OK) return ret;*/ /* end of service_main initialization excepting SSF */ /* If we have TLS/SSL info, set it */ Index: debian/cyrus21-imapd/imap/pop3proxyd.c diff -u debian/cyrus21-imapd/imap/pop3proxyd.c:1.19.2.6 debian/cyrus21-imapd/imap/pop3proxyd.c:1.19.2.6.2.1 --- debian/cyrus21-imapd/imap/pop3proxyd.c:1.19.2.6 Wed Jan 21 13:51:59 2004 +++ debian/cyrus21-imapd/imap/pop3proxyd.c Mon Jan 26 11:47:05 2004 @@ -280,8 +280,8 @@ fatal("SASL failed initializing: sasl_server_new()",EC_TEMPFAIL); /* will always return something valid */ - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); - sasl_setprop(popd_saslconn, SASL_SEC_PROPS, secprops); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + sasl_setprop(popd_saslconn, SASL_SEC_PROPS, secprops);*/ if(iptostring((struct sockaddr *)&popd_localaddr, salen, localip, 60) == 0) { @@ -1410,18 +1410,9 @@ ret = sasl_setprop(*conn, SASL_IPLOCALPORT, saslprops.iplocalport); if(ret != SASL_OK) return ret; - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops); - if(ret != SASL_OK) return ret; - /* end of service_main initialization excepting SSF */ - - /* If we have TLS/SSL info, set it */ - ret = sasl_setprop(*conn, SASL_IPLOCALPORT, - saslprops.iplocalport); - if(ret != SASL_OK) return ret; - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); - ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops); - if(ret != SASL_OK) return ret; + if(ret != SASL_OK) return ret;*/ /* end of service_main initialization excepting SSF */ /* If we have TLS/SSL info, set it */ Index: debian/cyrus21-imapd/imap/proxyd.c diff -u debian/cyrus21-imapd/imap/proxyd.c:1.26.2.9 debian/cyrus21-imapd/imap/proxyd.c:1.26.2.9.2.1 --- debian/cyrus21-imapd/imap/proxyd.c:1.26.2.9 Wed Jan 21 13:51:59 2004 +++ debian/cyrus21-imapd/imap/proxyd.c Mon Jan 26 11:47:05 2004 @@ -1275,8 +1275,8 @@ saslprops.iplocalport = xstrdup(localip); } - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); - sasl_setprop(proxyd_saslconn, SASL_SEC_PROPS, secprops); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + sasl_setprop(proxyd_saslconn, SASL_SEC_PROPS, secprops);*/ sasl_setprop(proxyd_saslconn, SASL_SSF_EXTERNAL, &extprops_ssf); proc_register("proxyd", proxyd_clienthost, (char *)0, (char *)0); @@ -5263,9 +5263,9 @@ saslprops.iplocalport); if(ret != SASL_OK) return ret; - secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); + /*secprops = mysasl_secprops(SASL_SEC_NOPLAINTEXT); ret = sasl_setprop(*conn, SASL_SEC_PROPS, secprops); - if(ret != SASL_OK) return ret; + if(ret != SASL_OK) return ret; */ /* end of service_main initialization excepting SSF */ /* If we have TLS/SSL info, set it */