diff options
Diffstat (limited to 'contrib/sendmail/libmilter')
| -rw-r--r-- | contrib/sendmail/libmilter/Makefile.m4 | 2 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/docs/smfi_opensocket.html | 22 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/docs/smfi_version.html | 24 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/engine.c | 9 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/worker.c | 6 |
5 files changed, 37 insertions, 26 deletions
diff --git a/contrib/sendmail/libmilter/Makefile.m4 b/contrib/sendmail/libmilter/Makefile.m4 index 7902c2f..929ec75 100644 --- a/contrib/sendmail/libmilter/Makefile.m4 +++ b/contrib/sendmail/libmilter/Makefile.m4 @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 8.78 2007/02/05 19:21:29 ca Exp $ +dnl $Id: Makefile.m4,v 8.80 2008/04/08 05:23:44 ca Exp $ include(confBUILDTOOLSDIR`/M4/switch.m4') dnl only required for compilation of EXTRAS diff --git a/contrib/sendmail/libmilter/docs/smfi_opensocket.html b/contrib/sendmail/libmilter/docs/smfi_opensocket.html index 151af07..53ea62b 100644 --- a/contrib/sendmail/libmilter/docs/smfi_opensocket.html +++ b/contrib/sendmail/libmilter/docs/smfi_opensocket.html @@ -2,7 +2,7 @@ <HEAD><TITLE>smfi_opensocket</TITLE></HEAD> <BODY> <!-- -$Id: smfi_opensocket.html,v 1.6 2006/12/21 18:30:35 ca Exp $ +$Id: smfi_opensocket.html,v 1.7 2008/01/31 17:29:33 ca Exp $ --> <H1>smfi_opensocket</H1> @@ -24,16 +24,21 @@ filter. <TABLE border="1" cellspacing=1 cellpadding=4> <TR align="left" valign=top> <TH width="80">Called When</TH> -<TD>Called only from program mainline, before calling -<TT>smfi_main()</TT>.</TD> +<TD>Called only from program mainline, +after calling <TT>smfi_setconn()</TT> and <TT>smfi_register()</TT>, +but before calling <TT>smfi_main()</TT>. +</TD> </TR> <TR align="left" valign=top> <TH width="80">Effects</TH> <TD>smfi_opensocket attempts to create the socket specified previously by a call to <TT>smfi_setconn()</TT> which will be the interface between MTAs -and the filter. This allows the calling application to ensure that the -socket can be created. If this is not called, <TT>smfi_main()</TT> will -do so implicitly. </TD> +and the filter. +This allows the calling application to ensure that the +socket can be created. +If this is not called, +<TT>smfi_main()</TT> will do so implicitly. +</TD> </TR> </TABLE> @@ -58,7 +63,8 @@ do so implicitly. </TD> <LI>The interface socket could not be created for any reason. <LI><TT>rmsocket</TT> was <TT>true</TT>, and either the socket could not be examined, or exists and could not be removed. - <LI><TT>smfi_setconn()</TT> has not been called. + <LI><TT>smfi_setconn()</TT> or <TT>smfi_register()</TT> + have not been called. </UL> Otherwise, it will return MI_SUCCESS </TD> @@ -68,7 +74,7 @@ Otherwise, it will return MI_SUCCESS <HR size="1"> <FONT size="-1"> -Copyright (c) 2003 Sendmail, Inc. and its suppliers. +Copyright (c) 2003, 2008 Sendmail, Inc. and its suppliers. All rights reserved. <BR> By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/docs/smfi_version.html b/contrib/sendmail/libmilter/docs/smfi_version.html index 3c1fc05..6dd451d 100644 --- a/contrib/sendmail/libmilter/docs/smfi_version.html +++ b/contrib/sendmail/libmilter/docs/smfi_version.html @@ -2,7 +2,7 @@ <HEAD><TITLE>smfi_version()</TITLE></HEAD> <BODY> <!-- -$Id: smfi_version.html,v 1.5 2007/03/22 17:30:57 ca Exp $ +$Id: smfi_version.html,v 1.6 2008/05/02 23:06:26 ca Exp $ --> <H1>smfi_version()</H1> @@ -59,24 +59,30 @@ Get the (runtime) version of libmilter. Note: the compile time version of libmilter is available in the macro <CODE>SMFI_VERSION</CODE>. -A milter can check this macro to determine which functions to use -(at compile time via C preprocessor statements). -Using this macro and the -<CODE>smfi_version()</CODE> -function, -a milter can determine at runtime whether it has been (dynamically) -linked against the expected libmilter version. To extract the major and minor version as well as the current patch level from this macro, the macros <CODE>SM_LM_VRS_MAJOR(v)</CODE>, <CODE>SM_LM_VRS_MINOR(v)</CODE>, and <CODE>SM_LM_VRS_PLVL(v)</CODE> can be used, respectively. +A milter can check the +<CODE>SMFI_VERSION</CODE> +macro to determine which functions to use +(at compile time via C preprocessor statements). +Using this macro and the +<CODE>smfi_version()</CODE> +function, +a milter can determine at runtime whether it has been (dynamically) +linked against the expected libmilter version. +Such a function should only compare the major and minor version, +not the patch level, +i.e., the libmilter library will be compatible despite +different patch levels. <HR SIZE="1"> <FONT SIZE="-1"> -Copyright (c) 2006, 2007 Sendmail, Inc. and its suppliers. +Copyright (c) 2006-2008 Sendmail, Inc. and its suppliers. All rights reserved. <BR> By using this file, you agree to the terms and conditions set diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c index a024312..9002a0b 100644 --- a/contrib/sendmail/libmilter/engine.c +++ b/contrib/sendmail/libmilter/engine.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2004, 2006, 2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2004, 2006-2008 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: engine.c,v 8.159 2007/04/23 22:22:50 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.162 2008/02/27 01:34:14 ca Exp $") #include "libmilter.h" @@ -1001,6 +1001,7 @@ st_optionneg(g) (long) ctx->ctx_id, ctx->ctx_mta_pflags, i); return _SMFIS_ABORT; } + fix_stm(ctx); if (ctx->ctx_dbg > 3) sm_dprintf("[%ld] milter_negotiate:" @@ -1725,9 +1726,9 @@ mi_rd_socket_ready (sd) int n; int nerr = 0; #if SM_CONF_POLL - struct pollfd pfd; + struct pollfd pfd; #else /* SM_CONF_POLL */ - fd_set rd_set, exc_set; + fd_set rd_set, exc_set; #endif /* SM_CONF_POLL */ do diff --git a/contrib/sendmail/libmilter/worker.c b/contrib/sendmail/libmilter/worker.c index 0402678..fd4b66e 100644 --- a/contrib/sendmail/libmilter/worker.c +++ b/contrib/sendmail/libmilter/worker.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2003-2004, 2007 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -11,7 +11,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: worker.c,v 8.9 2006/12/18 18:26:51 ca Exp $") +SM_RCSID("@(#)$Id: worker.c,v 8.10 2007/12/03 22:06:05 ca Exp $") #include "libmilter.h" @@ -263,8 +263,6 @@ mi_pool_controller_init() return MI_FAILURE; } - POOL_LEV_DPRINTF(4, ("PIPE r=[%d] w=[%d]", RD_PIPE, WR_PIPE)); - (void) smutex_init(&Tskmgr.tm_w_mutex); (void) scond_init(&Tskmgr.tm_w_cond); |
