ptserver: Use unsigned addresses

Use unsigned IP addresses in ptserver code. This alters some
prototypes in the public ptuser.h header.

Change-Id: Id121f32cb0b6acd575822d37bbd814636023e9ae
Reviewed-on: http://gerrit.openafs.org/2252
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index 1cd803f0a3e5060e93017f8bc4c88d9739440261..b78566037dcf6326b33e0cdc3c73e32ad87904e9 100644 (file)
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -106,9 +106,9 @@ static afs_int32 removeFromGroup(struct rx_call *call, afs_int32 aid,
                                 afs_int32 gid, afs_int32 *cid);
 static afs_int32 getCPS(struct rx_call *call, afs_int32 aid, prlist *alist, 
                        afs_int32 *over, afs_int32 *cid);
-static afs_int32 getCPS2(struct rx_call *call, afs_int32 aid, afs_int32 ahost,
+static afs_int32 getCPS2(struct rx_call *call, afs_int32 aid, afs_uint32 ahost,
                         prlist *alist, afs_int32 *over, afs_int32 *cid);
-static afs_int32 getHostCPS(struct rx_call *call, afs_int32 ahost, 
+static afs_int32 getHostCPS(struct rx_call *call, afs_uint32 ahost,
                            prlist *alist, afs_int32 *over);
 static afs_int32 listMax(struct rx_call *call, afs_int32 *uid, afs_int32 *gid);
 static afs_int32 setMax(struct rx_call *call, afs_int32 aid, afs_int32 gflag, 
@@ -139,7 +139,7 @@ static afs_int32 isAMemberOf(struct rx_call *call, afs_int32 uid, afs_int32 gid,
                             afs_int32 *flag, afs_int32 *cid);
 #if IP_WILDCARDS
 static afs_int32 addWildCards(struct ubik_trans *tt, prlist *alist, 
-                             afs_int32 host);
+                             afs_uint32 host);
 #endif
 static afs_int32 WhoIsThisWithName(struct rx_call *acall, 
                                   struct ubik_trans *at, afs_int32 *aid, 
@@ -1240,7 +1240,7 @@ SPR_GetCPS2(struct rx_call *call, afs_int32 aid, afs_int32 ahost,
 }
 
 static afs_int32
-getCPS2(struct rx_call *call, afs_int32 aid, afs_int32 ahost, prlist *alist, 
+getCPS2(struct rx_call *call, afs_int32 aid, afs_uint32 ahost, prlist *alist,
        afs_int32 *over, afs_int32 *cid)
 {
     register afs_int32 code;
@@ -1324,7 +1324,7 @@ SPR_GetHostCPS(struct rx_call *call, afs_int32 ahost, prlist *alist,
 }
 
 afs_int32
-getHostCPS(struct rx_call *call, afs_int32 ahost, prlist *alist, 
+getHostCPS(struct rx_call *call, afs_uint32 ahost, prlist *alist,
           afs_int32 *over)
 {
     register afs_int32 code, temp;
@@ -2119,7 +2119,7 @@ isAMemberOf(struct rx_call *call, afs_int32 uid, afs_int32 gid, afs_int32 *flag,
 
 #if IP_WILDCARDS
 static afs_int32
-addWildCards(struct ubik_trans *tt, prlist *alist, afs_int32 host)
+addWildCards(struct ubik_trans *tt, prlist *alist, afs_uint32 host)
 {
     afs_int32 temp;
     struct prentry tentry;

diff --git a/src/ptserver/ptuser.c b/src/ptserver/ptuser.c
index d59878e2135cbba4241d6fde6e42e73e3fff27bb..fa5112681fa2f910d1dea6df87c9926a33340b76 100644 (file)
--- a/src/ptserver/ptuser.c
+++ b/src/ptserver/ptuser.c
@@ -579,7 +579,7 @@ pr_GetCPS(afs_int32 id, prlist *CPS)
 }
 
 int
-pr_GetCPS2(afs_int32 id, afs_int32 host, prlist *CPS)
+pr_GetCPS2(afs_int32 id, afs_uint32 host, prlist *CPS)
 {
     register afs_int32 code;
     afs_int32 over;
@@ -598,7 +598,7 @@ pr_GetCPS2(afs_int32 id, afs_int32 host, prlist *CPS)
 }
 
 int
-pr_GetHostCPS(afs_int32 host, prlist *CPS)
+pr_GetHostCPS(afs_uint32 host, prlist *CPS)
 {
     register afs_int32 code;
     afs_int32 over;

diff --git a/src/ptserver/ptuser.h b/src/ptserver/ptuser.h
index 850f3f962c667031a45837554632a212d15c0c73..a13a638c1caa4a6a3b323bb586774cbc6c720bd3 100644 (file)
--- a/src/ptserver/ptuser.h
+++ b/src/ptserver/ptuser.h
@@ -28,8 +28,8 @@ extern int pr_SNameToId(char name[PR_MAXNAMELEN], afs_int32 *id);
 extern int pr_IdToName(idlist *ids, namelist *names);
 extern int pr_SIdToName(afs_int32 id, char name[PR_MAXNAMELEN]);
 extern int pr_GetCPS(afs_int32 id, prlist *CPS);
-extern int pr_GetCPS2(afs_int32 id, afs_int32 host, prlist *CPS);
-extern int pr_GetHostCPS(afs_int32 host, prlist *CPS);
+extern int pr_GetCPS2(afs_int32 id, afs_uint32 host, prlist *CPS);
+extern int pr_GetHostCPS(afs_uint32 host, prlist *CPS);
 extern int pr_ListMembers(char *group, namelist *lnames);
 extern int pr_ListOwned(afs_int32 oid, namelist *lnames, afs_int32 *moreP);
 extern int pr_IDListMembers(afs_int32 gid, namelist *lnames);