From d1a4c56b6cb2548fee59a81a3a3faaaafabda05d Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Mon, 25 Oct 2004 14:17:37 +0000
Subject: [PATCH] - update cryusldap patch PR:		71995 Submitted by:
 Michael O. Boev

---
 mail/sendmail/files/cyruslookup.patch | 43 +++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/mail/sendmail/files/cyruslookup.patch b/mail/sendmail/files/cyruslookup.patch
index 52420a72564b..a321b6a4a70e 100644
--- a/mail/sendmail/files/cyruslookup.patch
+++ b/mail/sendmail/files/cyruslookup.patch
@@ -36,9 +36,39 @@ diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4
 +R<!> $* $| $* <TMPF>	$# error $@ 4.3.0 $: "451 TEMPFAIL."	
 +#Mailbox doesn't exist or its ACL forbids posting
 +R<!> $* $| $*		$# error $@ 5.1.1 $: "550 Mailbox is not available."
---- /dev/null	Thu Apr  8 15:55:21 2004
-+++ cf/feature/mrs_cyrus.m4	Thu Apr  1 21:37:05 2004
-@@ -0,0 +1,74 @@
+diff -ruN cf.orig/feature/mrs.m4 cf/feature/mrs.m4
+--- cf.orig/feature/mrs.m4	Thu Jan  1 07:00:00 1970
++++ cf/feature/mrs.m4	Wed Sep 22 19:54:56 2004
+@@ -0,0 +1,25 @@
++divert(-1)
++dnl
++dnl Updates: http://anfi.webhop.net/sendmail/mrs.html
++dnl
++dnl By using this file, you agree to the terms and conditions set
++dnl forth in the LICENSE file which can be found at the top level of
++dnl the sendmail distribution (sendmail-8.12).
++dnl
++dnl	Contributed by Andrzej Filip
++dnl
++dnl THE FEATURE REQUIRES PATCHING cf/m4/proto.m4
++dnl SEE THE LINK AFTER "Updates:"
++dnl
++dnl Log: mrs.m4,v 
++dnl Revision 8.3  2004/03/18 21:39:22  anfi
++dnl Changed comments prefixes to dnl to avoid m4 expansions
++dnl
++dnl Revision 8.2  2004/03/15 09:14:28  anfi
++dnl Added "Updates:" web link.
++dnl
++divert(0)
++VERSIONID(`Id: mrs.m4,v 8.3 2004/03/18 21:39:22 anfi Exp ')
++divert(-1)
++
++define(`_MRS_RELAY_', `')
+diff -ruN cf.orig/feature/mrs_cyrus.m4 cf/feature/mrs_cyrus.m4
+--- cf.orig/feature/mrs_cyrus.m4	Thu Jan  1 07:00:00 1970
++++ cf/feature/mrs_cyrus.m4	Wed Sep 22 19:55:05 2004
+@@ -0,0 +1,77 @@
 +divert(-1)
 +dnl
 +dnl Updates: http://anfi.homeunix.net/sendmail/rtcyrus2.html
@@ -49,7 +79,10 @@ diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4
 +dnl
 +dnl	Contributed by Andrzej Filip
 +dnl
-+dnl $Log: mrs_cyrus.m4,v $
++dnl Log: mrs_cyrus.m4,v
++dnl Revision 8.8  2004/08/11 18:20:05  anfi
++dnl "stipdom" replaced by "dummy"
++dnl
 +dnl Revision 8.7  2004/04/01 14:29:50  anfi
 +dnl Added "stripdom" handling in mrs_cyrus_user.
 +dnl Fully defined error mailer details.
@@ -66,7 +99,7 @@ diff -ruN cf.orig/feature/ckuser_cyrus.m4 cf/feature/ckuser_cyrus.m4
 +define(`_MRS_CYRUS_',`')
 +
 +divert(0)
-+VERSIONID(`$Id: mrs_cyrus.m4,v 8.8 2004/08/11 18:20:05 anfi Exp $')
++VERSIONID(`Id: mrs_cyrus.m4,v 8.8 2004/08/11 18:20:05 anfi Exp ')
 +divert(-1)
 +define(`CYRUS_SMMAPD_SOCKET',
 +        ifelse(len(X`'_ARG_), `1', `/var/imap/socket/smmapd', _ARG_))