bozo: pass -rxbind on restart

Pass the -rxbind on restarts when bosserver is initially started
with the -rxbind option.

Reviewed-on: http://gerrit.openafs.org/5487
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 544ff1b295a57b50afefa6146094434db7608355)

Change-Id: I042cce8043bb0797b5c654118c2254f93903a4fa
Reviewed-on: http://gerrit.openafs.org/5536
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/WINNT/bosctlsvc/bosctlsvc.c b/src/WINNT/bosctlsvc/bosctlsvc.c
index cd75961d9515f5fe74c06a70f39827fdc71d282d..b5fe2c599619fc11a9f3bbf1e1c5bcc8dc32302f 100644 (file)
--- a/src/WINNT/bosctlsvc/bosctlsvc.c
+++ b/src/WINNT/bosctlsvc/bosctlsvc.c
@@ -417,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;
            }
        }

diff --git a/src/bozo/bnode.p.h b/src/bozo/bnode.p.h
index 7959a437014b647540c3e0dcefb43fe385fea60b..14ab9d7ba6625d42411d054a9d2726813075bf5e 100644 (file)
--- a/src/bozo/bnode.p.h
+++ b/src/bozo/bnode.p.h
@@ -124,6 +124,7 @@ struct bozo_bosEntryStats {
 #define BOSEXIT_DORESTART(code)  (((code) & ~(0xF)) == BOSEXIT_RESTART)
 #define BOSEXIT_NOAUTH_FLAG    0x01
 #define BOSEXIT_LOGGING_FLAG   0x02
+#define BOSEXIT_RXBIND_FLAG    0x04
 #endif
 
 /* max time to wait for fileserver shutdown */

diff --git a/src/bozo/bosserver.c b/src/bozo/bosserver.c
index e9fd51316a3fb293ab67bab36103d8f5e1b8b551..e05663be7b08a163fdadc861e0685880d4973ef2 100644 (file)
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -122,6 +122,10 @@ bozo_ReBozo(void)
     if (DoLogging) {
        status |= BOSEXIT_LOGGING_FLAG;
     }
+    /* if rxbind is set, pass "-rxbind" to new bosserver */
+    if (rxBind) {
+       status |= BOSEXIT_RXBIND_FLAG;
+    }
     exit(status);
 #else
     /* exec new bosserver process */
@@ -141,6 +145,11 @@ bozo_ReBozo(void)
        argv[i] = "-log";
        i++;
     }
+    /* if rxbind is set, pass "-rxbind" to new bosserver */
+    if (rxBind) {
+       argv[i] = "-rxbind";
+       i++;
+    }
 #ifndef AFS_NT40_ENV
     /* if syslog logging is on, pass "-syslog" to new bosserver */
     if (DoSyslog) {