diff options
author | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:30:00 +0000 |
---|---|---|
committer | gshapiro <gshapiro@FreeBSD.org> | 2005-02-14 02:30:00 +0000 |
commit | 59c6e3524b67debe90b8e7c57d4c84e7ea08a463 (patch) | |
tree | 43066d8dda87f5c4bb03cd123890866bdda87d3d /contrib/sendmail/src/map.c | |
parent | 142aa8a840a9a8f0bb93e21d623560b94228bb22 (diff) | |
parent | 9883351c45502bc6aec878ba11d8ef5fe1843397 (diff) | |
download | FreeBSD-src-59c6e3524b67debe90b8e7c57d4c84e7ea08a463.zip FreeBSD-src-59c6e3524b67debe90b8e7c57d4c84e7ea08a463.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r141858,
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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/sendmail/src/map.c b/contrib/sendmail/src/map.c index ad9fa70..46bf15f 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.664 2004/06/28 17:46:13 ca Exp $") +SM_RCSID("@(#)$Id: map.c,v 8.666 2004/08/17 16:50:19 gshapiro Exp $") #if LDAPMAP # include <sm/ldap.h> @@ -4431,7 +4431,10 @@ ldapmap_parseargs(map, args) } } lmap->ldap_attr[i] = NULL; + + /* Set in case needed in future code */ attrssetup = true; + if (recurse && !normalseen) { syserr("LDAP recursion requested in %s but no returnable attribute given", @@ -6470,6 +6473,9 @@ struct regex_map char *regex_delim; /* move to type MAP */ }; +static int parse_fields __P((char *, int *, int, int)); +static char *regex_map_rewrite __P((MAP *, const char*, size_t, char **)); + static int parse_fields(s, ibuf, blen, nr_substrings) char *s; |