? macos-afs-diff-20040617
? macos-afs-diff-20040618
? macos-afs-diff-20040623
? macos-afs-kext-20040623
? ppc_darwin_70
? src/libafs/afs.ppc_darwin_70.plist
? src/libafs/MODLOAD
? src/libuafs/MakefileProto.DARWIN
? src/packaging/MacOS/OpenAFS-20040617.pkg.tar.gz
? src/packaging/MacOS/OpenAFS-20040623.pkg.tar.gz
? src/packaging/MacOS/OpenAFS.pkg
? src/shlibafsauthent/Makefile
? src/shlibafsrpc/Makefile
? src/tests/Makefile
? src/tests/run-tests
? src/tests/OpenAFS/Dirpath.pm
Index: src/afs/afs_vcache.c
===================================================================
RCS file: /cvs/openafs/src/afs/afs_vcache.c,v
retrieving revision 1.9.2.20
diff -u -r1.9.2.20 afs_vcache.c
--- src/afs/afs_vcache.c	1 Jul 2003 22:24:17 -0000	1.9.2.20
+++ src/afs/afs_vcache.c	23 Jun 2004 18:38:57 -0000
@@ -787,8 +787,13 @@
 		refpanic("VLRU inconsistent");
 
 #ifdef AFS_DARWIN_ENV
+	   if ((VREFCOUNT(tvc) < 3) || (VREFCOUNT(tvc) < 4 && 
+					UBCINFOEXISTS(&tvc->v))) {
+	       VREFCOUNT_SET(tvc, 
+			     3 + (UBCINFOEXISTS(&tvc->v) ? 1 : 0));
+	   }
 	   if (tvc->opens == 0 && ((tvc->states & CUnlinkedDel) == 0) &&
-                VREFCOUNT(tvc) == 1 && UBCINFOEXISTS(&tvc->v)) {
+                VREFCOUNT(tvc) == DARWIN_REFBASE+1 && UBCINFOEXISTS(&tvc->v)) {
                osi_VM_TryReclaim(tvc, &fv_slept);
                if (fv_slept) {
                   uq = VLRU.prev;
@@ -802,7 +807,7 @@
 		afs_TryFlushDcacheChildren(tvc);
 #endif
 
-	   if (VREFCOUNT(tvc) == 0 && tvc->opens == 0
+	   if (VREFCOUNT(tvc) == DARWIN_REFBASE && tvc->opens == 0
 	       && (tvc->states & CUnlinkedDel) == 0) {
 		code = afs_FlushVCache(tvc, &fv_slept);
 		if (code == 0) {
@@ -975,7 +980,7 @@
     /* VLISTNONE(&tvc->v); */
     tvc->v.v_freelist.tqe_next=0;
     tvc->v.v_freelist.tqe_prev=(struct vnode **)0xdeadb;
-    /*tvc->vrefCount++;*/
+    tvc->vrefCount+=DARWIN_REFBASE;
 #endif 
 #ifdef AFS_FBSD_ENV
     lockinit(&tvc->rwlock, PINOD, "vcache rwlock", 0, 0);
@@ -1250,7 +1255,7 @@
 		}
 	    }	       
 #ifdef AFS_DARWIN_ENV
-            if (VREFCOUNT(tvc) == 1 && UBCINFOEXISTS(&tvc->v)) {
+            if (VREFCOUNT(tvc) == 1+DARWIN_REFBASE && UBCINFOEXISTS(&tvc->v)) {
 		if (tvc->opens) panic("flushactive open, hasubc, but refcnt 1");
 		osi_VM_TryReclaim(tvc,0);
 	    }
@@ -2486,6 +2491,22 @@
 	    if (vg)
                 continue;
 #endif  /* AFS_OSF_ENV */
+#ifdef AFS_DARWIN14_ENV
+           /* It'd really suck if we allowed duplicate vcaches for the 
+              same fid to happen. Wonder if this will work? */
+           struct vnode *vp = AFSTOV(tvc);
+           if (vp->v_flag & (VXLOCK|VORECLAIM|VTERMINATE)) {
+               printf("precluded FindVCache on %x (%d:%d:%d)\n", 
+                      vp, tvc->fid.Fid.Volume, tvc->fid.Fid.Vnode,
+                      tvc->fid.Fid.Unique);
+               simple_lock(&vp->v_interlock);
+               SET(vp->v_flag, VTERMWANT);
+               simple_unlock(&vp->v_interlock);
+               (void)tsleep((caddr_t)&vp->v_ubcinfo, PINOD, "vget1", 0);
+               printf("VTERMWANT ended on %x\n", vp);
+               continue;
+           }
+#endif
 	    break;
 	}
     }
Index: src/afs/DARWIN/osi_vm.c
===================================================================
RCS file: /cvs/openafs/src/afs/DARWIN/osi_vm.c,v
retrieving revision 1.3.4.4
diff -u -r1.3.4.4 osi_vm.c
--- src/afs/DARWIN/osi_vm.c	21 Aug 2002 20:53:22 -0000	1.3.4.4
+++ src/afs/DARWIN/osi_vm.c	23 Jun 2004 18:38:57 -0000
@@ -43,7 +43,7 @@
     if (UBCINFOEXISTS(vp))
 	return EBUSY;
 #endif
-    if (avc->vrefCount)
+    if (avc->vrefCount > DARWIN_REFBASE)
 	return EBUSY;
 
     if (avc->opens)
@@ -63,6 +63,25 @@
                 ubc_release(vp);
 	        ubc_info_free(vp);
 	}
+#else
+    /* This is literally clean_up_name_parent_ptrs */
+    if (VNAME(vp) || VPARENT(vp)) {
+        char *tmp1;
+	struct vnode *tmp2;
+
+	tmp1 = VNAME(vp);
+	tmp2 = VPARENT(vp);
+	VNAME(vp) = NULL;
+	VPARENT(vp) = NULL;
+            
+	if (tmp1) {
+	    remove_name(tmp1);
+	}
+            
+	if (tmp2) {
+	    vrele(tmp2);
+	}
+    }
 #endif
 
     AFS_GLOCK();
@@ -179,6 +198,9 @@
     struct proc *p=current_proc();
     struct vnode *vp=AFSTOV(avc);
     void *obj;
+#ifdef AFS_DARWIN14_ENV
+    int didhold;
+#endif
 
     if (slept)
        *slept=0;
@@ -187,17 +209,28 @@
         AFS_RELE(vp);
         return;
     }
