Index: trunk/server/common/patches/openafs-delta-dprintf-rename-20090427.patch
===================================================================
--- trunk/server/common/patches/openafs-delta-dprintf-rename-20090427.patch	(revision 1259)
+++ 	(revision )
@@ -1,90 +1,0 @@
-===================================================================
-RCS file: /cvs/openafs/src/bucoord/bc.p.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- openafs/src/bucoord/bc.p.h	2009/03/16 13:32:04	1.8
-+++ openafs/src/bucoord/bc.p.h	2009/04/27 19:17:14	1.9
-@@ -144,4 +144,4 @@
- #define	BC_MAXSIMDUMPS	    64
- #define BC_MAXPORTS	    128	/* max number of port offsets for volrestore */
- /* debugging support */
--#define	dprintf(x)
-+#define	afs_dprintf(x)
-===================================================================
-RCS file: /cvs/openafs/src/bucoord/ubik_db_if.c,v
-retrieving revision 1.17
-retrieving revision 1.18
-diff -u -r1.17 -r1.18
---- openafs/src/bucoord/ubik_db_if.c	2009/03/27 13:45:49	1.17
-+++ openafs/src/bucoord/ubik_db_if.c	2009/04/27 19:17:14	1.18
-@@ -574,7 +574,7 @@
- 
-     fileSize = (afs_int32) filesize(ctPtr->textStream);
- 
--    dprintf(("filesize is %d\n", fileSize));
-+    afs_dprintf(("filesize is %d\n", fileSize));
- 
-     rewind(ctPtr->textStream);
- 
-@@ -1350,7 +1350,7 @@
- 	ERROR(errno);
- #endif
- 
--    dprintf(("file is %s\n", tmpFileName));
-+    afs_dprintf(("file is %s\n", tmpFileName));
- 
-   normal_exit:
-     return code;
-===================================================================
-RCS file: /cvs/openafs/src/config/debug.h,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- openafs/src/config/debug.h	2003/07/15 23:14:55	1.4
-+++ openafs/src/config/debug.h	2009/04/27 19:17:12	1.5
-@@ -112,21 +112,21 @@
- 
- #if defined(AFS_DEBUG)
- #if defined(lint)
--#define dprintf(flag, str) printf str
-+#define afs_dprintf(flag, str) printf str
- #define dlprintf(flag, level, str) printf str
- #define dmprintf(flag, bit, str) printf str
- #else /* lint */
--#define dprintf(flag, str) \
-+#define afs_dprintf(flag, str) \
-       (void)((flag) ? \
- 	     ( osi_dp str, osi_dp("\t%s, %d\n", __FILE__, __LINE__)):0)
--#define dlprintf(flag, level, str) dprintf(((flag) >= (level)), str)
--#define dmprintf(flag, bit, str) dprintf(((flag)&(1<<((bit)-1))), str)
-+#define dlprintf(flag, level, str) afs_dprintf(((flag) >= (level)), str)
-+#define dmprintf(flag, bit, str) afs_dprintf(((flag)&(1<<((bit)-1))), str)
- 
- #endif /* lint */
- 
- #else /* AFS_DEBUG */
- 
--#define dprintf(flag, str)
-+#define afs_dprintf(flag, str)
- #define dlprintf(flag, level,str)
- #define dmprintf(flag, bit, str)
- 
-===================================================================
-RCS file: /cvs/openafs/src/sgistuff/rcmd.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- openafs/src/sgistuff/rcmd.c	2005/08/16 17:58:27	1.1
-+++ openafs/src/sgistuff/rcmd.c	2009/04/27 19:17:15	1.2
-@@ -55,8 +55,8 @@
- #endif /* defined(AFS_HPUX_ENV) */
- #ifdef	TCP_DEBUG
- #include <sys/syslog.h>
--#	define	DPRINTF(args)	dprintf args
--dprintf(args)
-+#	define	DPRINTF(args)	afs_dprintf args
-+afs_dprintf(args)
-      char *args;
- {
-     char **argv;
Index: trunk/server/common/patches/openafs-delta-linux26-defer-cred-changing-20090511.patch
===================================================================
--- trunk/server/common/patches/openafs-delta-linux26-defer-cred-changing-20090511.patch	(revision 1259)
+++ 	(revision )
@@ -1,15 +1,0 @@
---- openafs-1.4.10/src/afs/LINUX/osi_cred.c.orig	2009-06-12 02:03:13.000000000 -0400
-+++ openafs-1.4.10/src/afs/LINUX/osi_cred.c	2009-06-12 02:03:16.000000000 -0400
-@@ -104,6 +104,12 @@
- #if defined(STRUCT_TASK_HAS_CRED)
-     struct cred *new_creds;
- 
-+    /* If our current task doesn't have identical real and effective
-+     * credentials, commit_cred won't let us change them, so we just
-+     * bail here.
-+     */
-+    if (current->cred != current->real_cred)
-+        return;
-     new_creds = prepare_creds();
-     new_creds->fsuid = cr->cr_uid;
-     new_creds->uid = cr->cr_ruid;
Index: trunk/server/common/patches/openafs-postinit.patch
===================================================================
--- trunk/server/common/patches/openafs-postinit.patch	(revision 1259)
+++ 	(revision )
@@ -1,12 +1,0 @@
-diff --git a/src/packaging/RedHat/openafs-client.init b/src/packaging/RedHat/openafs-client.init
-index e8128aa..10ec647 100644
---- a/src/packaging/RedHat/openafs-client.init
-+++ b/src/packaging/RedHat/openafs-client.init
-@@ -37,6 +37,7 @@ start() {
- 	RETVAL=$?
- 	echo
- 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openafs-client
-+	[ $RETVAL -eq 0 ] && [ "$AFS_POST_INIT" ] && $AFS_POST_INIT
- 	return $RETVAL
- }
- 
Index: trunk/server/common/patches/openafs-pts-encrypt.patch
===================================================================
--- trunk/server/common/patches/openafs-pts-encrypt.patch	(revision 1259)
+++ 	(revision )
@@ -1,47 +1,0 @@
-diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c
-index 7b90a92..1a329c1 100644
---- a/src/ptserver/pts.c
-+++ b/src/ptserver/pts.c
-@@ -176,6 +176,10 @@ GetGlobals(struct cmd_syndesc *as, void *arock)
- 	changed = 1;
- 	sec = 1;
-     }
-+    if (as->parms[22].items) { /* -encrypt */
-+	changed = 1;
-+	sec = 3;
-+    }
-     if (as->parms[18].items || as->parms[20].items) {	/* -test, -localauth */
- 	changed = 1;
- 	confdir = AFSDIR_SERVER_ETC_DIRPATH;
-@@ -1022,6 +1026,8 @@ add_std_args(register struct cmd_syndesc *ts)
- 		"use local authentication");
-     cmd_AddParm(ts, "-auth", CMD_FLAG, CMD_OPTIONAL,
- 		"use user's authentication (default)");
-+    cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL,
-+		"encrypt commands");
- }
- 
- /*
-diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
-index fcd9d69..a5f7d16 100644
---- a/src/ptserver/ptuser.c
-+++ b/src/ptserver/ptuser.c
-@@ -203,6 +203,8 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
- 	code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
- 	if (code) {
- 	    afs_com_err(whoami, code, "(getting token)");
-+	    if (secLevel > 1)
-+		return code;
- 	    scIndex = 0;
- 	} else {
- 	    if (ttoken.kvno >= 0 && ttoken.kvno <= 256)
-@@ -215,7 +217,8 @@ pr_Initialize(IN afs_int32 secLevel, IN char *confDir, IN char *cell)
- 		scIndex = 2;
- 	    }
- 	    sc[2] =
--		rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
-+		rxkad_NewClientSecurityObject((secLevel > 1) ? rxkad_crypt :
-+					      rxkad_clear, &ttoken.sessionKey,
- 					      ttoken.kvno, ttoken.ticketLen,
- 					      ttoken.ticket);
- 	}
Index: trunk/server/common/patches/openafs-scripts.patch
===================================================================
--- trunk/server/common/patches/openafs-scripts.patch	(revision 1259)
+++ trunk/server/common/patches/openafs-scripts.patch	(revision 1274)
@@ -58,5 +58,5 @@
 --- openafs-1.4/src/afs/LINUX/osi_vnodeops.c
 +++ openafs-1.4+scripts/src/afs/LINUX/osi_vnodeops.c
-@@ -875,6 +875,28 @@
+@@ -896,6 +896,28 @@
  	/* should we always update the attributes at this point? */
  	/* unlikely--the vcache entry hasn't changed */
@@ -162,5 +162,5 @@
 --- openafs-1.4/src/afs/afs_pioctl.c
 +++ openafs-1.4+scripts/src/afs/afs_pioctl.c
-@@ -1217,6 +1217,10 @@
+@@ -1221,6 +1221,10 @@
      struct AFSFetchStatus OutStatus;
      XSTATS_DECLS;
@@ -173,5 +173,5 @@
      if (!avc)
  	return EINVAL;
-@@ -1437,6 +1441,10 @@
+@@ -1441,6 +1445,10 @@
      struct vrequest treq;
      afs_int32 flag, set_parent_pag = 0;
@@ -184,5 +184,5 @@
      if (!afs_resourceinit_flag) {
  	return EIO;
-@@ -1796,6 +1804,10 @@
+@@ -1800,6 +1808,10 @@
      afs_int32 iterator;
      int newStyle;
@@ -195,5 +195,5 @@
      if (!afs_resourceinit_flag)	/* afs daemons haven't started yet */
  	return EIO;		/* Inappropriate ioctl for device */
-@@ -1879,6 +1891,10 @@
+@@ -1883,6 +1895,10 @@
      register afs_int32 i;
      register struct unixuser *tu;