From: Antoine Verheijen Date: Wed, 19 Jan 2011 21:14:47 +0000 (-0700) Subject: OpenBSD: No ruid/rgid in cred structure. X-Git-Tag: upstream/1.8.0_pre1^2~4270 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a5441776b639cd32c2271917dd55fa491f9e512f;p=packages%2Fo%2Fopenafs.git 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. Change-Id: Iaceb792f0c39ba6f7caa205bc66af16a23193549 Reviewed-on: http://gerrit.openafs.org/3687 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/afs.h b/src/afs/afs.h index 6969831b3..df6ea0481 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -1473,8 +1473,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) { @@ -1484,6 +1486,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; @@ -1493,6 +1496,7 @@ afs_set_cr_rgid(afs_ucred_t *cred, gid_t gid) { cred->cr_rgid = gid; } #endif +#endif #ifdef AFS_SUN5_ENV