diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2006-03-22 16:40:03 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2006-03-22 16:40:03 +0000 |
| commit | 7ec7c93b1895442f91f42eb78a2c77ca31b7b8d8 (patch) | |
| tree | f2f677119f6e5ae9bb59afb38a21beeb680e5dce /contrib/sendmail/src/map.c | |
| parent | e66460b8942afc349793d018627b403bbd4eaad0 (diff) | |
| parent | ef9770707c0f88e94a0c4a409f8fb74cea250716 (diff) | |
| download | FreeBSD-src-7ec7c93b1895442f91f42eb78a2c77ca31b7b8d8.zip FreeBSD-src-7ec7c93b1895442f91f42eb78a2c77ca31b7b8d8.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r157001,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/sendmail/src/map.c')
| -rw-r--r-- | contrib/sendmail/src/map.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/contrib/sendmail/src/map.c b/contrib/sendmail/src/map.c index 056d76e..ee3fbb7 100644 --- a/contrib/sendmail/src/map.c +++ b/contrib/sendmail/src/map.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: map.c,v 8.669 2005/02/09 01:46:35 ca Exp $") +SM_RCSID("@(#)$Id: map.c,v 8.671 2005/10/25 17:55:50 ca Exp $") #if LDAPMAP # include <sm/ldap.h> @@ -3493,7 +3493,7 @@ ldapmap_lookup(map, name, av, statp) char *result = NULL; SM_RPOOL_T *rpool; SM_LDAP_STRUCT *lmap = NULL; - char keybuf[MAXNAME + 1]; + char keybuf[MAXKEY]; if (tTd(38, 20)) sm_dprintf("ldapmap_lookup(%s, %s)\n", map->map_mname, name); @@ -3551,6 +3551,10 @@ ldapmap_lookup(map, name, av, statp) flags |= SM_LDAP_SINGLEMATCH; if (bitset(MF_MATCHONLY, map->map_mflags)) flags |= SM_LDAP_MATCHONLY; +# if _FFR_LDAP_SINGLEDN + if (bitset(MF_SINGLEDN, map->map_mflags)) + flags |= SM_LDAP_SINGLEDN; +# endif /* _FFR_LDAP_SINGLEDN */ /* Create an rpool for search related memory usage */ rpool = sm_rpool_new_x(NULL); @@ -3911,6 +3915,12 @@ ldapmap_parseargs(map, args) map->map_mflags |= MF_SINGLEMATCH; break; +# if _FFR_LDAP_SINGLEDN + case '2': + map->map_mflags |= MF_SINGLEDN; + break; +# endif /* _FFR_LDAP_SINGLEDN */ + /* args stolen from ldapsearch.c */ case 'R': /* don't auto chase referrals */ # ifdef LDAP_REFERRALS |
