From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Thu, 20 Jan 2011 02:57:58 +0000 (-0500)
Subject: ubik: Rearrange some initialization code
X-Git-Tag: upstream/1.8.0_pre1^2~4088
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7caf4143;p=packages%2Fo%2Fopenafs.git

ubik: Rearrange some initialization code

Some basic initialization should precede creating the RX
services.

Change-Id: Ic88d639be12ee8edd2ec7b61c2a5df435b59f663
Reviewed-on: http://gerrit.openafs.org/4144
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/ubik/ubik.c b/src/ubik/ubik.c
index ca74579cb..c91ce7d73 100644
--- a/src/ubik/ubik.c
+++ b/src/ubik/ubik.c
@@ -423,6 +423,19 @@ ubik_ServerInitCommon(afs_uint32 myHost, short myPort,
     udisk_Init(ubik_nBuffers);
     ulock_Init();
 
+    code = uvote_Init();
+    if (code)
+	return code;
+    code = urecovery_Initialize(tdb);
+    if (code)
+	return code;
+    if (info)
+	code = ubeacon_InitServerListByInfo(myHost, info, clones);
+    else
+	code = ubeacon_InitServerList(myHost, serverList);
+    if (code)
+	return code;
+
     ubik_callPortal = myPort;
     /* try to get an additional security object */
     ubik_sc[0] = rxnull_NewServerSecurityObject();
@@ -486,20 +499,6 @@ ubik_ServerInitCommon(afs_uint32 myHost, short myPort,
               NULL, "rx_ServerProc", &junk);
 #endif
 
-    /* do basic initialization */
-    code = uvote_Init();
-    if (code)
-	return code;
-    code = urecovery_Initialize(tdb);
-    if (code)
-	return code;
-    if (info)
-	code = ubeacon_InitServerListByInfo(myHost, info, clones);
-    else
-	code = ubeacon_InitServerList(myHost, serverList);
-    if (code)
-	return code;
-
     /* now start up async processes */
 #ifdef AFS_PTHREAD_ENV
 /* do assert stuff */