rpms/sendmail
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix m4 ldap routing macro, backport from 8.14.5.Alpha0, (#650366)

Browse Source
This commit is contained in:
Jaroslav Škarvada 2010-11-08 12:01:59 +01:00
commit 2b3e99e733
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sendmail-8.14.4-m4-ldap-routing.patch Normal file
View File

@ -0,0 +1,45 @@
--- sendmail-bak/cf/feature/ldap_routing.m4 2009-06-26 23:11:08.000000000 +0200
+++ sendmail/cf/feature/ldap_routing.m4 2010-01-05 01:57:27.000000000 +0100
@@ -35,40 +35,12 @@
_ARG6_, `tempfail', `define(`_LDAP_ROUTE_MAPTEMP_', `_TEMPFAIL_')',
_ARG6_, `queue', `define(`_LDAP_ROUTE_MAPTEMP_', `_QUEUE_')')
-define(`_ATMPF_', `<TMPF>')dnl
-dnl check whether arg contains -T`'_ATMPF_
-dnl unless it is a sequence map or just LDAP
-dnl note: this does not work if ARG1 begins with space(s), however, as
-dnl we issue a warning, hopefully the user will fix it...
-ifelse(defn(`_ARG1_'), `', `',
- defn(`_ARG1_'), `LDAP', `',
- `ifelse(index(_ARG1_, `sequence '), `0', `',
- `ifelse(index(_ARG1_, _ATMPF_), `-1',
- `errprint(`*** WARNING: missing -T'_ATMPF_` in first argument of FEATURE(`ldap_routing')
-')
- define(`_ABP_', index(_ARG1_, ` '))
- define(`_NARG1_', `substr(_ARG1_, 0, _ABP_) -T'_ATMPF_` substr(_ARG1_, _ABP_)')
- ')
- ')
- ')
-ifelse(defn(`_ARG2_'), `', `',
- defn(`_ARG2_'), `LDAP', `',
- `ifelse(index(_ARG2_, `sequence '), `0', `',
- `ifelse(index(_ARG2_, _ATMPF_), `-1',
- `errprint(`*** WARNING: missing -T'_ATMPF_` in second argument of FEATURE(`ldap_routing')
-')
- define(`_ABP_', index(_ARG2_, ` '))
- define(`_NARG2_', `substr(_ARG2_, 0, _ABP_) -T'_ATMPF_` substr(_ARG2_, _ABP_)')
- ')
- ')
- ')
-
LOCAL_CONFIG
# LDAP routing maps
Kldapmh ifelse(len(X`'_ARG1_), `1',
`ldap -1 -T<TMPF> -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
- defn(`_NARG1_'), `', `_ARG1_', `_NARG1_')
+ `_ARG1_')
Kldapmra ifelse(len(X`'_ARG2_), `1',
`ldap -1 -T<TMPF> -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
- defn(`_NARG2_'), `', `_ARG2_', `_NARG2_')
+ `_ARG2_')

7
sendmail.spec
View File

@ -14,7 +14,7 @@
Summary: A widely used Mail Transport Agent (MTA) Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail Name: sendmail
Version: 8.14.4 Version: 8.14.4
Release: 15%{?dist} Release: 16%{?dist}
License: Sendmail License: Sendmail
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.sendmail.org/ URL: http://www.sendmail.org/
@ -644,9 +644,12 @@ exit 0
%changelog %changelog
* Mon Nov 08 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-15 * Mon Nov 08 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-16
- fix m4 ldap routing macro, backport from 8.14.5.Alpha0, (#650366) - fix m4 ldap routing macro, backport from 8.14.5.Alpha0, (#650366)
* Wed Sep 29 2010 jkeating - 8.14.4-15
- Rebuilt for gcc bug 634757
* Fri Sep 24 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-14 * Fri Sep 24 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.4-14
- fix MAXHOSTNAMELEN (#485380) - fix MAXHOSTNAMELEN (#485380)