From: Derrick Brashear <shadow@dementia.org>
Date: Fri, 19 Mar 2004 07:58:52 +0000 (+0000)
Subject: irix-ucred-is-really-cred-20040319
X-Git-Tag: openafs-devel-1_3_61~23
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c396fdec11f575cfa8adcdc268e30eeec2e98449;p=packages%2Fo%2Fopenafs.git

irix-ucred-is-really-cred-20040319

FIXES 3651

gotta wonder what crack monkey came up with this
AFS_UCRED is ucred in osi_machdep.h, and ucred is redefined to cred in osi_vfs.h

whatever
---

diff --git a/src/afs/IRIX/osi_machdep.h b/src/afs/IRIX/osi_machdep.h
index 06ceea238..fb6b59876 100644
--- a/src/afs/IRIX/osi_machdep.h
+++ b/src/afs/IRIX/osi_machdep.h
@@ -26,7 +26,8 @@ extern kmutex_t afs_global_lock;
 extern time_t time;
 #define osi_Time() (time)
 
-#define	AFS_UCRED	ucred
+/* This gets redefined from ucred to cred in osi_vfs.h, just do it right */
+#define	AFS_UCRED	cred
 
 #define osi_vnhold(avc, r)  do { VN_HOLD(AFSTOV(avc)); } while(0)
 
diff --git a/src/afs/afs_osi.c b/src/afs/afs_osi.c
index a16f51b6f..42dae8f67 100644
--- a/src/afs/afs_osi.c
+++ b/src/afs/afs_osi.c
@@ -40,10 +40,7 @@ lock_t afs_event_lock;
 flid_t osi_flid;
 #endif
 
-#ifndef AFS_SGI_ENV
-/* I'm unsure where it's really coming from on Irix; afs_osi.h conflicts... */
 struct AFS_UCRED *afs_osi_credp;
-#endif
 
 void
 osi_Init(void)