| parseaddr.c (110560) | parseaddr.c (111823) |
|---|---|
| 1/* | 1/* |
| 2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. | 2 * Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers. |
| 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#include <sendmail.h> 15 | 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 5 * Copyright (c) 1988, 1993 6 * The Regents of the University of California. All rights reserved. 7 * 8 * By using this file, you agree to the terms and conditions set 9 * forth in the LICENSE file which can be found at the top level of 10 * the sendmail distribution. 11 * 12 */ 13 14#include <sendmail.h> 15 |
| 16SM_RCSID("@(#)$Id: parseaddr.c,v 8.359.2.3 2002/09/26 23:03:39 gshapiro Exp $") | 16SM_RCSID("@(#)$Id: parseaddr.c,v 8.359.2.4 2003/01/18 00:41:48 gshapiro Exp $") |
| 17 18static void allocaddr __P((ADDRESS *, int, char *, ENVELOPE *)); 19static int callsubr __P((char**, int, ENVELOPE *)); 20static char *map_lookup __P((STAB *, char *, char **, int *, ENVELOPE *)); 21static ADDRESS *buildaddr __P((char **, ADDRESS *, int, ENVELOPE *)); 22static bool hasctrlchar __P((register char *, bool, bool)); 23 24/* replacement for illegal characters in addresses */ --- 2479 unchanged lines hidden (view full) --- 2504 /* 2505 ** Do a heuristic crack of this name to extract any comment info. 2506 ** This will leave the name as a comment and a $g macro. 2507 */ 2508 2509 if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags)) 2510 fancy = "\201g"; 2511 else | 17 18static void allocaddr __P((ADDRESS *, int, char *, ENVELOPE *)); 19static int callsubr __P((char**, int, ENVELOPE *)); 20static char *map_lookup __P((STAB *, char *, char **, int *, ENVELOPE *)); 21static ADDRESS *buildaddr __P((char **, ADDRESS *, int, ENVELOPE *)); 22static bool hasctrlchar __P((register char *, bool, bool)); 23 24/* replacement for illegal characters in addresses */ --- 2479 unchanged lines hidden (view full) --- 2504 /* 2505 ** Do a heuristic crack of this name to extract any comment info. 2506 ** This will leave the name as a comment and a $g macro. 2507 */ 2508 2509 if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags)) 2510 fancy = "\201g"; 2511 else |
| 2512 fancy = crackaddr(name); | 2512 fancy = crackaddr(name, e); |
| 2513 2514 /* 2515 ** Turn the name into canonical form. 2516 ** Normally this will be RFC 822 style, i.e., "user@domain". 2517 ** If this only resolves to "user", and the "C" flag is 2518 ** specified in the sending mailer, then the sender's 2519 ** domain will be appended. 2520 */ --- 664 unchanged lines hidden --- | 2513 2514 /* 2515 ** Turn the name into canonical form. 2516 ** Normally this will be RFC 822 style, i.e., "user@domain". 2517 ** If this only resolves to "user", and the "C" flag is 2518 ** specified in the sending mailer, then the sender's 2519 ** domain will be appended. 2520 */ --- 664 unchanged lines hidden --- |