From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 14 Dec 2005 05:30:53 +0000 (+0000)
Subject: STABLE14-windows-fs-setserverpref-vldb-20051214
X-Git-Tag: openafs-stable-1_4_1-rc3~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9e7ae6f02d7ceec96777d92efc8455a74f244cf5;p=packages%2Fo%2Fopenafs.git

STABLE14-windows-fs-setserverpref-vldb-20051214


prevent a panic condition if "fs setserverprefs -vlserver" is executed
more than once before the vlserver is associated with a cell.


(cherry picked from commit b99bd38da60f374a03382090fdaae906a00c8428)
---

diff --git a/src/WINNT/afsd/cm_cell.c b/src/WINNT/afsd/cm_cell.c
index 3c8eef86e..2b039dcb8 100644
--- a/src/WINNT/afsd/cm_cell.c
+++ b/src/WINNT/afsd/cm_cell.c
@@ -321,14 +321,14 @@ void cm_ChangeRankCellVLServer(cm_server_t *tsp)
     int code;
 
     cp = tsp->cellp;	/* cell that this vlserver belongs to */
-    osi_assert(cp);
-
-    lock_ObtainMutex(&cp->mx);
-    code = cm_ChangeRankServer(&cp->vlServersp, tsp);
+    if (cp) {
+	lock_ObtainMutex(&cp->mx);
+	code = cm_ChangeRankServer(&cp->vlServersp, tsp);
 
-    if ( !code ) 		/* if the server list was rearranged */
-        cm_RandomizeServer(&cp->vlServersp);
+	if ( !code ) 		/* if the server list was rearranged */
+	    cm_RandomizeServer(&cp->vlServersp);
 
-    lock_ReleaseMutex(&cp->mx);
+	lock_ReleaseMutex(&cp->mx);
+    }
 }