linux-ifdef-stupidity-cleanup-20030117

[openafs.git] / src / afs / afs_osi_pag.c

diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
index 4b4f521..9be2804 100644 (file)
--- a/src/afs/afs_osi_pag.c
+++ b/src/afs/afs_osi_pag.c
@@ -20,16 +20,16 @@
  */
 
 #include <afsconfig.h>
-#include "../afs/param.h"
+#include "afs/param.h"
 
 RCSID("$Header$");
 
-#include "../afs/sysincludes.h"        /* Standard vendor system headers */
-#include "../afs/afsincludes.h"        /* Afs-based standard headers */
-#include "../afs/afs_stats.h" /* statistics */
-#include "../afs/afs_cbqueue.h"
-#include "../afs/nfsclient.h"
-#include "../afs/afs_osidnlc.h"
+#include "afs/sysincludes.h"   /* Standard vendor system headers */
+#include "afsincludes.h"       /* Afs-based standard headers */
+#include "afs/afs_stats.h" /* statistics */
+#include "afs/afs_cbqueue.h"
+#include "afs/nfsclient.h"
+#include "afs/afs_osidnlc.h"
 
 
 /* Imported variables */
@@ -137,7 +137,7 @@ afs_uint32 getpag(void)
 int
 #if    defined(AFS_SUN5_ENV)
 afs_setpag (struct AFS_UCRED **credpp)
-#elif  defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif  defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 afs_setpag (struct proc *p, void *args, int *retval)
 #else
 afs_setpag (void) 
@@ -151,8 +151,10 @@ afs_setpag (void)
 #endif /* defined(AFS_SGI53_ENV) && defined(MP) */    
 
     AFS_STATCNT(afs_setpag);
-#ifdef AFS_SUN5_ENV
+#if    defined(AFS_SUN5_ENV)
     if (!afs_suser(*credpp))
+#elif  defined(AFS_OBSD_ENV)
+    if (!afs_osi_suser(p->p_cred->pc_ucred))
 #else
     if (!afs_suser())
 #endif
@@ -164,7 +166,7 @@ afs_setpag (void)
 
 #if    defined(AFS_SUN5_ENV)
     code = AddPag(genpag(), credpp);
-#elif  defined(AFS_OSF_ENV) || defined(AFS_FBSD_ENV)
+#elif  defined(AFS_OSF_ENV) || defined(AFS_XBSD_ENV)
     code = AddPag(p, genpag(), &p->p_rcred);
 #elif  defined(AFS_AIX41_ENV)
     {
@@ -196,7 +198,7 @@ afs_setpag (void)
        code = AddPag(genpag(), &credp);
        crfree(credp);
     }
-#elif defined(AFS_DARWIN_ENV)  || defined(AFS_FBSD_ENV)
+#elif defined(AFS_DARWIN_ENV)  || defined(AFS_XBSD_ENV)
     {
        struct ucred *credp=crdup(p->p_cred->pc_ucred);
        code=AddPag(p, genpag(), &credp);
@@ -207,16 +209,14 @@ afs_setpag (void)
 #endif
 
     afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
-#if    defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(KERNEL_HAVE_UERROR)
+    if (!getuerror())
+       setuerror(code);
+#endif
 #if defined(AFS_SGI53_ENV) && defined(MP)
     AFS_GUNLOCK();
-#endif /* defined(AFS_SGI53_ENV) && defined(MP) */    
+#endif /* defined(AFS_SGI53_ENV) && defined(MP) */
     return (code);
-#else
-    if (!getuerror())
-       setuerror(code);
-    return (code);
-#endif
 }
 
 #if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
@@ -230,7 +230,7 @@ afs_setpag (void)
 int
 #if    defined(AFS_SUN5_ENV)
 afs_setpag_val (struct AFS_UCRED **credpp, int pagval)
