X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8c2d4ff84c4db1eb59d3a3fb007803f82c4906b9..8699f1cc:/mts/smtp/smtp.c?ds=sidebyside

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 1b92db9f..c7d95073 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -13,7 +13,7 @@
 #include <h/netsec.h>
 
 #include <sys/socket.h>
-#include "../../sbr/base64.h"
+#include "sbr/base64.h"
 
 /*
  * This module implements an interface to SendMail very similar
@@ -307,9 +307,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
 	return sm_ierror ("no pipes");
     }
 
-    for (i = 0; (sm_child = fork ()) == NOTOK && i < 5; i++)
-	sleep (5);
-
+    sm_child = fork();
     switch (sm_child) {
 	case NOTOK: 
 	    close (pdo[0]);
@@ -341,7 +339,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
 	    execvp (sendmail, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (sendmail);
-	    _exit (-1);		/* NOTREACHED */
+	    _exit(1);		/* NOTREACHED */
 
 	default: 
 	    SIGNAL (SIGPIPE, SIG_IGN);
@@ -535,14 +533,14 @@ sm_wtxt (char *buffer, int len)
 
     result = sm_wstream (buffer, len);
 
-    return (result == NOTOK ? RP_BHST : RP_OK);
+    return result == NOTOK ? RP_BHST : RP_OK;
 }
 
 
 int
 sm_wtend (void)
 {
-    if (sm_wstream ((char *) NULL, 0) == NOTOK)
+    if (sm_wstream(NULL, 0) == NOTOK)
 	return RP_BHST;
 
     switch (smtalk (SM_DOT + 3 * sm_addrs, ".")) {
@@ -634,7 +632,7 @@ sm_end (int type)
 	status = OK;
     }
 
-    return (status ? RP_BHST : RP_OK);
+    return status ? RP_BHST : RP_OK;
 }
 
 
@@ -937,7 +935,7 @@ EHLOset (char *s)
 	}
     }
 
-    return 0;
+    return NULL;
 }
 
 /*