diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-04-23 22:11:27 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2007-04-23 22:11:27 +0000 |
| commit | 6d13d6cb739e010a9bd6b04501819a1a3d7f4ae7 (patch) | |
| tree | e9cd187815949390819bfc6cf63324db245eaa8a /contrib | |
| parent | d0cef73d40a409e3116f095b83633b1364e95741 (diff) | |
| download | src-6d13d6cb739e010a9bd6b04501819a1a3d7f4ae7.tar.gz src-6d13d6cb739e010a9bd6b04501819a1a3d7f4ae7.zip | |
Bring in sendmail.org code from the future 8.14.2 release which restores
ABI compatibility to users of the libmilter.so shared library.
Notes
Notes:
svn path=/vendor/sendmail/dist/; revision=168988
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/sendmail/libmilter/engine.c | 3 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/listener.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/libmilter/main.c | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/contrib/sendmail/libmilter/engine.c b/contrib/sendmail/libmilter/engine.c index a61cf56130c0..f07195d3a8c0 100644 --- a/contrib/sendmail/libmilter/engine.c +++ b/contrib/sendmail/libmilter/engine.c @@ -855,6 +855,7 @@ st_optionneg(g) ; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 4 && (fi_negotiate = g->a_ctx->ctx_smfi->xxfi_negotiate) != NULL) { int r; @@ -1177,6 +1178,7 @@ st_data(g) if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 3 && (fi_data = g->a_ctx->ctx_smfi->xxfi_data) != NULL) return (*fi_data)(g->a_ctx); return SMFIS_CONTINUE; @@ -1310,6 +1312,7 @@ st_unknown(g) if (g == NULL) return _SMFIS_ABORT; if (g->a_ctx->ctx_smfi != NULL && + g->a_ctx->ctx_smfi->xxfi_version > 2 && (fi_unknown = g->a_ctx->ctx_smfi->xxfi_unknown) != NULL) return (*fi_unknown)(g->a_ctx, (const char *) g->a_buf); return SMFIS_CONTINUE; diff --git a/contrib/sendmail/libmilter/listener.c b/contrib/sendmail/libmilter/listener.c index cf98361afa27..f3eff49131bc 100644 --- a/contrib/sendmail/libmilter/listener.c +++ b/contrib/sendmail/libmilter/listener.c @@ -927,9 +927,9 @@ mi_listener(conn, dbg, smfi, timeout, backlog) ctx->ctx_pflags |= SMFIP_NOEOH; if (smfi->xxfi_body == NULL) ctx->ctx_pflags |= SMFIP_NOBODY; - if (smfi->xxfi_data == NULL) + if (smfi->xxfi_version <= 3 || smfi->xxfi_data == NULL) ctx->ctx_pflags |= SMFIP_NODATA; - if (smfi->xxfi_unknown == NULL) + if (smfi->xxfi_version <= 2 || smfi->xxfi_unknown == NULL) ctx->ctx_pflags |= SMFIP_NOUNKNOWN; #if _FFR_WORKERS_POOL diff --git a/contrib/sendmail/libmilter/main.c b/contrib/sendmail/libmilter/main.c index d3150d140cd5..5a661027dbea 100644 --- a/contrib/sendmail/libmilter/main.c +++ b/contrib/sendmail/libmilter/main.c @@ -52,7 +52,10 @@ smfi_register(smfilter) (void) sm_strlcpy(smfi->xxfi_name, smfilter.xxfi_name, len); /* compare milter version with hard coded version */ - if (smfi->xxfi_version != SMFI_VERSION) + if (smfi->xxfi_version != SMFI_VERSION && + smfi->xxfi_version != 2 && + smfi->xxfi_version != 3 && + smfi->xxfi_version != 4) { /* hard failure for now! */ smi_log(SMI_LOG_ERR, |