Use unsigned addresses in the NFS exporter

[openafs.git] / src / afs / exporter.h

diff --git a/src/afs/exporter.h b/src/afs/exporter.h
index 3b344d6..83dba5c 100644 (file)
--- a/src/afs/exporter.h
+++ b/src/afs/exporter.h
@@ -34,7 +34,7 @@
   * up 2 bytes
   */
 
-#if defined(AFS_SUN57_64BIT_ENV) || defined(AFS_OSF_ENV) || (defined(AFS_SGI61_ENV) && (_MIPS_SZPTR==64)) || defined(AFS_LINUX_64BIT_KERNEL)
+#if defined(AFS_SUN57_64BIT_ENV) || (defined(AFS_SGI61_ENV) && (_MIPS_SZPTR==64)) || defined(AFS_LINUX_64BIT_KERNEL)
 #define        AFS_XLATOR_MAGIC        0x8765  /* XXX */
 #else
 #define        AFS_XLATOR_MAGIC        0x87654321
@@ -43,11 +43,7 @@
 #if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
 #define AFS_NFSXLATORREQ(cred) 0
 #else
-#ifdef AFS_OSF_ENV
-#define        AFS_NFSXLATORREQ(cred)    ((cred)->cr_ruid == NFSXLATOR_CRED)
-#else
-#define        AFS_NFSXLATORREQ(cred)    ((cred)->cr_rgid == NFSXLATOR_CRED)
-#endif
+#define        AFS_NFSXLATORREQ(cred)    (afs_cr_rgid(cred) == NFSXLATOR_CRED)
 #endif
 
 struct afs_exporter;
@@ -68,8 +64,8 @@ struct exporterops {
     void (*export_garbagecollect) (struct afs_exporter *exp,
                                   afs_int32 param);
     int (*export_statistics) (struct afs_exporter *exp);
-    int (*export_checkhost) (struct afs_exporter *exp, afs_int32 host);
-    afs_int32 (*export_gethost) (struct afs_exporter *exp);
+    int (*export_checkhost) (struct afs_exporter *exp, afs_uint32 host);
+    afs_uint32 (*export_gethost) (struct afs_exporter *exp);
 };
 
 struct exporterstats {