hooks for future features

SCCS-vsn: usr.sbin/sendmail/src/usersmtp.c 8.9
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.38

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index c92b3df..8b2f705 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.37 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.38 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -131,6 +131,25 @@ struct prival PrivacyValues[] =
 */
 
 int    DtableSize =    50;             /* max open files; reset in 4.2bsd */
 */
 
 int    DtableSize =    50;             /* max open files; reset in 4.2bsd */

+
+
+/*
+**  Following should be config parameters (and probably will be in
+**  future releases).  In the meantime, setting these is considered
+**  unsupported, and is intentionally undocumented.
+*/
+
+#ifdef BROKENSMTPPEERS
+bool   BrokenSmtpPeers = TRUE;         /* set if you have broken SMTP peers */
+#else
+bool   BrokenSmtpPeers = FALSE;        /* set if you have broken SMTP peers */
+#endif
+#ifdef NOLOOPBACKCHECK
+bool   CheckLoopBack = FALSE;          /* set to check HELO loopback */
+#else
+bool   CheckLoopBack = TRUE;           /* set to check HELO loopback */
+#endif
+

 \f/*
 **  SETDEFAULTS -- set default values
 **
 \f/*
 **  SETDEFAULTS -- set default values
 **

diff --git a/usr/src/usr.sbin/sendmail/src/usersmtp.c b/usr/src/usr.sbin/sendmail/src/usersmtp.c
index f9c1df0..9a37305 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/usersmtp.c
+++ b/usr/src/usr.sbin/sendmail/src/usersmtp.c
@@ -10,9 +10,9 @@
 
 #ifndef lint
 #ifdef SMTP
 
 #ifndef lint
 #ifdef SMTP

-static char sccsid[] = "@(#)usersmtp.c 8.8 (Berkeley) %G% (with SMTP)";
+static char sccsid[] = "@(#)usersmtp.c 8.9 (Berkeley) %G% (with SMTP)";

 #else
 #else

-static char sccsid[] = "@(#)usersmtp.c 8.8 (Berkeley) %G% (without SMTP)";
+static char sccsid[] = "@(#)usersmtp.c 8.9 (Berkeley) %G% (without SMTP)";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -163,7 +163,7 @@ tryhelo:
        p = strchr(&SmtpReplyBuffer[4], ' ');
        if (p != NULL)
                *p = '\0';
        p = strchr(&SmtpReplyBuffer[4], ' ');
        if (p != NULL)
                *p = '\0';

-       if (strcasecmp(&SmtpReplyBuffer[4], MyHostName) == 0)
+       if (CheckLoopBack && strcasecmp(&SmtpReplyBuffer[4], MyHostName) == 0)

        {
                syserr("553 %s config error: mail loops back to myself",
                        MyHostName);
        {
                syserr("553 %s config error: mail loops back to myself",
                        MyHostName);