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 3c8eef86ef8d7563340f158b7676b9dc54bfc525..2b039dcb80aee535999140cc896cda2b440267bf 100644 (file)
--- 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);
+    }
 }