From a807bde38544a7aa45dd2988e504a1acb3fd30c0 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 30 Jan 1998 15:24:57 +0000
Subject: [PATCH] Fixed bug in inetd code. The server listened on tcp:@:9999
 even though it was started in inetd mode.

---
 CHANGELOG         |    9 +++++++--
 server/statserv.c |   15 ++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d7880ef..544b6cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,12 @@
---- 1.4pl1 1998/1/29
-
 Possible compatibility problems with earlier versions marked with '*'.
 
+--- 1.4pl2 1998/1/30
+
+Fixed bug in server library regarding inetd mode (-i). This bug
+was introduced by release 1.4.
+
+--- 1.4pl1 1998/1/29
+
 Added sort facility in client and backend server interface.
 
 Fixed problem with dependencies in Makefile(s).
diff --git a/server/statserv.c b/server/statserv.c
index 9cf20c8..e9d7912 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -7,7 +7,11 @@
  *   Chas Woodfield, Fretwell Downing Datasystem.
  *
  * $Log: statserv.c,v $
- * Revision 1.45  1998-01-29 13:30:23  adam
+ * Revision 1.46  1998-01-30 15:24:57  adam
+ * Fixed bug in inetd code. The server listened on tcp:@:9999 even
+ * though it was started in inetd mode.
+ *
+ * Revision 1.45  1998/01/29 13:30:23  adam
  * Better event handle system for NT/Unix.
  *
  * Revision 1.44  1997/11/07 13:31:52  adam
@@ -628,6 +632,8 @@ static void inetd_connection(int what)
             {
 	        logf(LOG_FATAL, "Failed to create association structure");
             }
+            chan->next = pListener;
+            pListener = chan;
         }
         else
         {
@@ -806,10 +812,6 @@ int statserv_start(int argc, char **argv)
 	    	return(1);
             }
     }
-
-    if ((pListener == NULL) && *control_block.default_listen)
-	add_listener(control_block.default_listen, protocol);
-
 #ifndef WINDOWS
     if (inetd)
 	inetd_connection(protocol);
@@ -837,6 +839,9 @@ int statserv_start(int argc, char **argv)
     }
 #endif /* WINDOWS */
 
+    if ((pListener == NULL) && *control_block.default_listen)
+	add_listener(control_block.default_listen, protocol);
+
     logf(LOG_LOG, "Entering event loop.");
 	
     if (pListener == NULL)
-- 
1.7.10.4