diff options
| author | peter <peter@FreeBSD.org> | 1999-01-12 12:26:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-01-12 12:26:57 +0000 |
| commit | 2a7bd60222ce3c09208a265ad3a5f1490ccb6768 (patch) | |
| tree | 8d45e99e5e320ab4e55408b355a04b2be475a0ed /contrib/sendmail/src/parseaddr.c | |
| parent | 329949050501501c130d09efc3aee7c78c6d4f9c (diff) | |
| download | FreeBSD-src-2a7bd60222ce3c09208a265ad3a5f1490ccb6768.zip FreeBSD-src-2a7bd60222ce3c09208a265ad3a5f1490ccb6768.tar.gz | |
Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)
Obtained from: ftp.sendamil.org
Diffstat (limited to 'contrib/sendmail/src/parseaddr.c')
| -rw-r--r-- | contrib/sendmail/src/parseaddr.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/contrib/sendmail/src/parseaddr.c b/contrib/sendmail/src/parseaddr.c index c3c89b4..86762fd 100644 --- a/contrib/sendmail/src/parseaddr.c +++ b/contrib/sendmail/src/parseaddr.c @@ -11,7 +11,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)parseaddr.c 8.153 (Berkeley) 6/24/98"; +static char sccsid[] = "@(#)parseaddr.c 8.156 (Berkeley) 10/27/1998"; #endif /* not lint */ # include "sendmail.h" @@ -67,7 +67,6 @@ parseaddr(addr, a, flags, delim, delimptr, e) auto char *delimptrbuf; bool queueup; char pvpbuf[PSBUFSIZE]; - extern ADDRESS *buildaddr __P((char **, ADDRESS *, int, ENVELOPE *)); extern bool invalidaddr __P((char *, char *)); extern void allocaddr __P((ADDRESS *, int, char *)); @@ -1450,8 +1449,17 @@ map_lookup(map, key, argvect, pstat, e) /* XXX should try to auto-open the map here */ if (tTd(60, 1)) - printf("map_lookup(%s, %s) => ", - map->s_name, key); + { + printf("map_lookup(%s, %s", map->s_name, key); + if (tTd(60, 5)) + { + int i; + + for (i = 0; argvect[i] != NULL; i++) + printf(", %%%d=%s", i, argvect[i]); + } + printf(") => "); + } replac = (*map->s_map.map_class->map_lookup)(&map->s_map, key, argvect, &stat); if (tTd(60, 1)) @@ -1553,7 +1561,7 @@ buildaddr(tv, a, flags, e) static MAILER errormailer; static char *discardargv[] = { "DISCARD", NULL }; static char *errorargv[] = { "ERROR", NULL }; - static char ubuf[MAXNAME + 1]; + static char ubuf[MAXNAME + 2]; if (tTd(24, 5)) { |
