From: Michael Meffie <mmeffie@sinenomine.net>
Date: Thu, 22 Sep 2011 15:28:17 +0000 (-0400)
Subject: bozo: pass -rxbind on restart
X-Git-Tag: upstream/1.8.0_pre1^2~3235
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=544ff1b295a57b50afefa6146094434db7608355;p=packages%2Fo%2Fopenafs.git

bozo: pass -rxbind on restart

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

Change-Id: Ic6e884c87fcd0e8b3808a2f362d8c32177e9e2a0
Reviewed-on: http://gerrit.openafs.org/5487
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 cd75961d9..b5fe2c599 100644
--- 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 7959a4370..14ab9d7ba 100644
--- 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 d896a6eda..84ae88083 100644
--- a/src/bozo/bosserver.c
+++ b/src/bozo/bosserver.c
@@ -110,6 +110,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 */
@@ -129,6 +133,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) {