From: Andrew Deason <adeason@sinenomine.net>
Date: Fri, 25 Jun 2010 16:38:37 +0000 (-0500)
Subject: ptserver: Remove IP_WILDCARDS symbol
X-Git-Tag: openafs-devel-1_5_75~72
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=19531fb40013bce9584e1f4873724d4fa1aa6bf4;p=packages%2Fo%2Fopenafs.git

ptserver: Remove IP_WILDCARDS symbol

ptserver defined the symbol IP_WILDCARDS to enable the use of
wildcarding in machine entries. It is always enabled, so just remove
the symbol and always use the wildcard code.

Change-Id: I7d45de5ef1bb0d2c95f1e1ea86fd4418cf3ddd62
Reviewed-on: http://gerrit.openafs.org/2253
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 b78566037..936cb1c06 100644
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -77,9 +77,6 @@
 #include <krb.h>
 #endif
 
-
-#define	IP_WILDCARDS	1	/* XXX Should be defined outside of here XXX */
-
 extern int restricted;
 extern struct ubik_dbase *dbase;
 extern int pr_noAuth;
@@ -137,10 +134,8 @@ static afs_int32 listOwned(struct rx_call *call, afs_int32 aid, prlist *alist,
 			   afs_int32 *lastP, afs_int32 *cid);
 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_uint32 host);
-#endif
 static afs_int32 WhoIsThisWithName(struct rx_call *acall, 
 				   struct ubik_trans *at, afs_int32 *aid, 
 				   char *aname);
@@ -1210,7 +1205,6 @@ getCPS(struct rx_call *call, afs_int32 aid, prlist *alist, afs_int32 *over,
 }
 
 
-#ifdef IP_WILDCARDS
 int
 inCPS(prlist CPS, afs_int32 id)
 {
@@ -1222,7 +1216,6 @@ inCPS(prlist CPS, afs_int32 id)
     }
     return (0);
 }
-#endif /* IP_WILDCARDS */
 
 
 afs_int32
@@ -1299,10 +1292,8 @@ getCPS2(struct rx_call *call, afs_int32 aid, afs_uint32 ahost, prlist *alist,
 	code = GetList2(tt, &tentry, &host_tentry, alist, 1);
     else
 	code = GetList(tt, &tentry, alist, 1);
-#if IP_WILDCARDS
     if (!code)
 	code = addWildCards(tt, alist, ntohl(ahost));
-#endif /* IP_WILDCARDS */
     if (code != PRSUCCESS)
 	ABORT_WITH(tt, code);
 
@@ -1364,9 +1355,7 @@ getHostCPS(struct rx_call *call, afs_uint32 ahost, prlist *alist,
 	} else
 	    fprintf(stderr, "FindByID Failed -- Not found\n");
     }
-#if IP_WILDCARDS
     code = addWildCards(tt, alist, ntohl(ahost));
-#endif /* IP_WILDCARDS */
   bad:
     if (code != PRSUCCESS)
 	ABORT_WITH(tt, code);
@@ -2117,7 +2106,6 @@ isAMemberOf(struct rx_call *call, afs_int32 uid, afs_int32 gid, afs_int32 *flag,
     return code;
 }
 
-#if IP_WILDCARDS
 static afs_int32
 addWildCards(struct ubik_trans *tt, prlist *alist, afs_uint32 host)
 {
@@ -2165,7 +2153,6 @@ addWildCards(struct ubik_trans *tt, prlist *alist, afs_uint32 host)
 	qsort(alist->prlist_val, alist->prlist_len, sizeof(afs_int32), IDCmp);
     return 0;
 }
-#endif /* IP_WILDCARDS */
 
 static afs_int32
 WhoIsThisWithName(struct rx_call *acall, struct ubik_trans *at, afs_int32 *aid,