-    if (!UBCINFOEXISTS(vp) || vp->v_count != 2) {
+    if (!UBCINFOEXISTS(vp) || vp->v_usecount != 2+DARWIN_REFBASE) {
         simple_unlock(&vp->v_interlock);
         AFS_RELE(vp);
         return;
     }
+    if (ISSET(vp->v_flag, VUINACTIVE)) {
+        simple_unlock(&vp->v_interlock);
+	AFS_RELE(vp);
+        printf("vnode still inactive!");
+	return;
+    }
 #ifdef AFS_DARWIN14_ENV
     if (vp->v_ubcinfo->ui_refcount > 1 || vp->v_ubcinfo->ui_mapped) {
         simple_unlock(&vp->v_interlock);
         AFS_RELE(vp);
         return;
     }
+    if (ISSET(vp->v_flag, VORECLAIM)) {
+        simple_unlock(&vp->v_interlock);
+        AFS_RELE(vp);
+        return;
+    }
 #else
     if (vp->v_ubcinfo->ui_holdcnt) {
         simple_unlock(&vp->v_interlock);
@@ -212,7 +245,9 @@
         return;
     }
 
+#ifndef AFS_DARWIN14_ENV
     vp->v_usecount--; /* we want the usecount to be 1 */
+#endif
 
     if (slept) {
         ReleaseWriteLock(&afs_xvcache);
@@ -230,47 +265,91 @@
 #endif
         if (ubc_issetflags(vp, UI_HASOBJREF))
             printf("ubc_release didn't release the reference?!\n");
-    } else if (!vn_lock(vp, LK_EXCLUSIVE|LK_INTERLOCK,current_proc())) {
+    } else {
 #ifdef AFS_DARWIN14_ENV
-        obj = ubc_getobject(vp,UBC_HOLDOBJECT);
+        SET(vp->v_flag, VORECLAIM);
+#endif
+	if (!vn_lock(vp, LK_EXCLUSIVE|LK_INTERLOCK,current_proc())) {
+#ifdef AFS_DARWIN14_ENV
+	    obj = ubc_getobject(vp,UBC_HOLDOBJECT);
+	    if ((didhold = ubc_hold(vp)))
+	        (void)ubc_clean(vp, 0);
 #else
 #ifdef AFS_DARWIN13_ENV
-        obj = ubc_getobject(vp,(UBC_NOREACTIVATE|UBC_HOLDOBJECT));
+	    obj = ubc_getobject(vp,(UBC_NOREACTIVATE|UBC_HOLDOBJECT));
 #else
-        obj = ubc_getobject(vp);
+	    obj = ubc_getobject(vp);
 #endif
+	    (void)ubc_clean(vp, 1);
 #endif
-        (void)ubc_clean(vp, 1);
-        vinvalbuf(vp, V_SAVE, &afs_osi_cred, p, 0, 0);
-        if (vp->v_usecount == 1)
-           VOP_INACTIVE(vp, p);
-        else
-           VOP_UNLOCK(vp, 0, p);
-        if (obj) {
-        if (ISSET(vp->v_flag, VTERMINATE))
-            panic("afs_vnreclaim: already teminating");
-        SET(vp->v_flag, VTERMINATE);
-        memory_object_destroy(obj, 0);
-        while (ISSET(vp->v_flag, VTERMINATE)) {
-              SET(vp->v_flag, VTERMWANT);
-              tsleep((caddr_t)&vp->v_ubcinfo, PINOD, "afs_vnreclaim", 0);
-        }
-        }
-   } else {
-        if (simple_lock_try(&vp->v_interlock))
-            panic("afs_vnreclaim: slept, but did no work :(");
-        if (UBCINFOEXISTS(vp) && vp->v_count == 1) {
-           vp->v_usecount++;
-           simple_unlock(&vp->v_interlock);
-           VN_RELE(vp);
-        } else 
-           simple_unlock(&vp->v_interlock);
-   }
-   AFS_GLOCK();
-   if (slept)
-      ObtainWriteLock(&afs_xvcache,175);
-   else
-      ObtainReadLock(&afs_xvcache);
+	    vinvalbuf(vp, V_SAVE, &afs_osi_cred, p, 0, 0);
+	    if (vp->v_usecount ==
+#ifdef AFS_DARWIN14_ENV
+		2 + DARWIN_REFBASE
+#else
+		1
+#endif
+		)
+	        VOP_INACTIVE(vp, p);
+	    else
+	        VOP_UNLOCK(vp, 0, p);
+#ifdef AFS_DARWIN14_ENV
+	    if (didhold)
+	        ubc_rele(vp);
+#endif
+	    if (obj) {
+	        if (ISSET(vp->v_flag, VTERMINATE))
+		    panic("afs_vnreclaim: already teminating");
+		SET(vp->v_flag, VTERMINATE);
+		memory_object_destroy(obj, 0);
+		while (ISSET(vp->v_flag, VTERMINATE)) {
+		    SET(vp->v_flag, VTERMWANT);
+		    tsleep((caddr_t)&vp->v_ubcinfo, PINOD, "afs_vnreclaim", 0);
+		}
+	    }
+#ifdef AFS_DARWIN14_ENV
+	    simple_lock(&vp->v_interlock);
+	    CLR(vp->v_flag, VORECLAIM);
+	    if (ISSET((vp)->v_flag, VXWANT)) {
+	        CLR((vp)->v_flag, VXWANT);
+                wakeup((caddr_t)(vp));
+	    }       
+	    vp->v_usecount--;
+	    simple_unlock(&vp->v_interlock);
+#endif
+	} else {
+#ifdef AFS_DARWIN14_ENV
+	    CLR(vp->v_flag, VORECLAIM);
+#endif
+	    if (simple_lock_try(&vp->v_interlock))
+	        panic("afs_vnreclaim: slept, but did no work :(");
+	    if (UBCINFOEXISTS(vp) && vp->v_count == DARWIN_REFBASE +
+#ifdef AFS_DARWIN14_ENV
+		2
+#else
+		1
+#endif
+		) {
+#ifndef AFS_DARWIN14_ENV
+	        /* We left the refcount high in 1.4 */
+	        vp->v_usecount++;
+#endif
+		simple_unlock(&vp->v_interlock);
+		VN_RELE(vp);
+	    } else {
+#ifdef AFS_DARWIN14_ENV
+	        /* We left the refcount high in 1.4 */
+	        vp->v_usecount--;
+#endif
+	        simple_unlock(&vp->v_interlock);
+	    }
+	}
+    }
+    AFS_GLOCK();
+    if (slept)
+        ObtainWriteLock(&afs_xvcache,175);
+    else
+        ObtainReadLock(&afs_xvcache);
 }
 
 void osi_VM_NukePages(struct vnode *vp, off_t offset, off_t size) {
Index: src/afs/DARWIN/osi_vnodeops.c
===================================================================
RCS file: /cvs/openafs/src/afs/DARWIN/osi_vnodeops.c,v
retrieving revision 1.4.2.8
diff -u -r1.4.2.8 osi_vnodeops.c
--- src/afs/DARWIN/osi_vnodeops.c	24 Oct 2003 05:24:39 -0000	1.4.2.8
+++ src/afs/DARWIN/osi_vnodeops.c	23 Jun 2004 18:38:57 -0000
@@ -187,6 +187,16 @@
     vp = AFSTOV(vcp);  /* always get a node if no error */
     vp->v_vfsp = dvp->v_vfsp;
 
+    if (UBCINFOMISSING(vp) ||
+	UBCINFORECLAIMED(vp)) {
+        if (UBCINFORECLAIMED(vp) && ISSET(vp->v_flag, (VXLOCK|VORECLAIM))) {
+	    DROPNAME();
+	    return (ENXIO);
+	} else {
+	    ubc_info_init(vp);
+	}
+    }
+
     /* The parent directory comes in locked.  We unlock it on return
        unless the caller wants it left locked.
        we also always return the vnode locked. */
@@ -253,8 +263,16 @@
 	(*ap->a_vpp)->v_vfsp = dvp->v_vfsp;
 	vn_lock(*ap->a_vpp, LK_EXCLUSIVE| LK_RETRY, p);
         if (UBCINFOMISSING(*ap->a_vpp) ||
-            UBCINFORECLAIMED(*ap->a_vpp))
-                ubc_info_init(*ap->a_vpp);
+            UBCINFORECLAIMED(*ap->a_vpp)) {
+	    if (UBCINFORECLAIMED(*ap->a_vpp) && ISSET((*ap->a_vpp)->v_flag, 
+						      (VXLOCK|VORECLAIM))) {
+	        vput(dvp);
+		DROPNAME();
+		return (ENXIO);
+	    } else {
+	        ubc_info_init(*ap->a_vpp);
+	    }
+	}
     }
     else *ap->a_vpp = 0;
 
