From 1aa1446b7a1b75b503fab968cee92ca73319f82b Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 22 Sep 2011 11:28:17 -0400 Subject: [PATCH] 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 Reviewed-by: Derrick Brashear (cherry picked from commit 544ff1b295a57b50afefa6146094434db7608355) Change-Id: I042cce8043bb0797b5c654118c2254f93903a4fa Reviewed-on: http://gerrit.openafs.org/5536 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/WINNT/bosctlsvc/bosctlsvc.c | 5 +++++ src/bozo/bnode.p.h | 1 + src/bozo/bosserver.c | 9 +++++++++ 3 files changed, 15 insertions(+) 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 e9fd51316..e05663be7 100644 --- 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) { -- 2.39.5