From: dgaudet <dgaudet@unknown>
Date: Mon, 26 Jul 1999 07:03:09 +0000 (+0000)
Subject: some bug fixes from David
X-Git-Tag: 1.3.7~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c7ace3a4a818d497b102f7c7ce2723f85324f09;p=thirdparty%2Fapache%2Fhttpd.git

some bug fixes from David

Submitted by:	David Reid <beos@server1.jetnet.co.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83505 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/os/beos/beosd.c b/os/beos/beosd.c
index af364c69899..be05feb208e 100644
--- a/os/beos/beosd.c
+++ b/os/beos/beosd.c
@@ -79,19 +79,11 @@ void unixd_detach(void)
     }
     RAISE_SIGSTOP(DETACH);
 
-#ifndef NO_SETSID
     if ((pgrp = setsid()) == -1) {
 	perror("setsid");
 	fprintf(stderr, "%s: setsid failed\n", ap_server_argv0);
 	exit(1);
     }
-#else
-    if ((pgrp = setpgrp(getpid(), 0)) == -1) {
-	perror("setpgrp");
-	fprintf(stderr, "%s: setpgrp failed\n", ap_server_argv0);
-	exit(1);
-    }
-#endif
 
     /* close out the standard file descriptors */
     if (freopen("/dev/null", "r", stdin) == NULL) {
diff --git a/server/listen.c b/server/listen.c
index 9f7c121b734..14624d6dac3 100644
--- a/server/listen.c
+++ b/server/listen.c
@@ -121,7 +121,7 @@ static int make_sock(const struct sockaddr_in *server)
      *
      * If no size is specified, use the kernel default.
      */
-#ifndef SO_SNDBUF
+#ifdef SO_SNDBUF
     if (send_buffer_size) {
 	if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
 		(char *) &send_buffer_size, sizeof(int)) < 0) {