Index: trunk/server/common/patches/openafs-scripts.patch
===================================================================
--- trunk/server/common/patches/openafs-scripts.patch	(revision 2066)
+++ trunk/server/common/patches/openafs-scripts.patch	(revision 2591)
@@ -46,8 +46,8 @@
 #
 diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 7c7705e..0d0e94f 100644
+index 03caf1c..699b2ce 100644
 --- a/src/afs/LINUX/osi_vnodeops.c
 +++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -904,6 +904,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
+@@ -1207,6 +1207,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
  	/* should we always update the attributes at this point? */
  	/* unlikely--the vcache entry hasn't changed */
@@ -79,5 +79,5 @@
  #ifdef notyet
 diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
-index eabcfeb..6390850 100644
+index feb0ca7..ba818c7 100644
 --- a/src/afs/VNOPS/afs_vnop_access.c
 +++ b/src/afs/VNOPS/afs_vnop_access.c
@@ -119,5 +119,5 @@
  }
 diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
-index b3931e5..71ef05c 100644
+index d01aff2..0a38c1c 100644
 --- a/src/afs/VNOPS/afs_vnop_attrs.c
 +++ b/src/afs/VNOPS/afs_vnop_attrs.c
@@ -134,8 +134,8 @@
  #elif defined(AFS_DARWIN80_ENV)
 diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
-index 8e7af1c..7e984e9 100644
+index 5d96f75..7957eee 100644
 --- a/src/afs/VNOPS/afs_vnop_lookup.c
 +++ b/src/afs/VNOPS/afs_vnop_lookup.c
-@@ -1877,6 +1877,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
+@@ -1915,6 +1915,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
      }
  
@@ -151,5 +151,5 @@
  	osi_FreeLargeSpace(tname);
 diff --git a/src/afs/afs.h b/src/afs/afs.h
-index fcc4c70..0d53af6 100644
+index 88d5f77..61d3ee9 100644
 --- a/src/afs/afs.h
 +++ b/src/afs/afs.h
@@ -171,8 +171,8 @@
      afs_int32 flags;		/* things like O_SYNC, O_NONBLOCK go here */
      char initd;			/* if non-zero, Error fields meaningful */
-@@ -887,6 +895,7 @@ struct vcache {
- #ifdef AFS_SUN5_ENV
+@@ -896,6 +904,7 @@ struct vcache {
      struct afs_q multiPage;	/* list of multiPage_range structs */
  #endif
+     afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */
 +    int apache_access;		/* whether or not Apache has access to a file */
  };
@@ -180,8 +180,8 @@
  #define	DONT_CHECK_MODE_BITS	0
 diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
-index 1834e6d..673a8e6 100644
+index 2ecd38e..95aafcd 100644
 --- a/src/afs/afs_analyze.c
 +++ b/src/afs/afs_analyze.c
-@@ -368,7 +368,7 @@ afs_Analyze(struct afs_conn *aconn, afs_int32 acode,
+@@ -478,7 +478,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
  			 (afid ? afid->Fid.Volume : 0));
  	}
@@ -193,5 +193,5 @@
  	    areq->volumeError = VOLBUSY;
 diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
-index c888605..ff5cf2d 100644
+index efce229..c1c1871 100644
 --- a/src/afs/afs_osi_pag.c
 +++ b/src/afs/afs_osi_pag.c
@@ -206,5 +206,5 @@
   * representation is '41XXXXXX' hex are used to represent the pags.
 @@ -484,6 +486,15 @@ afs_InitReq(struct vrequest *av, afs_ucred_t *acred)
- 	av->uid = afs_cr_uid(acred);	/* default when no pag is set */
+ 	av->uid = afs_cr_ruid(acred);	/* default when no pag is set */
  #endif
      }
@@ -222,8 +222,8 @@
  
 diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
-index f282510..00f1360 100644
+index e0a744d..c1c8c8c 100644
 --- a/src/afs/afs_pioctl.c
 +++ b/src/afs/afs_pioctl.c
-@@ -1406,6 +1406,10 @@ DECL_PIOCTL(PSetAcl)
+@@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)
      struct rx_connection *rxconn;
      XSTATS_DECLS;
@@ -236,5 +236,5 @@
      if (!avc)
  	return EINVAL;
-@@ -1790,6 +1794,10 @@ DECL_PIOCTL(PSetTokens)
+@@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens)
      struct vrequest treq;
      afs_int32 flag, set_parent_pag = 0;
@@ -247,5 +247,5 @@
      if (!afs_resourceinit_flag) {
  	return EIO;
-@@ -2231,6 +2239,11 @@ DECL_PIOCTL(PGetTokens)
+@@ -2266,6 +2274,11 @@ DECL_PIOCTL(PGetTokens)
      int newStyle;
      int code = E2BIG;
@@ -259,5 +259,5 @@
      if (!afs_resourceinit_flag)	/* afs daemons haven't started yet */
  	return EIO;		/* Inappropriate ioctl for device */
-@@ -2341,6 +2354,10 @@ DECL_PIOCTL(PUnlog)
+@@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog)
      afs_int32 i;
      struct unixuser *tu;