X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;fp=mts%2Fsmtp%2Fsmtp.c;h=e7a64a0c0981f2bcc341f2aa09370245a6039c26;hp=470d72de9153289ab2f9da775d55e74880c91f86;hb=58fb17ea4d6c3f0178d75fbd05c3e1d9a2997313;hpb=16fe088f7a4b204f3af67a1a378796b1bfe96694

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 470d72d..e7a64a0 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -441,12 +441,12 @@ sendmail_init (char *client, char *server, int watch, int verbose,
     if (client == NULL || *client == '\0')
 	client = "localhost";
 
-#ifdef CYRUS_SASL
+#if defined(CYRUS_SASL) || defined(TLS_SUPPORT)
     sasl_inbuffer = malloc(SASL_MAXRECVBUF);
     if (!sasl_inbuffer)
 	return sm_ierror("Unable to allocate %d bytes for read buffer",
 			 SASL_MAXRECVBUF);
-#endif /* CYRUS_SASL */
+#endif /* CYRUS_SASL || TLS_SUPPORT */
 
     if (pipe (pdi) == NOTOK)
 	return sm_ierror ("no pipes");
@@ -1572,6 +1572,7 @@ sm_fgetc(FILE *f)
 	 * encryption working
 	 */
 
+#ifdef CYRUS_SASL
 	if (sasl_complete == 0 || sasl_ssf == 0) {
 	    retbuf = tmpbuf;
 	    retbufsize = cc;
@@ -1585,6 +1586,10 @@ sm_fgetc(FILE *f)
 		return -2;
 	    }
 	}
+#else /* ! CYRUS_SASL */
+	retbuf = tmpbuf;
+	retbufsize = cc;
+#endif /* CYRUS_SASL */
     }
 
     if (retbufsize > SASL_MAXRECVBUF) {