Import sendmail 8.12.2

1 files changed, 6 insertions, 43 deletions

diff --git a/contrib/sendmail/src/sfsasl.h b/contrib/sendmail/src/sfsasl.h
index b276e27..c75418a 100644
--- a/contrib/sendmail/src/sfsasl.h
+++ b/contrib/sendmail/src/sfsasl.h
@@ -6,55 +6,18 @@
  * forth in the LICENSE file which can be found at the top level of
  * the sendmail distribution.
  *
- *	$Id: sfsasl.h,v 8.13.4.4 2000/07/18 18:44:51 gshapiro Exp $"
+ *	$Id: sfsasl.h,v 8.17 2000/09/19 21:30:49 ca Exp $"
  */
 
 #ifndef SFSASL_H
 # define SFSASL_H
 
-# if SFIO
-#  include <sfio.h>
-# endif /* SFIO */
-
-# if SASL
-#  if SFIO
-
-/* sf discipline to add sasl */
-typedef struct _sasldisc
-{
-	Sfdisc_t	disc;
-	sasl_conn_t	*conn;
-} Sasldisc_t;
-
-extern int	sfdcsasl __P((Sfio_t *, Sfio_t *, sasl_conn_t *));
-
-#  endif /* SFIO */
-# endif /* SASL */
+#if SASL
+extern int	sfdcsasl __P((SM_FILE_T **, SM_FILE_T **, sasl_conn_t *));
+#endif /* SASL */
 
 # if STARTTLS
-#  if SFIO
-
-/* sf discipline to add tls */
-typedef struct _tlsdisc
-{
-	Sfdisc_t	disc;
-	SSL		*con;
-} Tlsdisc_t;
-
-extern int	sfdctls __P((Sfio_t *, Sfio_t *, SSL *));
-
-#  else /* SFIO */
-#   if _FFR_TLS_TOREK
-
-typedef struct tls_conn
-{
-	FILE		*fp;	/* original FILE * */
-	SSL		*con;	/* SSL context */
-} Tlsdisc_t;
-
-extern int	sfdctls __P((FILE **, FILE **, SSL *));
-
-#   endif /* _FFR_TLS_TOREK */
-#  endif /* SFIO */
+extern int	sfdctls __P((SM_FILE_T **, SM_FILE_T **, SSL *));
 # endif /* STARTTLS */
+
 #endif /* ! SFSASL_H */