STABLE12-realcellindex-fix-allocation-20020821

fix comparison and the double allocation it uncovers

(cherry picked from commit ae3e679ab0163560a29ca51eec77a2c897a8f216)

diff --git a/src/afs/afs_cell.c b/src/afs/afs_cell.c
index 79a06809a5455cc79857b651cdf1926a5ba6e9b6..be0cadfcec99340a425375802abea392e950cd75 100644 (file)
--- a/src/afs/afs_cell.c
+++ b/src/afs/afs_cell.c
@@ -509,7 +509,7 @@ afs_int32 afs_NewCell(acellName, acellHosts, aflags, linkedcname, fsport, vlport
        tc->vlport = (vlport ? vlport : AFS_VLPORT);
        afs_stats_cmperf.numCellsVisible++;
        newc++;
-       if (!aflags & CAlias) {
+       if (!(aflags & CAlias)) {
            tc->realcellIndex = afs_realcellindex++;
        } else {
            tc->realcellIndex = -1;
@@ -543,7 +543,7 @@ afs_int32 afs_NewCell(acellName, acellHosts, aflags, linkedcname, fsport, vlport
     tc->timeout = timeout;
 
     /* Allow converting an alias into a real cell */
-    if (!(aflags & CAlias)) {
+    if ((!(aflags & CAlias)) && (tc->states & CAlias)) {
        tc->states &= ~CAlias;
        tc->realcellIndex = afs_realcellindex++;
     }