bozo: fix overrun from -rxbind on restart

[openafs.git] / src / WINNT / bosctlsvc / bosctlsvc.c

diff --git a/src/WINNT/bosctlsvc/bosctlsvc.c b/src/WINNT/bosctlsvc/bosctlsvc.c
index ae20e2c..475d7ac 100644 (file)
--- a/src/WINNT/bosctlsvc/bosctlsvc.c
+++ b/src/WINNT/bosctlsvc/bosctlsvc.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -16,7 +16,6 @@
 #include <afs/param.h>
 #include <afs/stds.h>
 
-#include <param.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -30,13 +29,13 @@
 #include <afs/procmgmt.h>
 #include <afs/dirpath.h>
 #include <afs/bnode.h>
-
+#include <afs/afsicf.h>
 
 /* Define globals */
 
 #define BOSSERVER_STARTMSG_EXE  "afslegal.exe"
 
-#define BOSSERVER_RESTART_ARG_MAX  2  /* "-noauth", "-log" */
+#define BOSSERVER_RESTART_ARG_MAX  3  /* "-noauth", "-log", "-rxbind" */
 #define BOSSERVER_WAIT_TIME_HINT  60  /* seconds */
 #define BOSSERVER_STOP_TIME_MAX  (FSSDTIME + 60)  /* seconds */
 
@@ -273,6 +272,9 @@ BosCtlMain(DWORD argc, LPTSTR *argv)
        return;
     }
 
+    /* For XP SP2 and above, open required ports */
+    icf_CheckAndAddAFSPorts(AFS_PORTSET_SERVER);
+
     /* Initialize the dirpath package so can access local bosserver binary */
     if (!(initAFSDirPath() & AFSDIR_SERVER_PATHS_OK)) {
        /* sw install directory probably not in registry; can not continue */
@@ -415,6 +417,11 @@ BosserverDoExitEvent(pid_t cpid,
                    restartArgv[i] = "-log";
                    i++;
                }
+               if (exitCode & BOSEXIT_RXBIND_FLAG) {
+                   /* pass "-rxbind" to new bosserver */
+                   restartArgv[i] = "-rxbind";
+                   i++;
+               }
                restartArgv[i] = NULL;
            }
        }
@@ -452,7 +459,7 @@ BosserverRun(DWORD argc,
     char **spawn_argv;
 
     /* Display bosserver startup (legal) message; first start only */
-    BosserverStartupMsgDisplay();
+    /* BosserverStartupMsgDisplay(); */
 
     /* Set env variable forcing process mgmt lib to spawn processes detached */
     (void)putenv(PMGT_SPAWN_DETACHED_ENV_NAME "=1");