| srvrsmtp.c (159609) | srvrsmtp.c (161389) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2006 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#if MILTER 16# include <libmilter/mfapi.h> 17# include <libmilter/mfdef.h> 18#endif /* MILTER */ 19 | 1/* 2 * Copyright (c) 1998-2006 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#if MILTER 16# include <libmilter/mfapi.h> 17# include <libmilter/mfdef.h> 18#endif /* MILTER */ 19 |
| 20SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.924.2.2 2006/05/31 20:56:37 ca Exp $") | 20SM_RCSID("@(#)$Id: srvrsmtp.c,v 8.924.2.5 2006/07/07 16:29:39 ca Exp $") |
| 21 22#include <sm/time.h> 23#include <sm/fdset.h> 24 25#if SASL || STARTTLS 26# include "sfsasl.h" 27#endif /* SASL || STARTTLS */ 28#if SASL --- 817 unchanged lines hidden (view full) --- 846 } 847 848 if (smtp.sm_milterlist && smtp.sm_milterize && 849 !bitset(EF_DISCARD, e->e_flags)) 850 { 851 char state; 852 char *response; 853 | 21 22#include <sm/time.h> 23#include <sm/fdset.h> 24 25#if SASL || STARTTLS 26# include "sfsasl.h" 27#endif /* SASL || STARTTLS */ 28#if SASL --- 817 unchanged lines hidden (view full) --- 846 } 847 848 if (smtp.sm_milterlist && smtp.sm_milterize && 849 !bitset(EF_DISCARD, e->e_flags)) 850 { 851 char state; 852 char *response; 853 |
| 854 response = milter_connect(peerhostname, RealHostAddr, 855 e, &state); | 854 q = macvalue(macid("{client_name}"), e); 855 SM_ASSERT(q != NULL); 856 response = milter_connect(q, RealHostAddr, e, &state); |
| 856 switch (state) 857 { 858 case SMFIR_REPLYCODE: /* REPLYCODE shouldn't happen */ 859 case SMFIR_REJECT: 860 if (MilterLogLevel > 3) 861 sm_syslog(LOG_INFO, e->e_id, 862 "Milter: connect: host=%s, addr=%s, rejecting commands", 863 peerhostname, --- 3879 unchanged lines hidden --- | 857 switch (state) 858 { 859 case SMFIR_REPLYCODE: /* REPLYCODE shouldn't happen */ 860 case SMFIR_REJECT: 861 if (MilterLogLevel > 3) 862 sm_syslog(LOG_INFO, e->e_id, 863 "Milter: connect: host=%s, addr=%s, rejecting commands", 864 peerhostname, --- 3879 unchanged lines hidden --- |