patch to receive socket code

SCCS-vsn: usr.sbin/sendmail/src/daemon.c 8.13

diff --git a/usr/src/usr.sbin/sendmail/src/daemon.c b/usr/src/usr.sbin/sendmail/src/daemon.c
index 1f0cb24..eb13f00 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/daemon.c
+++ b/usr/src/usr.sbin/sendmail/src/daemon.c
@@ -12,9 +12,9 @@
 
 #ifndef lint
 #ifdef DAEMON
 
 #ifndef lint
 #ifdef DAEMON

-static char sccsid[] = "@(#)daemon.c   8.12 (Berkeley) %G% (with daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.13 (Berkeley) %G% (with daemon mode)";

 #else
 #else

-static char sccsid[] = "@(#)daemon.c   8.12 (Berkeley) %G% (without daemon mode)";
+static char sccsid[] = "@(#)daemon.c   8.13 (Berkeley) %G% (without daemon mode)";

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


@@ -140,6 +140,16 @@ getrequests()
        (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof on);
        (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_KEEPALIVE, (char *)&on, sizeof on);
 
        (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof on);
        (void) setsockopt(DaemonSocket, SOL_SOCKET, SO_KEEPALIVE, (char *)&on, sizeof on);
 

+#ifdef SO_RCVBUF
+       if (TcpRcvBufferSize > 0)
+       {
+               if (setsockopt(DaemonSocket, SOL_SOCKET, SO_RCVBUF,
+                              &TcpRcvBufferSize,
+                              sizeof(TcpRcvBufferSize)) < 0)
+                       syserr("getrequests: setsockopt(SO_RCVBUF)");
+       }
+#endif
+

        switch (DaemonAddr.sa.sa_family)
        {
 # ifdef NETINET
        switch (DaemonAddr.sa.sa_family)
        {
 # ifdef NETINET


@@ -398,16 +408,6 @@ gothostent:
                }
 #endif
 
                }
 #endif
 

-#ifdef SO_RCVBUF
-               if (TcpRcvBufferSize > 0)
-               {
-                       if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-                                      &TcpRcvBufferSize,
-                                      sizeof(TcpRcvBufferSize)) < 0)
-                               syserr("makeconnection: setsockopt(SO_RCVBUF)");
-               }
-#endif
-

                if (tTd(16, 1))
                        printf("makeconnection: fd=%d\n", s);
 
                if (tTd(16, 1))
                        printf("makeconnection: fd=%d\n", s);