summaryrefslogtreecommitdiff
path: root/usr/src/cmd/sendmail/libmilter/main.c
diff options
context:
space:
mode:
authorJohn Beck <John.Beck@Sun.COM>2010-01-06 13:22:51 -0800
committerJohn Beck <John.Beck@Sun.COM>2010-01-06 13:22:51 -0800
commite9af4bc0b1cc30cea75d6ad4aa2fde97d985e9be (patch)
tree6a7ad97561f2580625546f56c063c89ebb3b92dd /usr/src/cmd/sendmail/libmilter/main.c
parent5f8171005a0c33f3c67f7da52d41c2362c3fd891 (diff)
downloadillumos-joyent-e9af4bc0b1cc30cea75d6ad4aa2fde97d985e9be.tar.gz
6913961 upgrade sendmail to 8.14.4
6790772 Array overrun in sendmail
Diffstat (limited to 'usr/src/cmd/sendmail/libmilter/main.c')
-rw-r--r--usr/src/cmd/sendmail/libmilter/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/cmd/sendmail/libmilter/main.c b/usr/src/cmd/sendmail/libmilter/main.c
index b8609cd785..d6e727959d 100644
--- a/usr/src/cmd/sendmail/libmilter/main.c
+++ b/usr/src/cmd/sendmail/libmilter/main.c
@@ -8,10 +8,8 @@
*
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sm/gen.h>
-SM_RCSID("@(#)$Id: main.c,v 8.83 2007/04/23 22:22:50 ca Exp $")
+SM_RCSID("@(#)$Id: main.c,v 8.84 2008/09/02 05:37:06 ca Exp $")
#define _DEFINE 1
#include "libmilter.h"
@@ -54,7 +52,8 @@ 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 ((SM_LM_VRS_MAJOR(smfi->xxfi_version) != SM_LM_VRS_MAJOR(SMFI_VERSION) ||
+ SM_LM_VRS_MINOR(smfi->xxfi_version) != SM_LM_VRS_MINOR(SMFI_VERSION)) &&
smfi->xxfi_version != 2 &&
smfi->xxfi_version != 3 &&
smfi->xxfi_version != 4)