This commit was generated by cvs2svn to compensate for changes in r168515,

which included commits to RCS files with non-trunk default branches.

1 files changed, 2 insertions, 29 deletions

diff --git a/contrib/sendmail/include/libmilter/milter.h b/contrib/sendmail/include/libmilter/milter.h
index 5178f75..061a4db 100644
--- a/contrib/sendmail/include/libmilter/milter.h
+++ b/contrib/sendmail/include/libmilter/milter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2003 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1999-2003, 2006 Sendmail, Inc. and its suppliers.
  *	All rights reserved.
  *
  * By using this file, you agree to the terms and conditions set
@@ -7,7 +7,7 @@
  * the sendmail distribution.
  *
  *
- *	$Id: milter.h,v 8.39 2003/12/02 00:21:42 msk Exp $
+ *	$Id: milter.h,v 8.41 2006/05/22 23:23:55 ca Exp $
  */
 
 /*
@@ -25,31 +25,4 @@
 typedef pthread_t	sthread_t;
 typedef int		socket_t;
 
-# define MAX_MACROS_ENTRIES	5	/* max size of macro pointer array */
-
-/*
-**  context for milter
-**  implementation hint:
-**  macros are stored in mac_buf[] as sequence of:
-**  macro_name \0 macro_value
-**  (just as read from the MTA)
-**  mac_ptr is a list of pointers into mac_buf to the beginning of each
-**  entry, i.e., macro_name, macro_value, ...
-*/
-
-struct smfi_str
-{
-	sthread_t	ctx_id;		/* thread id */
-	socket_t	ctx_sd;		/* socket descriptor */
-	int		ctx_dbg;	/* debug level */
-	time_t		ctx_timeout;	/* timeout */
-	int		ctx_state;	/* state */
-	smfiDesc_ptr	ctx_smfi;	/* filter description */
-	unsigned long	ctx_pflags;	/* protocol flags */
-	char		**ctx_mac_ptr[MAX_MACROS_ENTRIES];
-	char		*ctx_mac_buf[MAX_MACROS_ENTRIES];
-	char		*ctx_reply;	/* reply code */
-	void		*ctx_privdata;	/* private data */
-};
-
 #endif /* ! _LIBMILTER_MILTER_H */