OpenBSD: No ruid/rgid in cred structure.

OpenBSD does not retain ruid or rgid values in the
afs_creds_t structure (ucred). This patch, therefore,
removes any references to them in the afs.h file. Since
no attempt is made to actually use the removed code (or
macros) on OpenBSD, at least at this time, this does
not result in any real functional change.

Reviewed-on: http://gerrit.openafs.org/3687
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit a5441776b639cd32c2271917dd55fa491f9e512f)

Change-Id: I1a92ec8b1cb989217d114918cc590caa3f7b4455
Reviewed-on: http://gerrit.openafs.org/3716
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 472da8da87be5230dc1ac03a291baf5d6232c58b..b7372296f720f0c9c741e9e9e7b3fb11e24eb2d7 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -1433,8 +1433,10 @@ extern int afsd_dynamic_vcaches;
 #elif !(defined(AFS_LINUX26_ENV) && defined(STRUCT_TASK_STRUCT_HAS_CRED))
 #define afs_cr_uid(cred) ((cred)->cr_uid)
 #define afs_cr_gid(cred) ((cred)->cr_gid)
+#if !defined(AFS_OBSD_ENV)
 #define afs_cr_ruid(cred) ((cred)->cr_ruid)
 #define afs_cr_rgid(cred) ((cred)->cr_rgid)
+#endif
 
 static_inline void
 afs_set_cr_uid(afs_ucred_t *cred, uid_t uid) {
@@ -1444,6 +1446,7 @@ static_inline void
 afs_set_cr_gid(afs_ucred_t *cred, gid_t gid) {
     cred->cr_gid = gid;
 }
+#if !defined(AFS_OBSD_ENV)
 static_inline void
 afs_set_cr_ruid(afs_ucred_t *cred, uid_t uid) {
     cred->cr_ruid = uid;
@@ -1453,6 +1456,7 @@ afs_set_cr_rgid(afs_ucred_t *cred, gid_t gid) {
     cred->cr_rgid = gid;
 }
 #endif
+#endif
 
 #ifdef AFS_SUN5_ENV