patch for the last version.
Friedrich Locke <[email protected]> Sat, 22 Mar 2014 16:39:50 -0300
| Newsgroups | gmane.mail.qmail.ldap |
|---|---|
| Message-ID | <CANMDHqes4cMzZQj+PKnQcek9wJgSC357xFSqZufpTwT-+z2_zA@mail.gmail.com> |
--001a1134563070f3ea04f5372a75
Content-Type: text/plain; charset=ISO-8859-1
Hi folks,
i am trying to install qmail+ldap, but for some reason, i am having to
apply the following patch:
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 [email protected]
[email protected] */
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;
If i fetched qmail-ldap patch from the nr4u and the last release ...
because there is a error with the lastldap patch realeased. Is there plan
to fix it ?
Thanks a lot.
fried
--001a1134563070f3ea04f5372a75
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr">Hi folks,<div><br></div><div>i am trying to install qmail+=
ldap, but for some reason, i am having to apply the following patch:</div><=
div><br></div><div><div>Index: qldap-filter.c</div><div>=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D</div>
<div>RCS file: /home/cvs-djbware/CVS/qmail-ldap/qldap-filter.c,v</div><div>=
retrieving revision 1.10</div><div>diff -u -p -r1.10 qldap-filter.c</div><d=
iv>--- qldap-filter.c =A0 =A0 =A010 Nov 2009 22:46:06 -0000 =A0 =A0 =A01.10=
</div><div>
+++ qldap-filter.c =A0 =A0 =A016 Mar 2012 23:37:23 -0000</div><div>@@ -107,=
7 +107,7 @@ filter_uid(char *uid)</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
return 0;</div><div>=A0</div><div>=A0 =A0 =A0 =A0 if (!filter_start(&f=
ilter) =A0||</div><div>- =A0 =A0 =A0 =A0 =A0 !stralloc_copys(&filter,&q=
uot;(") ||</div>
<div>+ =A0 =A0 =A0 =A0 =A0 !stralloc_cats(&filter,"(") ||</di=
v><div>=A0 =A0 =A0 =A0 =A0 =A0 !stralloc_cats(&filter, LDAP_UID) ||</di=
v><div>=A0 =A0 =A0 =A0 =A0 =A0 !stralloc_cats(&filter, "=3D")=
||</div><div>=A0 =A0 =A0 =A0 =A0 =A0 !filter_escape(&filter, uid, str_=
len(uid)) ||</div>
<div>@@ -179,7 +179,6 @@ filter_mail(char *mail, int *done)</div><div>=A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 }</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ext=
cnt--;</div><div>=A0#else</div><div>-#error XXX XXX=A0</div><div>=A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 /* basic qmail-ldap behavior test for <a href=3D"ma=
ilto:[email protected]">[email protected]</a> and</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0<a href=3D"mailto:catch...@doma=
in.com">[email protected]</a> */</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 ext =3D 0;</div><div>@@ -193,7 +192,7 @@ filter_mail(char *mail, int *d=
one)</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* build the=
search string for the email address */</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* mail address */</di=
v><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (!filter_start(&a=
mp;filter) ||</div><div>- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 !stralloc_copys(&filter, "(|(") ||</div><div>+ =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !stralloc_cats(&filter, &qu=
ot;(|(") ||</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 !stralloc_cats=
(&filter, LDAP_MAIL) ||</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 !stralloc_cats(&filter, "=3D"))</div><div=
>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return 0;<=
/div><div>Index: qmail-ldaplookup.c</div>
<div>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D</div><div>RCS fil=
e: /home/cvs-djbware/CVS/qmail-ldap/qmail-ldaplookup.c,v</div><div>retrievi=
ng revision 1.39</div><div>diff -u -p -r1.39 qmail-ldaplookup.c</div>
<div>--- qmail-ldaplookup.c =A010 Nov 2009 22:43:06 -0000 =A0 =A0 =A01.39</=
div><div>+++ qmail-ldaplookup.c =A016 Mar 2012 23:37:23 -0000</div><div>@@ =
-223,12 +223,12 @@ int main(int argc, char **argv)</div><div>=A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 switch (mode) {</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 case mail:</div><div>=A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 f =3D filter_mail(value, &done);</div><=
div>- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (value =3D=3D 0)</div>=
<div>+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (f =3D=3D 0)</div><di=
v>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strerr_di=
e2sys(1, FATAL, "building filter: ");</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;</div><div>=A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 case uid:</div><div>=A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 =A0 =A0 =A0 f =3D filter_uid(value);</div><div>- =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 if (value =3D=3D 0)</div><div>+ =A0 =A0 =A0 =A0=
=A0 =A0 =A0 =A0 =A0 =A0 =A0 if (f =3D=3D 0)</div>
<div>=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 strerr=
_die2sys(1, FATAL, "building filter: ");</div><div>=A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 done =3D 1;</div><div>=A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;</div><div><br></div></div><div>If i =
fetched qmail-ldap patch from the nr4u and the last release ... because the=
re is a error with the lastldap patch realeased. Is there plan to fix it ?<=
/div>
<div><br></div><div>Thanks a lot.</div><div><br></div><div><br></div><div>f=
ried</div></div>
--001a1134563070f3ea04f5372a75--