diff options
Diffstat (limited to 'contrib/sendmail/libmilter')
| -rw-r--r-- | contrib/sendmail/libmilter/comm.c | 3 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/engine.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/listener.c | 9 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/signal.c | 7 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/sm_gethost.c | 7 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/smfi.c | 3 |
6 files changed, 21 insertions, 12 deletions
diff --git a/contrib/sendmail/libmilter/comm.c b/contrib/sendmail/libmilter/comm.c index 552e7e4..accb956 100644 --- a/contrib/sendmail/libmilter/comm.c +++ b/contrib/sendmail/libmilter/comm.c @@ -9,12 +9,13 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: comm.c,v 8.65 2004/07/07 21:41:30 ca Exp $") +SM_RCSID("@(#)$Id: comm.c,v 8.66 2004/08/20 20:38:35 ca Exp $") #include "libmilter.h" #include <sm/errstring.h> #include <sys/uio.h> +static ssize_t retry_writev __P((socket_t, struct iovec *, int, struct timeval *)); static size_t Maxdatasize = MILTER_MAX_DATA_SIZE; #if _FFR_MAXDATASIZE diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c index 66ed992..eeeb2c5 100644 --- a/contrib/sendmail/libmilter/engine.c +++ b/contrib/sendmail/libmilter/engine.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: engine.c,v 8.119 2003/12/02 18:53:57 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.120 2004/10/20 21:09:00 ca Exp $") #include "libmilter.h" @@ -347,6 +347,7 @@ mi_engine(ctx) ctx->ctx_state = curstate; } arg.a_idx = cmds[i].cm_macros; + call_abort = ST_IN_MAIL(curstate); /* call function to deal with command */ r = (*f)(&arg); @@ -361,7 +362,6 @@ mi_engine(ctx) break; } - call_abort = ST_IN_MAIL(curstate); if (r == SMFIS_ACCEPT) { /* accept mail, no further actions taken */ diff --git a/contrib/sendmail/libmilter/listener.c b/contrib/sendmail/libmilter/listener.c index ee88f23..adecc5a 100644 --- a/contrib/sendmail/libmilter/listener.c +++ b/contrib/sendmail/libmilter/listener.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: listener.c,v 8.109 2004/02/04 22:55:59 ca Exp $") +SM_RCSID("@(#)$Id: listener.c,v 8.111 2004/09/20 21:11:15 msk Exp $") /* ** listener.c -- threaded network listener @@ -32,6 +32,7 @@ static SOCKADDR_LEN_T L_socksize; static socket_t listenfd = INVALID_SOCKET; static socket_t mi_milteropen __P((char *, int, bool, char *)); +static void *mi_thread_handle_wrapper __P((void *)); /* ** MI_OPENSOCKET -- create the socket where this filter and the MTA will meet @@ -88,6 +89,7 @@ mi_opensocket(conn, backlog, dbg, rmsocket, smfi) return MI_FAILURE; } #endif /* !SM_CONF_POLL */ + (void) smutex_unlock(&L_Mutex); return MI_SUCCESS; } @@ -553,7 +555,7 @@ mi_milteropen(conn, backlog, rmsocket, name) ** results from mi_handle_session() */ -void * +static void * mi_thread_handle_wrapper(arg) void *arg; { @@ -722,7 +724,6 @@ mi_listener(conn, dbg, smfi, timeout, backlog) return MI_FAILURE; clilen = L_socksize; - (void) smutex_unlock(&L_Mutex); while ((mistop = mi_stop()) == MILTER_CONT) { (void) smutex_lock(&L_Mutex); diff --git a/contrib/sendmail/libmilter/signal.c b/contrib/sendmail/libmilter/signal.c index eed8b7c..d55ab57 100644 --- a/contrib/sendmail/libmilter/signal.c +++ b/contrib/sendmail/libmilter/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: signal.c,v 8.41 2003/11/19 00:25:20 ca Exp $") +SM_RCSID("@(#)$Id: signal.c,v 8.42 2004/08/20 21:10:30 ca Exp $") #include "libmilter.h" @@ -21,6 +21,9 @@ static smutex_t M_Mutex; static int MilterStop = MILTER_CONT; +static void *mi_signal_thread __P((void *)); +static int mi_spawn_signal_thread __P((char *)); + /* ** MI_STOP -- return value of MilterStop ** diff --git a/contrib/sendmail/libmilter/sm_gethost.c b/contrib/sendmail/libmilter/sm_gethost.c index 1714741..5706b89 100644 --- a/contrib/sendmail/libmilter/sm_gethost.c +++ b/contrib/sendmail/libmilter/sm_gethost.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2001, 2004 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,12 +9,13 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: sm_gethost.c,v 8.26 2001/09/11 04:04:45 gshapiro Exp $") +SM_RCSID("@(#)$Id: sm_gethost.c,v 8.27 2004/08/20 21:12:37 ca Exp $") #include <sendmail.h> #if NETINET || NETINET6 # include <arpa/inet.h> #endif /* NETINET || NETINET6 */ +#include "libmilter.h" /* ** MI_GETHOSTBY{NAME,ADDR} -- compatibility routines for gethostbyXXX @@ -29,6 +30,8 @@ SM_RCSID("@(#)$Id: sm_gethost.c,v 8.26 2001/09/11 04:04:45 gshapiro Exp $") #if NETINET6 && NEEDSGETIPNODE +static struct hostent *getipnodebyname __P((char *, int, int, int *)); + # ifndef AI_ADDRCONFIG # define AI_ADDRCONFIG 0 /* dummy */ # endif /* ! AI_ADDRCONFIG */ diff --git a/contrib/sendmail/libmilter/smfi.c b/contrib/sendmail/libmilter/smfi.c index ead2c04..d5f54c9 100644 --- a/contrib/sendmail/libmilter/smfi.c +++ b/contrib/sendmail/libmilter/smfi.c @@ -9,11 +9,12 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: smfi.c,v 8.72 2004/05/05 00:07:21 msk Exp $") +SM_RCSID("@(#)$Id: smfi.c,v 8.73 2004/09/20 21:26:57 ca Exp $") #include <sm/varargs.h> #include "libmilter.h" static int smfi_header __P((SMFICTX *, int, int, char *, char *)); +static int myisenhsc __P((const char *, int)); /* for smfi_set{ml}reply, let's be generous. 256/16 should be sufficient */ #define MAXREPLYLEN 980 /* max. length of a reply string */ |
