Deleted Added
full compact
alias.c (98121) alias.c (120256)
1/*
2 * Copyright (c) 1998-2002 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
1/*
2 * Copyright (c) 1998-2002 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
16SM_RCSID("@(#)$Id: alias.c,v 8.214 2002/05/24 20:50:16 gshapiro Exp $")
16SM_RCSID("@(#)$Id: alias.c,v 8.214.2.1 2003/07/28 17:47:55 ca Exp $")
17
18#define SEPARATOR ':'
19# define ALIAS_SPEC_SEPARATORS " ,/:"
20
21static MAP *AliasFileMap = NULL; /* the actual aliases.files map */
22static int NAliasFileMaps; /* the number of entries in AliasFileMap */
23
24static char *aliaslookup __P((char *, int *, char *));

--- 64 unchanged lines hidden (view full) ---

89
90 if (e->e_sender != NULL && *e->e_sender == '\0')
91 {
92 /* Look for owner of alias */
93 (void) sm_strlcpyn(obuf, sizeof obuf, 2, "owner-", a->q_user);
94 if (aliaslookup(obuf, &status, a->q_host) != NULL)
95 {
96 if (LogLevel > 8)
17
18#define SEPARATOR ':'
19# define ALIAS_SPEC_SEPARATORS " ,/:"
20
21static MAP *AliasFileMap = NULL; /* the actual aliases.files map */
22static int NAliasFileMaps; /* the number of entries in AliasFileMap */
23
24static char *aliaslookup __P((char *, int *, char *));

--- 64 unchanged lines hidden (view full) ---

89
90 if (e->e_sender != NULL && *e->e_sender == '\0')
91 {
92 /* Look for owner of alias */
93 (void) sm_strlcpyn(obuf, sizeof obuf, 2, "owner-", a->q_user);
94 if (aliaslookup(obuf, &status, a->q_host) != NULL)
95 {
96 if (LogLevel > 8)
97 syslog(LOG_WARNING,
97 sm_syslog(LOG_WARNING, e->e_id,
98 "possible spam from <> to list: %s, redirected to %s\n",
99 a->q_user, obuf);
100 a->q_user = sm_rpool_strdup_x(e->e_rpool, obuf);
101 }
102 }
103#endif /* _FFR_REDIRECTEMPTY */
104
105 p = aliaslookup(a->q_user, &status, a->q_host);

--- 909 unchanged lines hidden ---
98 "possible spam from <> to list: %s, redirected to %s\n",
99 a->q_user, obuf);
100 a->q_user = sm_rpool_strdup_x(e->e_rpool, obuf);
101 }
102 }
103#endif /* _FFR_REDIRECTEMPTY */
104
105 p = aliaslookup(a->q_user, &status, a->q_host);

--- 909 unchanged lines hidden ---