@@ -352,6 +370,17 @@
          printf("afs: WARNING: ui_refcount panic averted\n");
        }
     }
+    if (UBCINFOMISSING(ap->a_vp) ||
+	UBCINFORECLAIMED(ap->a_vp)) {
+        if (UBCINFORECLAIMED(ap->a_vp) && ISSET(ap->a_vp->v_flag, 
+						(VXLOCK|VORECLAIM))) {
+	  printf("no ubc for %x in close, reclaim set\n", ap->a_vp);
+	  return (ENXIO);
+	} else {
+	  printf("no ubc for %x in close, put back\n", ap->a_vp);
+	  ubc_info_init(ap->a_vp);
+	}
+    }
 #endif
 
     return code;
@@ -568,6 +597,7 @@
     struct iovec    aiov;
     struct uio * uio = &auio;
     int nocommit = flags & UPL_NOCOMMIT;
+    int iosize;
 
     int code;
     struct vcache *tvc=VTOAFS(vp);
@@ -584,7 +614,7 @@
             panic("afs_vop_pageout: no upl");
     }
 #if 1
-    { int lbn, iosize, s;
+    { int lbn, s;
       struct buf *bp;
       int biosize = DEV_BSIZE;
 
@@ -634,6 +664,20 @@
     if (f_offset & PAGE_MASK)
             panic("afs_vop_pageout: offset not page aligned");
 
+    /* size will always be a multiple of PAGE_SIZE */
+    /* pageout isn't supposed to extend files */
+    if (f_offset + size > tvc->m.Length)
+        iosize = tvc->m.Length - f_offset;
+    else
+        iosize = size;
+ 
+    if (size > (iosize + (PAGE_SIZE - 1)) & ~PAGE_MASK && !nocommit) {
+        int iosize_rnd=(iosize + (PAGE_SIZE - 1)) & ~PAGE_MASK;
+	kernel_upl_abort_range(pl, pl_offset + iosize_rnd,
+			       size - iosize_rnd,
+			       UPL_ABORT_FREE_ON_EMPTY);
+    }
+
     auio.uio_iov = &aiov;
     auio.uio_iovcnt = 1;
     auio.uio_offset = f_offset;
@@ -642,7 +686,7 @@
     auio.uio_procp = NULL;
     kernel_upl_map(kernel_map, pl, &ioaddr);
     ioaddr += pl_offset;
-    auio.uio_resid = aiov.iov_len = size;
+    auio.uio_resid = aiov.iov_len = iosize;
     aiov.iov_base = (caddr_t)ioaddr;
 #if 1 /* USV [ */
         {
@@ -807,15 +851,16 @@
     cache_purge(vp);
     if (!error && UBCINFOEXISTS(vp)) {
 #ifdef AFS_DARWIN14_ENV
-             (void) ubc_uncache(vp); 
+        /* If crashes continue in ubc_hold, comment this out */
+        /* (void) ubc_uncache(vp); */
 #else
-             int wasmapped=ubc_issetflags(vp, UI_WASMAPPED);
-             int hasobjref=ubc_issetflags(vp, UI_HASOBJREF);
-             if (wasmapped)
-                (void) ubc_uncache(vp); 
-             if (hasobjref)
-                ubc_release(vp);
-             /* WARNING vp may not be valid after this */
+	int wasmapped=ubc_issetflags(vp, UI_WASMAPPED);
+	int hasobjref=ubc_issetflags(vp, UI_HASOBJREF);
+	if (wasmapped)
+	    (void) ubc_uncache(vp); 
+	if (hasobjref)
+	    ubc_release(vp);
+	/* WARNING vp may not be valid after this */
 #endif
     }
     if (dvp == vp)
@@ -887,6 +932,15 @@
     register struct vnode *fdvp = ap->a_fdvp;
     struct proc *p=fcnp->cn_proc;
 
+    /* Check for cross-device rename.
+     * For AFS, this means anything not in AFS-space
+     */
+    if ((0 != strcmp(tdvp->v_mount->mnt_stat.f_fstypename, "afs")) ||
+	(tvp && (0 != strcmp(tvp->v_mount->mnt_stat.f_fstypename, "afs")))) {
+        error = EXDEV;
+	goto abortit;
+    }
+ 
     /*
      * if fvp == tvp, we're just removing one name of a pair of
      * directory entries for the same element.  convert call into rename.
@@ -922,8 +976,21 @@
 	if ((fcnp->cn_flags & SAVESTART) == 0)
 	    panic("afs_rename: lost from startdir");
 	fcnp->cn_nameiop = DELETE;
-	(void) relookup(fdvp, &fvp, fcnp);
-	return (VOP_REMOVE(fdvp, fvp, fcnp));
+	VREF(fdvp); 
+        error=relookup(fdvp, &fvp, fcnp);
+        if (error == 0)
+	    vrele(fdvp);
+        if (fvp == NULL) {
+	    return (ENOENT);
+        }
+        
+        error=VOP_REMOVE(fdvp, fvp, fcnp);
+        if (fdvp == fvp)
+            vrele(fdvp);
+        else
+            vput(fdvp);
+        vput(fvp);
+        return (error);
     }
     if (error = vn_lock(fvp, LK_EXCLUSIVE, p))
 	goto abortit;
Index: src/afs/VNOPS/afs_vnop_remove.c
===================================================================
RCS file: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v
retrieving revision 1.4.4.10
diff -u -r1.4.4.10 afs_vnop_remove.c
--- src/afs/VNOPS/afs_vnop_remove.c	22 Jul 2002 23:47:11 -0000	1.4.4.10
+++ src/afs/VNOPS/afs_vnop_remove.c	23 Jun 2004 18:38:58 -0000
@@ -369,8 +369,12 @@
 #ifdef	AFS_AIX_ENV
     if (tvc && (VREFCOUNT(tvc) > 2) && tvc->opens > 0 && !(tvc->states & CUnlinked)) {
 #else
+#ifdef AFS_DARWIN14_ENV
+    if (tvc && (VREFCOUNT(tvc) > 1 + DARWIN_REFBASE) && tvc->opens > 0 && !(tvc->states & CUnlinked)) {
+#else
     if (tvc && (VREFCOUNT(tvc) > 1) && tvc->opens > 0 && !(tvc->states & CUnlinked)) {
 #endif
+#endif
 	char *unlname = newname();
 
 	ReleaseWriteLock(&adp->lock);
@@ -417,6 +421,7 @@
     struct VenusFid dirFid;
     register struct dcache *tdc;
     afs_int32 offset, len, code=0;
+    int oldref = 0;
 
     if (NBObtainWriteLock(&avc->lock, 423))
 	return 0;
@@ -434,7 +439,7 @@
 	    cred = avc->uncred;
 	    avc->uncred = NULL;
 
-#ifdef AFS_DARWIN_ENV
+#if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN14_ENV)
            /* this is called by vrele (via VOP_INACTIVE) when the refcount
               is 0. we can't just call VN_HOLD since vref will panic.
               we can't just call osi_vnhold because a later AFS_RELE will call
@@ -452,6 +457,13 @@
 	     */
 	    avc->states  &= ~(CUnlinked | CUnlinkedDel);
 
+#ifdef AFS_DARWIN14_ENV
+	    if (VREFCOUNT(avc) < 4) {
+	        oldref = 4 - VREFCOUNT(avc);
+		VREFCOUNT_SET(avc, 4);
+	    }
+#endif
+
 	    ReleaseWriteLock(&avc->lock);
 
 	    dirFid.Cell = avc->fid.Cell;
@@ -475,8 +487,15 @@
 	    osi_FreeSmallSpace(unlname);
 	    crfree(cred);
 #ifdef AFS_DARWIN_ENV
+#ifndef AFS_DARWIN14_ENV
 	    osi_Assert(VREFCOUNT(avc) == 1);
 	    VREFCOUNT_SET(avc, 0);
+#else
+           if (oldref) {
+	       int newref = VREFCOUNT(avc) - oldref;
+               VREFCOUNT_SET(avc, newref);
+           }
+#endif
 #endif
         }
     }
Index: src/config/param.ppc_darwin_70.h
===================================================================
RCS file: /cvs/openafs/src/config/param.ppc_darwin_70.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 param.ppc_darwin_70.h
--- src/config/param.ppc_darwin_70.h	24 Oct 2003 05:24:46 -0000	1.1.2.1
+++ src/config/param.ppc_darwin_70.h	23 Jun 2004 18:39:00 -0000
@@ -12,6 +12,7 @@
 
 #include <afs/afs_sysnames.h>
 
+#define DARWIN_REFBASE 3
 #define AFS_DARWIN_ENV
 #define AFS_DARWIN13_ENV
 #define AFS_DARWIN14_ENV
Index: src/config/param.ppc_darwin_70_usr.h
===================================================================
RCS file: /cvs/openafs/src/config/Attic/param.ppc_darwin_70_usr.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 param.ppc_darwin_70_usr.h
--- src/config/param.ppc_darwin_70_usr.h	24 Oct 2003 05:24:46 -0000	1.1.2.1
+++ src/config/param.ppc_darwin_70_usr.h	23 Jun 2004 18:39:00 -0000
@@ -4,6 +4,8 @@
 #ifndef AFS_PARAM_H
 #define AFS_PARAM_H
 
+#define DARWIN_REFBASE 3
+
 #define AFS_VFSINCL_ENV 1       /* NOBODY uses this.... */
 #define AFS_ENV                 1
 #define AFS_64BIT_ENV           1       /* Defines afs_int32 as int, not long. */
Index: src/packaging/MacOS/CellServDB
===================================================================
RCS file: /cvs/openafs/src/packaging/MacOS/CellServDB,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 CellServDB
--- src/packaging/MacOS/CellServDB	9 Jul 2003 18:24:12 -0000	1.1.2.1
+++ src/packaging/MacOS/CellServDB	23 Jun 2004 18:39:03 -0000
@@ -1,34 +1,80 @@
->grand.central.org      #GCO Public CellServDB 10 Apr 2002
+>grand.central.org      #GCO Public CellServDB 11 May 2004
 18.7.14.88                      #grand-opening.mit.edu
 128.2.191.224                   #penn.central.org
 >wu-wien.ac.at          #University of Economics, Vienna, Austria
 137.208.3.33                    #afsdb1.wu-wien.ac.at
 137.208.7.4                     #afsdb2.wu-wien.ac.at
 137.208.7.7                     #afsdb3.wu-wien.ac.at
+>hephy.at               #hephy-vienna
+193.170.243.10                  #mowgli.oeaw.ac.at
+193.170.243.12                  #baloo.oeaw.ac.at
+193.170.243.14                  #akela.oeaw.ac.at
+>itp.tugraz.at          #Institute for Theoretical Physics, TU Graz, Austria
+129.27.157.6                    #fubphsv2.tu-graz.ac.at
+129.27.161.7                    #faepsv01.tu-graz.ac.at
+129.27.161.15                   #faepsv02.tu-graz.ac.at
 >cern.ch                #European Laboratory for Particle Physics, Geneva
 137.138.128.148                 #afsdb1.cern.ch
 137.138.246.50                  #afsdb3.cern.ch
 137.138.246.51                  #afsdb2.cern.ch
+>ams.cern.ch            #AMS Experiment
+137.138.206.77                  #pcamsf2.cern.ch
+137.138.206.123                 #pcamsf4.cern.ch
 >ethz.ch                #Swiss Federal Inst. of Tech. - Zurich, Switzerland
 129.132.97.19                   #amalthea.ethz.ch
 129.132.97.27                   #nethzafs-001.ethz.ch
 129.132.115.3                   #himalia.ethz.ch
 129.132.115.37                  #nethzafs-005.ethz.ch
 129.132.115.38                  #nethzafs-006.ethz.ch
+>psi.ch                 #Paul Scherrer Institut - Villigen, Switzerland
+129.129.16.10                   #afs1.psi.ch
+129.129.16.11                   #afs2.psi.ch
 >extundo.com            #Simon Josefsson's cell
 195.42.214.241                  #slipsten.extundo.com
 >mekinok.com            #Mekinok, Inc.
-4.17.166.66                     #loggerhead.mekinok.com
+4.36.43.98                      #loggerhead.mekinok.com
+>membrain.com           #membrain.com
+66.93.118.125                   #stormy
+130.85.24.11                    #weasel
+130.85.24.13                    #straykitten
+>midnightlinux.com      #Midnight Linux, Pittsburgh PA
+66.93.62.18                     #romulus.midnihtlinux.com
+66.93.62.20                     #yar.midnightlinux.com
+>setfilepointer.com     #SetFilePointer.com
+63.224.10.2                     #hamlet.SetFilePointer.com
+63.224.10.4                     #troilus.SetFilePointer.com
 >sodre.cx               #Sodre.cx
 128.8.140.165                   #greed.sodre.cx
+>desy.de                #Deutsches Elektronen-Synchrotron
+131.169.40.62                   #vayu.desy.de
+131.169.244.60                  #solar00.desy.de
+>gppc.de                #GPP Chemnitz mbH
+213.187.92.33                   #gpp1.gppc.de
+213.187.92.34                   #paulchen.gppc.de
+213.187.92.35                   #lotus.gppc.de
+>ifh.de                 #DESY Zeuthen
+141.34.22.10                    #romulus.ifh.de
+141.34.22.11                    #remus.ifh.de
+141.34.22.29                    #hekate.ifh.de
+>lrz-muenchen.de        #Leibniz Computing Centre, Germany
+129.187.10.36                   #afs1.lrz-muenchen.de
+129.187.10.56                   #afs3.lrz-muenchen.de
+129.187.10.57                   #afs2.lrz-muenchen.de
 >ipp-garching.mpg.de    #Institut fuer Plasmaphysik
 130.183.9.5                     #afs-db1.rzg.mpg.de
 130.183.100.10                  #afs-db2.aug.ipp-garching.mpg.de
 130.183.100.23                  #afs-db3.aug.ipp-garching.mpg.de
+>mpe.mpg.de             #MPE cell
+130.183.130.7                   #irafs1.mpe-garching.mpg.de
+130.183.134.20                  #irafs2.mpe-garching.mpg.de
+>i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen
+137.226.244.79                  #remus.informatik.rwth-aachen.de
 >tu-chemnitz.de         #Technische Universitaet Chemnitz, Germany
 134.109.2.1                     #zuse.hrz.tu-chemnitz.de
 134.109.2.15                    #phoenix.hrz.tu-chemnitz.de
 134.109.200.7                   #aetius.hrz.tu-chemnitz.de
+>e18.ph.tum.de          #Experimental Physics, TU Munich, Germany
+129.187.154.223                 #hamlet.e18.physik.tu-muenchen.de
 >uni-bonn.de            #Cell name
 131.220.14.198                  #work15-eth.rhrz.uni-bonn.de
 131.220.14.203                  #node03-en2.rhrz.uni-bonn.de
@@ -37,53 +83,92 @@
 132.230.6.235                   #sv6.ruf.uni-freiburg.de
 132.230.6.236                   #sv7.ruf.uni-freiburg.de
 132.230.6.237                   #sv8.ruf.uni-freiburg.de
+>physik.uni-freiburg.de #institute of physics, university Freiburg, Germany
+132.230.77.16                   #hepafs.physik.uni-freiburg.de
+>urz.uni-heidelberg.de  #Uni Heidelberg (Rechenzentrum)
+129.206.119.10                  #afsdb.urz.uni-heidelberg.de
+129.206.119.16                  #afsdb1.urz.uni-heidelberg.de
+129.206.119.17                  #afsdb2.urz.uni-heidelberg.de
 >uni-hohenheim.de       #University of Hohenheim
 144.41.2.2                      #rs13.serv.uni-hohenheim.de
 144.41.2.3                      #rs14.serv.uni-hohenheim.de
 144.41.2.4                      #rs15.serv.uni-hohenheim.de
+>rz.uni-jena.de         #Rechenzentrum University of Jena, Germany
+141.35.2.160                    #lc00.rz.uni-jena.de
+141.35.7.9                      #fsuj01.rz.uni-jena.de
+141.35.7.10                     #zaphod.rz.uni-jena
 >meteo.uni-koeln.de     #Univ. of Cologne - Inst. for Geophysics & Meteorology
-134.95.144.200                  #bora.meteo.uni-koeln.de
-134.95.144.208                  #monsun.meteo.uni-koeln.de
-134.95.144.213                  #brise.meteo.uni-koeln.de
->sunsite.dk             #SunSITE.dk
-130.225.51.30                   #sunsite.dk
->andrew.cmu.edu         #Carnegie Mellon University - Computing Services
+134.95.144.22                   #afs1.meteo.uni-koeln.de
+134.95.144.24                   #afs2.meteo.uni-koeln.de
+>rrz.uni-koeln.de       #University of Cologne - Reg Comp Center
+134.95.19.3                     #afsdb1.rrz.uni-koeln.de
+134.95.19.30                    #fileserv3.rrz.uni-koeln.de
+134.95.67.97                    #afs.thp.uni-koeln.de
+134.95.140.190                  #rzkbserv.rrz.uni-koeln.de
+>physik.uni-mainz.de    #institute of physics, university Mainz, Germany
+134.93.130.93                   #hardy.physik.uni-mainz.de
+>uni-mannheim.de        #Uni Mannheim (Rechenzentrum)
+134.155.50.165                  #afsdbx.uni-mannheim.de
+134.155.50.166                  #afsdby.uni-mannheim.de
+134.155.50.167                  #afsdbz.uni-mannheim.de
+>physik.uni-wuppertal.de #Physics department of Bergische Universität Wuppertal
+132.195.104.3                   #afs1.physik.uni-wuppertal.de
+132.195.104.230                 #afs2.physik.uni-wuppertal.de
+>ies.auc.dk             #Aalborg Univ., Inst. of Electronic Systems, Denmark
+130.225.51.73                   #afsdb1.kom.auc.dk
+130.225.51.74                   #afsdb2.kom.auc.dk
+130.225.51.85                   #afsdb3.kom.auc.dk
+>hep.caltech.edu        #CalTech High Energy Physics
+131.215.126.150                 #afs.hep.caltech.edu
+>andrew.cmu.edu         #Carnegie Mellon University - Computing Services Cell
 128.2.10.2                      #vice2.fs.andrew.cmu.edu
 128.2.10.7                      #vice7.fs.andrew.cmu.edu
 128.2.10.11                     #vice11.fs.andrew.cmu.edu
-128.2.10.12                     #vice12.fs.andrew.cmu.edu
 128.2.10.28                     #vice28.fs.andrew.cmu.edu
+128.2.32.44                     #new-vice12.fs.andrew.cmu.edu
 >club.cc.cmu.edu        #Carnegie Mellon University Computer Club
 128.2.4.131                     #yttrium.club.cc.cmu.edu
 128.2.4.132                     #zirconium.club.cc.cmu.edu
+>chem.cmu.edu           #Carnegie Mellon University - Chemistry Dept.
+128.2.40.134                    #afs.chem.cmu.edu
+128.2.40.140                    #afs2.chem.cmu.edu
 >cs.cmu.edu             #Carnegie Mellon University - School of Comp. Sci.
-128.2.206.130                   #cucumber.srv.cs.cmu.edu
-128.2.222.199                   #papaya.srv.cs.cmu.edu
-128.2.242.86                    #lemon.srv.cs.cmu.edu
+128.2.194.178                   #cherry.srv.cs.cmu.edu
+128.2.194.179                   #pumpkin.srv.cs.cmu.edu
+128.2.194.180                   #strawberry.srv.cs.cmu.edu
 >ece.cmu.edu            #Carnegie Mellon University - Elec. Comp. Eng. Dept.
 128.2.129.7                     #porok.ece.cmu.edu
 128.2.129.8                     #vicio.ece.cmu.edu
 128.2.129.9                     #e-xing.ece.cmu.edu
-128.2.136.109                   #last.ece.cmu.edu
+>scotch.ece.cmu.edu     #CMU ECE CALCM research group
+128.2.134.82                    #lagavulin.ece.cmu.edu
 >msc.cornell.edu        #Cornell University Materials Science Center
 128.84.231.242                  #miranda.ccmr.cornell.edu
 128.84.241.35                   #co.ccmr.cornell.edu
 128.84.249.78                   #dax.ccmr.cornell.edu
+>dbic.dartmouth.edu     #Dartmouth Brain Imaging Center
+129.170.30.143                  #dbicafs1.dartmouth.edu
+129.170.30.144                  #dbicafs2.dartmouth.edu
+129.170.30.145                  #dbicafs3.dartmouth.edu
+>northstar.dartmouth.edu #Dartmouth College Research Computing
+129.170.16.22                   #halley.dartmouth.edu
+129.170.16.42                   #oort.dartmouth.edu
+129.170.16.43                   #cygnusx1.dartmouth.edu
 >iastate.edu            #Iowa State University
 129.186.1.243                   #afsdb-1.iastate.edu
 129.186.6.243                   #afsdb-2.iastate.edu
 129.186.142.243                 #afsdb-3.iastate.edu
 >athena.mit.edu         #MIT/Athena cell
 18.7.1.66                       #paris.mit.edu.
-18.145.0.25                     #agamemnon.mit.edu.
+18.7.1.74                       #chimera.mit.edu.
 18.158.0.37                     #prill.mit.edu.
 >dev.mit.edu            #MIT/IS Development cell
 18.7.1.70                       #wham.mit.edu.
 18.7.15.89                      #rattle.mit.edu.
 18.7.15.93                      #hum.mit.edu.
 >net.mit.edu            #MIT/Network Group cell
-18.72.0.26                      #cetus.mit.edu.
-18.72.1.38                      #gracie.mit.edu.
+18.7.7.73                       #gracie.mit.edu
+18.7.21.95                      #george.mit.edu
 >sipb.mit.edu           #MIT/SIPB cell
 18.181.0.19                     #reynelda.mit.edu.
 18.181.0.22                     #rosebud.mit.edu.
@@ -98,6 +183,20 @@
 136.142.8.15                    #afs09.srv.cis.pitt.edu
 136.142.8.20                    #afs10.srv.cis.pitt.edu
 136.142.8.21                    #afs11.srv.cis.pitt.edu
+>cs.pitt.edu            #University of Pittsburgh - Computer Science
+130.49.220.11                   #afs01.cs.pitt.edu
+130.49.220.12                   #afs02.cs.pitt.edu
+130.49.220.13                   #afs03.cs.pitt.edu
+>psc.edu                #PSC (Pittsburgh Supercomputing Center)
+128.182.59.182                  #shaggy.psc.edu
+128.182.66.184                  #velma.psc.edu
+128.182.66.185                  #daphne.psc.edu
+>scoobydoo.psc.edu      #PSC Test Cell
+128.182.59.181                  #scooby.psc.edu
+>cede.psu.edu           #Penn State - Center for Engr. Design & Entrepeneurship
+146.186.218.10                  #greenly.cede.psu.edu
+146.186.218.60                  #b50.cede.psu.edu
+146.186.218.246                 #stalin.cede.psu.edu
 >rose-hulman.edu        #Rose-Hulman Institute of Technology
 137.112.7.11                    #afs1.rose-hulman.edu
 137.112.7.12                    #afs2.rose-hulman.edu
@@ -109,9 +208,12 @@
 128.113.22.12                   #joab.server.rpi.edu
 128.113.22.13                   #korah.server.rpi.edu
 128.113.22.14                   #achan.server.rpi.edu
->hep.sc.edu             #USC HEP cell
+>hep.sc.edu             #University of South Carolina, Dept. of Physics
 129.252.78.77                   #cpeven.physics.sc.edu
-129.252.78.79                   #redbaron.physics.sc.edu
+>cs.stanford.edu        #Stanford University Computer Science Department
+171.64.64.10                    #cs-afs-1.Stanford.EDU
+171.64.64.66                    #cs-afs-2.stanford.edu
+171.64.64.69                    #cs-afs-3.stanford.edu
 >ir.stanford.edu        #Stanford University
 171.64.7.222                    #afsdb1.stanford.edu
 171.64.7.234                    #afsdb2.stanford.edu
@@ -124,18 +226,22 @@
 128.114.129.14                  #elan.ucsc.edu
 128.114.129.15                  #ichabod.ucsc.edu
 128.114.129.18                  #maneki.ucsc.edu
+>acm.uiuc.edu           #ACM at the University of Illinois
+128.174.251.8                   #alnitak.acm.uiuc.edu
+128.174.251.9                   #alnilam.acm.uiuc.edu
+128.174.251.10                  #mintaka.acm.uiuc.edu
 >ncsa.uiuc.edu          #University of Illinois
 141.142.3.5                     #congo.ncsa.uiuc.edu
 141.142.3.8                     #nile.ncsa.uiuc.edu
 141.142.230.19                  #jinx.ncsa.uiuc.edu
 >umbc.edu               #University of Maryland, Baltimore County
-130.85.1.13                     #db2.afs.umbc.edu
-130.85.6.33                     #db1.afs.umbc.edu
-130.85.60.12                    #db3.afs.umbc.edu
+130.85.24.23                    #db2.afs.umbc.edu
+130.85.24.87                    #db3.afs.umbc.edu
+130.85.24.101                   #db1.afs.umbc.edu
 >glue.umd.edu           #University of Maryland - Project Glue
-128.8.10.44                     #tin.umd.edu
-128.8.10.126                    #iron.umd.edu
-128.8.70.10                     #copper.umd.edu
+128.8.70.11                     #olmec.umd.edu
+128.8.73.3                      #babylon.umd.edu
+129.2.128.53                    #egypt.umd.edu
 >wam.umd.edu            #University of Maryland Network WAM Project
 128.8.70.9                      #csc-srv.wam.umd.edu
 128.8.73.9                      #pg2-srv.wam.umd.edu
@@ -144,8 +250,12 @@
 141.211.1.32                    #fear.ifs.umich.edu
 141.211.1.33                    #surprise.ifs.umich.edu
 141.211.1.34                    #ruthless.ifs.umich.edu
->citi.umich.edu         #University of Michigan - CITI
-141.211.92.144                  #babble.citi.umich.edu
+>atlas.umich.edu        #ATLAS group cell in physics at University of Michigan
+141.211.43.102                  #linat02.grid.umich.edu
+141.211.43.106                  #linat06.grid.umich.edu
+141.211.43.109                  #atgrid.grid.umich.edu
+>citi.umich.edu         #Center for Information Technology Integration
+141.211.133.5                   #babylon.citi.umich.edu
 >lsa.umich.edu          #University of Michigan - College of LS&A
 141.211.54.132                  #curtis.admin.lsa.umich.edu
 141.211.61.23                   #zee.admin.lsa.umich.edu
@@ -155,23 +265,46 @@
 141.211.61.41                   #clark.math.lsa.umich.edu
 141.211.61.42                   #nimitz.math.lsa.umich.edu
 >umr.edu                #University of Missouri - Rolla
-131.151.1.59                    #afs1.umr.edu
-131.151.1.70                    #afs6.umr.edu
-131.151.1.146                   #afs5.umr.edu
+131.151.1.59                    #afsdb1.umr.edu
+131.151.1.70                    #afsdb3.umr.edu
+131.151.1.146                   #afsdb2.umr.edu
+>physics.unc.edu        #Univ. of NC at Chapel Hill, Dept. of Physics
+152.2.5.2                       #valerian.physics.unc.edu
+152.2.5.3                       #augustus.physics.unc.edu
+152.2.7.67                      #nerva.astro.unc.edu
+>uncc.edu               #University of NC at Charlotte Mosaic AFS Cell
+152.15.10.70                    #as-sm1.uncc.edu
+152.15.13.7                     #as-sm2.uncc.edu
+152.15.30.27                    #fs-kenn3.uncc.edu
 >eng.utah.edu           #University of Utah - Engineering
-155.99.222.40                   #afs1.eng.utah.edu
-155.99.222.41                   #afs2.eng.utah.edu
+155.99.222.9                    #lenny.eng.utah.edu
+155.99.222.10                   #carl.eng.utah.edu
 >cs.uwm.edu             #University of Wisconsin--Milwaukee
 129.89.38.124                   #solomons.cs.uwm.edu
 >cs.wisc.edu            #Univ. of Wisconsin-Madison, Computer Sciences Dept.
 128.105.132.14                  #timon.cs.wisc.edu
 128.105.132.15                  #pumbaa.cs.wisc.edu
 128.105.132.16                  #zazu.cs.wisc.edu
+>engr.wisc.edu          #University of Wisconsin-Madison, College of Engineering
+144.92.13.14                    #larry.cae.wisc.edu
+144.92.13.15                    #curly.cae.wisc.edu
+144.92.13.16                    #moe.cae.wisc.edu
 >hep.wisc.edu           #University of Wisconsin -- High Energy Physics
 128.104.28.219                  #anise.physics.wisc.edu
+>physics.wisc.edu       #Univ. of Wisconsin-Madison, Physics Department
+128.104.220.51                  #bubbles.physics.wisc.edu
+128.104.220.52                  #buttercup.physics.wisc.edu
+128.104.220.53                  #blossom.physics.wisc.edu
+>ifca.unican.es         #Instituto de Fisica de Cantabria (IFCA), Santander, Spain
+193.144.209.20                  #gridwall.ifca.unican.es
+>ific.uv.es             #Instituto de Fisica Corpuscular, Valencia, Spain
+147.156.163.11                  #alpha.ific.uv.es
 >biocenter.helsinki.fi  #University of Helsinki, Institute of Biotechnology
 128.214.58.174                  #afsdb1.biocenter.helsinki.fi
 128.214.88.114                  #afsdb2.biocenter.helsinki.fi
+>dapnia.saclay.cea.fr   #CEA DAPNIA
+132.166.32.7                    #dphrsg.saclay.cea.fr
+132.166.32.12                   #dphrsl.saclay.cea.fr
 >in2p3.fr               #IN2P3 production cell
 134.158.232.11                  #ccafsdb1.in2p3.fr
 134.158.232.12                  #ccafsdb2.in2p3.fr
@@ -180,6 +313,10 @@
 146.137.96.33                   #arteus.ctd.anl.gov
 146.137.162.88                  #agamemnon.ctd.anl.gov
 146.137.194.80                  #antenor.ctd.anl.gov
+>rhic.bnl.gov           #Relativistic Heavy Ion Collider
+130.199.6.51                    #rafs03.rcf.bnl.gov
+130.199.6.52                    #rafs02.rcf.bnl.gov
+130.199.6.69                    #rafs01.rcf.bnl.gov
 >usatlas.bnl.gov        #US Atlas Tier 1 Facility at BNL
 130.199.48.32                   #aafs01.usatlas.bnl.gov
 130.199.48.33                   #aafs02.usatlas.bnl.gov
@@ -188,9 +325,56 @@
 131.225.68.1                    #fsus01.fnal.gov
 131.225.68.4                    #fsus03.fnal.gov
 131.225.68.14                   #fsus04.fnal.gov
+>ic-afs.arc.nasa.gov    #Code IC, Ames Research Center
+128.102.105.62                  #udanax.arc.nasa.gov
+>nersc.gov              #National Energy Research Supercomputer Center
+128.55.128.250                  #mars.nersc.gov
+128.55.128.252                  #alfred.nersc.gov
+128.55.128.254                  #lurch.nersc.gov
+>caspur.it              #CASPUR Inter-University Computing Consortium, Rome
+193.204.5.45                    #pomodoro.caspur.it
+193.204.5.46                    #banana.caspur.it
+193.204.5.50                    #maslo.caspur.it
+>fusione.it             #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy
+192.107.90.2                    #fusafs1.frascati.enea.it
+192.107.90.3                    #fusafs2.frascati.enea.it
+192.107.90.4                    #fusafs3.frascati.enea.it
+>icemb.it               #ICEMB, Universita' La Sapienza - Rome - Italy
+193.204.6.130                   #icembfs.caspur.it
+>infn.it                #Istituto Nazionale di Fisica Nucleare (INFN), Italia
+131.154.1.7                     #afs3.infn.it
+141.108.3.252                   #afs1.infn.it
+192.84.134.75                   #afs2.infn.it
+>kloe.infn.it           #INFN, KLOE experiment at Laboratori di Frascati
+192.135.25.111                  #kloeafs1.lnf.infn.it
+192.135.25.112                  #kloeafs2.lnf.infn.it
+>le.infn.it             #INFN, Sezione di Lecce
+192.84.152.40                   #afs01.le.infn.it
+192.84.152.148                  #afs02.le.infn.it
+>lnf.infn.it            #INFN, Laboratori Nazionali di Frascati
+193.206.84.121                  #afs1.lnf.infn.it
+193.206.84.122                  #afs2.lnf.infn.it
+193.206.84.123                  #afs3.lnf.infn.it
+>lngs.infn.it           #INFN, Laboratori Nazionali di Gran Sasso
+192.84.135.21                   #rsgs05.lngs.infn.it
+>pi.infn.it             #INFN, Sezione di Pisa
+131.114.134.26                  #unknownhost.pi.infn.it
+192.84.133.50                   #aix1.pi.infn.it
+>psm.it                 #Progetto San Marco, Universita' di Roma-1
+151.100.1.65                    #atlante.psm.uniroma1.it
+>tgrid.it               #CASPUR-CILEA-CINECA Grid Cell
+193.204.5.33                    #cccgrid.caspur.it
 >ictp.trieste.it        #The Abdus Salam International Centre for Theoretical Physics (IC
 140.105.16.8                    #fs1.ictp.trieste.it
 140.105.16.9                    #fs2.ictp.trieste.it
+>ing.uniroma1.it        #Universita' La Sapienza, Fac. Ingeneria
+151.100.85.253                  #alfa.ing.uniroma1.it
+>vn.uniroma3.it         #University of Rome 3, Area Vasca Navale
+193.204.161.136                 #alfa.dia.uniroma3.it
+193.204.161.137                 #beta.dia.uniroma3.it
+193.204.161.138                 #gamma.dia.uniroma3.it
+>italia                 #Italian public AFS cell
+193.204.5.9                     #afs.caspur.it
 >cmf.nrl.navy.mil       #Naval Research Lab - CCS
 134.207.10.68                   #picard.cmf.nrl.navy.mil
 134.207.10.69                   #riker.cmf.nrl.navy.mil
@@ -203,37 +387,97 @@
 198.128.3.21                    #fs1.es.net
 198.128.3.22                    #fs2.es.net
 198.128.3.23                    #fs3.es.net
->zepa.net               #Kolya/zepa.net cell
-205.245.53.21                   #perseus.zepa.net.
-205.245.53.48                   #neptune.zepa.net.
+>laroia.net             #Laroia Networks
+66.66.102.254                   #supercore.laroia.net
+>sinenomine.net         #Sine Nomine Associates
+66.92.236.139                   #afs.sinenomine.net
+>slackers.net           #The Slackers' Network
+63.201.48.27                    #alexandria.slackers.net
 >nikhef.nl              #The Dutch National Institute for High Energy Physics
 192.16.185.26                   #afs1.nikhef.nl
 192.16.185.27                   #afs2.nikhef.nl
 >1ts.org                #KCR/private Karl Ramm, Cambridge, MA
 4.36.43.102                     #dol-guldur.1ts.org
+>bazquux.org            #Baz Quux Organization
+66.207.142.196                  #baxquux.org
+>coed.org               #Adam Pennington's Cell
+66.93.61.184                    #vice1.coed.org
+128.2.4.163                     #vice3.coed.org
 >dementia.org           #Dementia Unlimited
 128.2.12.45                     #alycia.dementia.org
 128.2.120.216                   #meredith.dementia.org
+>idahofuturetruck.org   #University of Idaho hybrid vehicle development
+12.18.238.210                   #dsle210.fsr.net
 >nimlabs.org            #Nimlabs, Ink. Cell.
 18.238.1.103                    #olfin.nimlabs.org
 18.238.1.105                    #caerbanog.nimlabs.org
->openafs.org            #OpenAFS
+>nomh.org               #nomh.org
+204.29.154.12                   #iota.nomh.org
+>oc7.org                #The OC7 Project
+128.2.6.107                     #vice3.oc7.org
+128.2.122.140                   #vice2.oc7.org
+>openafs.org            #OpenAFS Project
+128.2.13.199                    #new-virtue.openafs.org
 128.2.121.218                   #virtue.openafs.org
->rhic                   #Relativistic Heavy Ion Collider
-130.199.6.51                    #rafs03.rcf.bnl.gov
-130.199.6.52                    #rafs02.rcf.bnl.gov
-130.199.6.69                    #rafs01.rcf.bnl.gov
->dynarc.se              #Dynarc
-62.65.1.17                      #adder.dynarc.se
+130.237.48.87                   #andrew.e.kth.se
+130.237.48.107                  #onyx.e.kth.se
+>e.kth.se               #Royal Institute of Technology, Elektro
+130.237.32.145                  #sonen.e.kth.se
+130.237.48.7                    #anden.e.kth.se
+130.237.48.244                  #fadern.e.kth.se
+>hallf.kth.se           #Royal Institute of Technology, HALLF
+130.237.24.141                  #rasmus13.hallf.kth.se
+130.237.24.152                  #rasmus3.hallf.kth.se
+130.237.24.177                  #rasmus29.hallf.kth.se
 >isk.kth.se             #Royal Institute of Technology, ISK
 130.237.202.12                  #afsdb2.isk.kth.se
 130.237.206.13                  #afsdb1.isk.kth.se
 130.237.209.141                 #afsdb3.isk.kth.se
+>it.kth.se              #Royal Institute of Technology, IT
+130.237.212.15                  #ptah.it.kth.se
+130.237.212.16                  #toth.it.kth.se
+130.237.215.7                   #isis.it.kth.se
+>md.kth.se              #Royal Institute of Technology, MMK
+130.237.57.68                   #trinity.md.kth.se
+130.237.57.72                   #morpheus.md.kth.se
+130.237.67.230                  #neo.speech.kth.se
+>mech.kth.se            #Royal Institute of Technology, MECH
+130.237.233.142                 #matterhorn.mech.kth.se
+130.237.233.143                 #castor.mech.kth.se
+130.237.233.144                 #pollux.mech.kth.se
+>nada.kth.se            #Royal Institute of Technology, NADA
+130.237.222.20                  #kosmos.nada.kth.se
+130.237.223.12                  #sputnik.nada.kth.se
+130.237.224.78                  #mir.nada.kth.se
+130.237.227.23                  #gagarin.nada.kth.se
+130.237.228.28                  #laika.nada.kth.se
+>pdc.kth.se             #Royal Institute of Technology, PDC
+130.237.232.29                  #crab.pdc.kth.se
+130.237.232.112                 #anna.pdc.kth.se
+130.237.232.114                 #hokkigai.pdc.kth.se
+>stacken.kth.se         #Stacken Computer Club
+130.237.234.3                   #milko.stacken.kth.se
+130.237.234.43                  #hot.stacken.kth.se
+130.237.237.230                 #fishburger.stacken.kth.se
+>syd.kth.se             #Royal Institute of Technology, KTH-Syd
+130.237.83.23                   #afs.haninge.kth.se
+>physto.se              #Physics department Stockholm University
+130.237.205.36                  #sysafs1.physto.se
+130.237.205.72                  #sysafs2.physto.se
+>sanchin.se             #Sanchin Consulting AB, Sweden
+192.195.148.10                  #sesan.sanchin.se
+>su.se                  #Stockholm University
+130.237.162.81                  #afsdb1.su.se
+130.237.162.82                  #afsdb2.su.se
+>f9.ijs.si              #F9, Jozef Stefan Institue
+194.249.156.1                   #brenta.ijs.si
+>p-ng.si                #Nova Gorica Polytechnic
+193.2.120.2                     #solkan.p-ng.si
 >phy.bris.ac.uk         #Bristol University - phyics
 137.222.58.9                    #afs1.phy.bris.ac.uk
 >hep.man.ac.uk          #Manchester HEP
 194.36.2.3                      #afs1.hep.man.ac.uk
+194.36.2.4                      #afs2.hep.man.ac.uk
+194.36.2.5                      #afs3.hep.man.ac.uk
 >rl.ac.uk               #Rutherford Appleton Lab, England
-130.246.12.45                   #isabel.cc.rl.ac.uk
-130.246.15.135                  #tinkerbel.cc.rl.ac.uk
 130.246.183.164                 #wallace.cc.rl.ac.uk
Index: src/packaging/MacOS/buildpkg.sh
===================================================================
RCS file: /cvs/openafs/src/packaging/MacOS/buildpkg.sh,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 buildpkg.sh
--- src/packaging/MacOS/buildpkg.sh	24 Oct 2003 05:25:01 -0000	1.1.2.3
+++ src/packaging/MacOS/buildpkg.sh	23 Jun 2004 18:39:03 -0000
@@ -89,9 +89,9 @@
 mkdir $PKGROOT/private/var/db/openafs $PKGROOT/private/var/db/openafs/cache
 mkdir $PKGROOT/private/var/db/openafs/etc $PKGROOT/private/var/db/openafs/etc/config
 cp $RESSRC/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master
-echo andrew.cmu.edu > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample
+echo andrew.cmu.edu > $PKGROOT/private/var/db/openafs/etc/ThisCell
 if [ $majorvers -ge 7 ]; then
-    echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+    echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo
     make AFSINCLUDE=$BINDEST/include
     cp afssettings $PKGROOT/private/var/db/openafs/etc/config
     cp settings.plist $PKGROOT/private/var/db/openafs/etc/config/settings.plist.orig
@@ -99,7 +99,7 @@
 else
     echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
 fi
-#echo '-stat 2000 -dcache 800 -daemons 3 -volumes 70 -rootvol root.afs.local' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample
+echo '-stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options
 
 strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs