* For services disabled by setting port number to -1, administratively skip

  the bind instead of just allowing it to fail.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index b0443f17e2a20e8dc87d1ed6b5f6227b34180f0c..1db0b0b2127e31498502f1c2a698e856b277fa23 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 570.11  2000/04/07 19:22:45  ajc
+ * For services disabled by setting port number to -1, administratively skip
+   the bind instead of just allowing it to fail.
+
  Revision 570.10  2000/03/31 04:31:02  ajc
  * Quick fix to 'stats' utility to purge records with bogus timestamps
 
@@ -1804,4 +1808,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/dynloader.c b/citadel/dynloader.c
index eb521eadd0bd3bdc4e92d94259139eca84ccf4dc..657bc76f9c2ec121b1645781db3b613480856182 100644 (file)
--- a/citadel/dynloader.c
+++ b/citadel/dynloader.c
@@ -247,6 +247,11 @@ void CtdlRegisterServiceHook(int tcp_port,
        if (sockpath != NULL) {
                newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions);
        }
+       else if (tcp_port < 0) {        /* port -1 to disable */
+               lprintf(7, "Service has been manually disabled, skipping\n");
+               phree(newfcn);
+               return;
+       }
        else {
                newfcn->msock = ig_tcp_server(tcp_port, config.c_maxsessions);
        }