X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fbd42d09eb251acb237c0137823b97ab4fa1467f..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/mts/smtp/smtp.c?ds=sidebyside

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 8d778e5e..68228ee3 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -40,9 +40,6 @@
  */
 #endif
 
-#define	TRUE	1
-#define	FALSE	0
-
 #define	NBITS ((sizeof (int)) * 8)
 
 /*
@@ -103,9 +100,9 @@ sm_init (char *client, char *server, char *port, int watch, int verbose,
     if (sm_mts == MTS_SMTP)
 	return smtp_init (client, server, port, watch, verbose,
 			  debug, sasl, saslmech, user, oauth_svc, tls);
-    else
-	return sendmail_init (client, watch, verbose, debug, sasl,
-			      saslmech, user);
+
+    return sendmail_init (client, watch, verbose, debug, sasl,
+                          saslmech, user);
 }
 
 static int
@@ -131,14 +128,13 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
 	} else {
 	    client = LocalName(1);	/* no clientname -> LocalName */
 	}
-    }
-
-    /*
-     * Last-ditch check just in case client still isn't set to anything
-     */
 
-    if (client == NULL || *client == '\0')
-	client = "localhost";
+        /*
+         * Last-ditch check just in case client still isn't set to anything
+         */
+        if (client == NULL || *client == '\0')
+            client = "localhost";
+    }
 
     nsc = netsec_init();
 
@@ -299,14 +295,13 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl,
 	    client = clientname;
 	else
 	    client = LocalName(1);	/* no clientname -> LocalName */
-    }
-
-    /*
-     * Last-ditch check just in case client still isn't set to anything
-     */
 
-    if (client == NULL || *client == '\0')
-	client = "localhost";
+        /*
+         * Last-ditch check just in case client still isn't set to anything
+         */
+        if (client == NULL || *client == '\0')
+            client = "localhost";
+    }
 
     nsc = netsec_init();
 
@@ -816,7 +811,7 @@ again: ;
     						 &errstr)) != NULL ; ) {
 
 	if (doingEHLO
-	        && strncmp (buffer, "250", sizeof("250") - 1) == 0
+	        && strncmp (buffer, "250", LEN("250")) == 0
 	        && (buffer[3] == '-' || doingEHLO == 2)
 	        && buffer[4]) {
 	    if (doingEHLO == 2) {