From 27051247082c0748f14a4f82b8d9bc403a1fbd0d Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Wed, 26 Nov 2003 22:29:35 +0000
Subject: [PATCH] 	* cygserver.cc (main): Move call to ipcinit() up
 before installing 	any threads. 	* sysv_sem.cc: Update to FreeBSD
 version 1.67. 	(seminit): Initialize semaphore sequence numbers to 0.

---
 winsup/cygserver/ChangeLog    | 7 +++++++
 winsup/cygserver/cygserver.cc | 8 +++-----
 winsup/cygserver/sysv_sem.cc  | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 0c60e35258..cfcf9de25d 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,5 +1,12 @@
 2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
 
+	* cygserver.cc (main): Move call to ipcinit() up before installing
+	any threads.
+	* sysv_sem.cc: Update to FreeBSD version 1.67.
+	(seminit): Initialize semaphore sequence numbers to 0.
+
+2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
+
 	* Makefile.in (CYGWIN_LIB): Variable pointing to libcygwin.a in
 	the parallel cygwin dir.
 	(cygserver.exe): Depend on and link against $CYGWIN_LIB.
diff --git a/winsup/cygserver/cygserver.cc b/winsup/cygserver/cygserver.cc
index 355060febf..0cc6244ad2 100644
--- a/winsup/cygserver/cygserver.cc
+++ b/winsup/cygserver/cygserver.cc
@@ -726,6 +726,8 @@ main (const int argc, char *argv[])
   if (wincap.has_security () && !setup_privileges ())
     panic ("Setting process privileges failed.");
 
+  ipcinit ();
+
   /*XXXXX*/
   threaded_queue request_queue (request_threads);
 
@@ -739,11 +741,7 @@ main (const int argc, char *argv[])
   request_queue.add_submission_loop (&submission_loop);
 
   if (transport->listen () == -1)
-    {
-      exit (1);
-    }
-
-  ipcinit ();
+    return 1;
 
   cache.start ();
 
diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc
index ac5efcdaa2..ccb7a12461 100644
--- a/winsup/cygserver/sysv_sem.cc
+++ b/winsup/cygserver/sysv_sem.cc
@@ -17,7 +17,7 @@
 #ifndef __FBSDID
 #define __FBSDID(s)	const char version[] = (s)
 #endif
-__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/kern/sysv_sem.c,v 1.66 2003/11/10 07:22:41 tjr Exp $");
+__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/kern/sysv_sem.c,v 1.67 2003/11/15 11:56:53 tjr Exp $");
 
 #define _KERNEL 1
 #define __BSD_VISIBLE 1
@@ -228,6 +228,7 @@ seminit(void)
 	for (i = 0; i < seminfo.semmni; i++) {
 		sema[i].sem_base = 0;
 		sema[i].sem_perm.mode = 0;
+		sema[i].sem_perm.seq = 0;
 	}
 	for (i = 0; i < seminfo.semmni; i++)
 		mtx_init(&sema_mtx[i], "semid", NULL, MTX_DEF);
-- 
2.11.0