summaryrefslogtreecommitdiff
path: root/mail/qmail-ldap/files/patch-20120221-fixes-2
diff options
context:
space:
mode:
Diffstat (limited to 'mail/qmail-ldap/files/patch-20120221-fixes-2')
-rw-r--r--mail/qmail-ldap/files/patch-20120221-fixes-264
1 files changed, 0 insertions, 64 deletions
diff --git a/mail/qmail-ldap/files/patch-20120221-fixes-2 b/mail/qmail-ldap/files/patch-20120221-fixes-2
deleted file mode 100644
index 92291e2db8cd..000000000000
--- a/mail/qmail-ldap/files/patch-20120221-fixes-2
+++ /dev/null
@@ -1,64 +0,0 @@
-http://marc.info/?l=qmail-ldap&m=133193764313080&q=raw
-
-List: qmail-ldap
-Subject: Re: Re: qmail-ldaplookup: fatal: qldap_filter: unspecified error
-From: Claudio Jeker <jeker () n-r-g ! com>
-Date: 2012-03-16 22:39:36
-Message-ID: 20120316223936.GC2808 () diehard ! n-r-g ! com
-
-
-Index: qldap-filter.c
-===================================================================
-RCS file: /home/cvs-djbware/CVS/qmail-ldap/qldap-filter.c,v
-retrieving revision 1.10
-diff -u -p -r1.10 qldap-filter.c
---- qldap-filter.c 10 Nov 2009 22:46:06 -0000 1.10
-+++ qldap-filter.c 16 Mar 2012 23:37:23 -0000
-@@ -107,7 +107,7 @@ filter_uid(char *uid)
- return 0;
-
- if (!filter_start(&filter) ||
-- !stralloc_copys(&filter,"(") ||
-+ !stralloc_cats(&filter,"(") ||
- !stralloc_cats(&filter, LDAP_UID) ||
- !stralloc_cats(&filter, "=") ||
- !filter_escape(&filter, uid, str_len(uid)) ||
-@@ -179,7 +179,6 @@ filter_mail(char *mail, int *done)
- }
- extcnt--;
- #else
--#error XXX XXX
- /* basic qmail-ldap behavior test for username@domain.com and
- catchall@domain.com */
- ext = 0;
-@@ -193,7 +192,7 @@ filter_mail(char *mail, int *done)
- /* build the search string for the email address */
- /* mail address */
- if (!filter_start(&filter) ||
-- !stralloc_copys(&filter, "(|(") ||
-+ !stralloc_cats(&filter, "(|(") ||
- !stralloc_cats(&filter, LDAP_MAIL) ||
- !stralloc_cats(&filter, "="))
- return 0;
-Index: qmail-ldaplookup.c
-===================================================================
-RCS file: /home/cvs-djbware/CVS/qmail-ldap/qmail-ldaplookup.c,v
-retrieving revision 1.39
-diff -u -p -r1.39 qmail-ldaplookup.c
---- qmail-ldaplookup.c 10 Nov 2009 22:43:06 -0000 1.39
-+++ qmail-ldaplookup.c 16 Mar 2012 23:37:23 -0000
-@@ -223,12 +223,12 @@ int main(int argc, char **argv)
- switch (mode) {
- case mail:
- f = filter_mail(value, &done);
-- if (value == 0)
-+ if (f == 0)
- strerr_die2sys(1, FATAL, "building filter: ");
- break;
- case uid:
- f = filter_uid(value);
-- if (value == 0)
-+ if (f == 0)
- strerr_die2sys(1, FATAL, "building filter: ");
- done = 1;
- break;