X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=da02701f50ba34fc587296a4088f566b88f9f782;hp=5760356e3c9b2ff37b87e794e8544371a4bba751;hb=1bb1f6c3f38b05060bf699ea2743f7386889bf63;hpb=557d33aeabe46e9a0411959703f721c5b9ce2ae9

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 5760356..da02701 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -18,8 +18,8 @@
 #endif
 
 #ifdef CYRUS_SASL
-#include <sasl.h>
-#include <saslutil.h>
+#include <sasl/sasl.h>
+#include <sasl/saslutil.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -60,14 +60,14 @@
 /*
  * these codes must all be different!
  */
-#define	SM_OPEN	 90      /* Changed from 30 in case of nameserver flakiness */
+#define	SM_OPEN	 300      /* Changed to 5 minutes to comply with a SHOULD in RFC 1123 */
 #define	SM_HELO	 20
 #define	SM_RSET	 15
-#define	SM_MAIL	 40
-#define	SM_RCPT	120
-#define	SM_DATA	 20
-#define	SM_TEXT	150
-#define	SM_DOT	180
+#define	SM_MAIL	 301      /* changed to 5 minutes and a second (for uniqueness), see above */
+#define	SM_RCPT	 302      /* see above */
+#define	SM_DATA	 120      /* see above */
+#define	SM_TEXT	180	/* see above */
+#define	SM_DOT	600	/* see above */
 #define	SM_QUIT	 30
 #define	SM_CLOS	 10
 #define	SM_AUTH  45
@@ -502,15 +502,6 @@ rclient (char *server, char *protocol, char *service)
     return NOTOK;
 }
 
-#ifdef CYRUS_SASL
-#include <sasl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <errno.h>
-#endif /* CYRUS_SASL */
-
 int
 sm_winit (int mode, char *from)
 {
@@ -968,7 +959,7 @@ bad_data:
     free (cp);
 
     {
-#ifdef HAVE_ST_BLKSIZE
+#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
 	struct stat st;
 
 	if (fstat (fileno (sm_wfp), &st) == NOTOK || (cc = st.st_blksize) < BUFSIZ)