Fixed bug in inetd code. The server listened on tcp:@:9999 even

though it was started in inetd mode.

diff --git a/CHANGELOG b/CHANGELOG
index d7880ef..544b6cb 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,12 @@
---- 1.4pl1 1998/1/29
-

 Possible compatibility problems with earlier versions marked with '*'.
 
 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).
 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 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -7,7 +7,11 @@
  *   Chas Woodfield, Fretwell Downing Datasystem.
  *
  * $Log: statserv.c,v $
  *   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
  * 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");
             }
             {
                logf(LOG_FATAL, "Failed to create association structure");
             }

+            chan->next = pListener;
+            pListener = chan;

         }
         else
         {
         }
         else
         {

@@ -806,10 +812,6 @@ int statserv_start(int argc, char **argv)
                return(1);
             }
     }
                return(1);
             }
     }

-
-    if ((pListener == NULL) && *control_block.default_listen)
-       add_listener(control_block.default_listen, protocol);
-

 #ifndef WINDOWS
     if (inetd)
        inetd_connection(protocol);
 #ifndef WINDOWS
     if (inetd)
        inetd_connection(protocol);

@@ -837,6 +839,9 @@ int statserv_start(int argc, char **argv)
     }
 #endif /* WINDOWS */
 
     }
 #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)
     logf(LOG_LOG, "Entering event loop.");
        
     if (pListener == NULL)