diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:04:21 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2007-11-05 00:04:21 +0000 |
| commit | a2b986fa722f9860a6c56bb5cc724b7e2937d1b7 (patch) | |
| tree | ae6d46e2ddda2d02221479b71fbe8a44dd728c34 /contrib/sendmail/libmilter | |
| parent | f4998c8d83fc6b77320e4da32d3d75730971e3d4 (diff) | |
| download | FreeBSD-src-a2b986fa722f9860a6c56bb5cc724b7e2937d1b7.zip FreeBSD-src-a2b986fa722f9860a6c56bb5cc724b7e2937d1b7.tar.gz | |
Import sendmail 8.14.2
Diffstat (limited to 'contrib/sendmail/libmilter')
| -rw-r--r-- | contrib/sendmail/libmilter/docs/xxfi_unknown.html | 6 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/engine.c | 2 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/listener.c | 2 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/main.c | 2 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/monitor.c | 2 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/smfi.c | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/contrib/sendmail/libmilter/docs/xxfi_unknown.html b/contrib/sendmail/libmilter/docs/xxfi_unknown.html index b1cd38a..0455dfd 100644 --- a/contrib/sendmail/libmilter/docs/xxfi_unknown.html +++ b/contrib/sendmail/libmilter/docs/xxfi_unknown.html @@ -2,7 +2,7 @@ <HEAD><TITLE>xxfi_unknown</TITLE></HEAD> <BODY> <!-- -$Id: xxfi_unknown.html,v 1.3 2006/12/21 18:30:36 ca Exp $ +$Id: xxfi_unknown.html,v 1.4 2007/04/23 16:30:42 ca Exp $ --> <H1>xxfi_unknown</H1> @@ -53,12 +53,12 @@ that is either unknown or not implemented by the MTA. <TR bgcolor="#dddddd"><TH>Return value</TH><TH>Description</TH></TR> <TR valign="top"> <TD>SMFIS_TEMPFAIL</TD> - <TD>Reject this message with a temporary error. + <TD>Reject this command with a temporary error. </TD> </TR> <TR valign="top"> <TD>SMFIS_REJECT</TD> - <TD>Reject this message. + <TD>Reject this command. </TD> </TR> </TABLE> diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c index d7a5a41..a024312 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.157 2007/03/26 18:10:04 ca Exp $") +SM_RCSID("@(#)$Id: engine.c,v 8.159 2007/04/23 22:22:50 ca Exp $") #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/listener.c b/contrib/sendmail/libmilter/listener.c index 62d5eed..6e68ae5 100644 --- a/contrib/sendmail/libmilter/listener.c +++ b/contrib/sendmail/libmilter/listener.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: listener.c,v 8.122 2006/11/02 17:54:44 ca Exp $") +SM_RCSID("@(#)$Id: listener.c,v 8.124 2007/04/23 22:22:50 ca Exp $") /* ** listener.c -- threaded network listener diff --git a/contrib/sendmail/libmilter/main.c b/contrib/sendmail/libmilter/main.c index c8d98c4..faff4f8 100644 --- a/contrib/sendmail/libmilter/main.c +++ b/contrib/sendmail/libmilter/main.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: main.c,v 8.81 2006/11/02 18:31:43 ca Exp $") +SM_RCSID("@(#)$Id: main.c,v 8.83 2007/04/23 22:22:50 ca Exp $") #define _DEFINE 1 #include "libmilter.h" diff --git a/contrib/sendmail/libmilter/monitor.c b/contrib/sendmail/libmilter/monitor.c index 3d23f0c..366cf75 100644 --- a/contrib/sendmail/libmilter/monitor.c +++ b/contrib/sendmail/libmilter/monitor.c @@ -8,6 +8,8 @@ * */ +#include <sm/gen.h> +SM_RCSID("@(#)$Id: monitor.c,v 8.7 2007/04/23 16:26:28 ca Exp $") #include "libmilter.h" #if _FFR_THREAD_MONITOR diff --git a/contrib/sendmail/libmilter/smfi.c b/contrib/sendmail/libmilter/smfi.c index 856c4a9..138623e 100644 --- a/contrib/sendmail/libmilter/smfi.c +++ b/contrib/sendmail/libmilter/smfi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2007 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: smfi.c,v 8.82 2007/01/20 06:37:19 ca Exp $") +SM_RCSID("@(#)$Id: smfi.c,v 8.83 2007/04/23 16:44:39 ca Exp $") #include <sm/varargs.h> #include "libmilter.h" @@ -884,6 +884,6 @@ smfi_version(major, minor, patchlevel) if (minor != NULL) *minor = SM_LM_VRS_MINOR(SMFI_VERSION); if (patchlevel != NULL) - *patchlevel = SM_LM_VRS_MINOR(SMFI_VERSION); + *patchlevel = SM_LM_VRS_PLVL(SMFI_VERSION); return MI_SUCCESS; } |
