fix bug that caused "\r\n" string in TCP mailer definition to turn

into something else -- causing all TCP connections to hang.

SCCS-mr: usr.sbin/sendmail/src/version.c 155
SCCS-mr: usr.sbin/sendmail/src/daemon.c 155
SCCS-mr: usr.sbin/sendmail/src/readcf.c 155
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.300
SCCS-vsn: usr.sbin/sendmail/src/daemon.c 3.47
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 3.52

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 86fc728..c6fc92b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -3,7 +3,7 @@
 # include <sys/mx.h>
 
 #ifndef DAEMON
 # include <sys/mx.h>
 
 #ifndef DAEMON

-SCCSID(@(#)daemon.c    3.46            %G%     (w/o daemon mode));
+SCCSID(@(#)daemon.c    3.47            %G%     (w/o daemon mode));

 #else
 
 #include <sys/socket.h>
 #else
 
 #include <sys/socket.h>


@@ -11,7 +11,7 @@ SCCSID(@(#)daemon.c   3.46            %G%     (w/o daemon mode));
 #include <netdb.h>
 #include <wait.h>
 
 #include <netdb.h>
 #include <wait.h>
 

-SCCSID(@(#)daemon.c    3.46            %G%     (with daemon mode));
+SCCSID(@(#)daemon.c    3.47            %G%     (with daemon mode));

 
 /*
 **  DAEMON.C -- routines to use when running as a daemon.
 
 /*
 **  DAEMON.C -- routines to use when running as a daemon.


@@ -251,7 +251,7 @@ makeconnection(host, port, outfile, infile)
        if (connect(s, &SendmailAddress, sizeof SendmailAddress, 0) < 0)
 #else NVMUNIX
        SendmailAddress.sin_family = AF_INET;
        if (connect(s, &SendmailAddress, sizeof SendmailAddress, 0) < 0)
 #else NVMUNIX
        SendmailAddress.sin_family = AF_INET;

-       bind(s, &SendmailAddress, sizeof SendmailAddress, 0);
+       /* bind(s, &SendmailAddress, sizeof SendmailAddress, 0); */

        if (connect(s, &SendmailAddress, sizeof SendmailAddress, 0) < 0)
 #endif NVMUNIX
        {
        if (connect(s, &SendmailAddress, sizeof SendmailAddress, 0) < 0)
 #endif NVMUNIX
        {

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index 90b7c65..c0e7a62 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -1,6 +1,6 @@
 # include "sendmail.h"
 
 # include "sendmail.h"
 

-SCCSID(@(#)readcf.c    3.51            %G%);
+SCCSID(@(#)readcf.c    3.52            %G%);

 
 /*
 **  READCF -- read control file.
 
 /*
 **  READCF -- read control file.


@@ -463,6 +463,7 @@ munchstring(p)
                if (backslash)
                {
                        /* everything is roughly literal */
                if (backslash)
                {
                        /* everything is roughly literal */

+                       backslash = FALSE;

                        switch (*p)
                        {
                          case 'r':             /* carriage return */
                        switch (*p)
                        {
                          case 'r':             /* carriage return */


@@ -482,7 +483,6 @@ munchstring(p)
                                continue;
                        }
                        *q++ = *p;
                                continue;
                        }
                        *q++ = *p;

-                       backslash = FALSE;

                }
                else
                {
                }
                else
                {

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 4487c06..463a63a 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.299 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.300 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.299 [%G%]";
+char   Version[] = "3.300 [%G%]";