-#elif  defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif  defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 afs_setpag_val (struct proc *p, void *args, int *retval, int pagval)
 #else
 afs_setpag_val (int pagval) 
@@ -257,7 +257,7 @@ afs_setpag_val (int pagval)
 
 #if    defined(AFS_SUN5_ENV)
     code = AddPag(pagval, credpp);
-#elif  defined(AFS_OSF_ENV) || defined(AFS_FBSD_ENV)
+#elif  defined(AFS_OSF_ENV) || defined(AFS_XBSD_ENV)
     code = AddPag(p, pagval, &p->p_rcred);
 #elif  defined(AFS_AIX41_ENV)
     {
@@ -289,7 +289,7 @@ afs_setpag_val (int pagval)
        code = AddPag(pagval, &credp);
        crfree(credp);
     }
-#elif defined(AFS_DARWIN_ENV)  || defined(AFS_FBSD_ENV)
+#elif defined(AFS_DARWIN_ENV)  || defined(AFS_XBSD_ENV)
     {
        struct ucred *credp=crdup(p->p_cred->pc_ucred);
        code=AddPag(p, pagval, &credp);
@@ -300,16 +300,14 @@ afs_setpag_val (int pagval)
 #endif
 
     afs_Trace1(afs_iclSetp, CM_TRACE_SETPAG, ICL_TYPE_INT32, code);
-#if    defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(KERNEL_HAVE_UERROR)
+    if (!getuerror())
+       setuerror(code);
+#endif
 #if defined(AFS_SGI53_ENV) && defined(MP)
     AFS_GUNLOCK();
 #endif /* defined(AFS_SGI53_ENV) && defined(MP) */    
     return (code);
-#else
-    if (!getuerror())
-       setuerror(code);
-    return (code);
-#endif
 }
 #endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
 
@@ -329,23 +327,23 @@ int afs_getpag_val()
 
 
 /* Note - needs to be available on AIX, others can be static - rework this */
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 int AddPag(struct proc *p, afs_int32 aval, struct AFS_UCRED **credpp)
-#else  /* AFS_OSF_ENV || AFS_FBSD_ENV */
+#else
 int AddPag(afs_int32 aval, struct AFS_UCRED **credpp)
 #endif
 {
     afs_int32 newpag, code;
     AFS_STATCNT(AddPag);
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
     if ((code = setpag(p, credpp, aval, &newpag, 0)))
 #else  /* AFS_OSF_ENV */
     if ((code = setpag(credpp, aval, &newpag, 0)))
 #endif
-#if    defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-       return (code);
-#else
+#if defined(KERNEL_HAVE_UERROR)
        return (setuerror(code), code);
+#else
+       return (code);
 #endif
     return 0;
 }
@@ -362,9 +360,11 @@ int afs_InitReq(register struct vrequest *av, struct AFS_UCRED *acred)
         * think it's ok to use the real uid to make setuid
          * programs (without setpag) to work properly.
          */
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-        av->uid = acred->cr_uid;    /* default when no pag is set */
-                                    /* bsd creds don't have ruid */
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+       if (acred == NOCRED)
+           av->uid = -2; /* XXX nobody... ?*/
+       else
+           av->uid = acred->cr_uid; /* bsd creds don't have ruid */
 #else
        av->uid = acred->cr_ruid;    /* default when no pag is set */
 #endif
@@ -430,7 +430,7 @@ afs_int32 PagInCred(const struct AFS_UCRED *cred)
     if (cred == NULL) {
        return NOPAG;
     }
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
     if (cred == NOCRED || cred == FSCRED) {
         return NOPAG;
     }
@@ -450,7 +450,7 @@ afs_int32 PagInCred(const struct AFS_UCRED *cred)
     }
 #endif
 #else
-#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX_ENV) || defined(AFS_FBSD_ENV)
+#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_DUX40_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_XBSD_ENV)
     if (cred->cr_ngroups < 2) return NOPAG;
 #endif
 #endif