From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Sat, 4 Sep 1993 00:19:42 +0000 (-0800)
Subject: patch to receive socket code
X-Git-Tag: BSD-4_4_Lite1-Snapshot-Development~1827
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/309ba54b1e72798b6322b6357b6df70403ec68c6

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 1f0cb248f3..eb13f00474 100644
--- 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
-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
-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 */
 
@@ -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);
 
+#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
@@ -398,16 +408,6 @@ gothostent:
 		}
 #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);