From 7b33107a9c92d8d72ad269c2c1da9a4adc52560a Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 13 Mar 2006 15:09:40 +0000
Subject: [PATCH] multiple-local-realms-fix-20060313

Fix use of "=" instead of "==" in conditional.

Re-order parameters of afs_is_foreign_ticket_name for consistency
---
 src/ptserver/ptprocs.c        | 4 ++--
 src/util/afsutil_prototypes.h | 2 +-
 src/util/get_krbrlm.c         | 6 +++---
 src/viced/host.c              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index fd031b97c..0753bf231 100644
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -181,7 +181,7 @@ WhoIsThis(acall, at, aid)
 	    goto done;
 #endif
 	if (tcell[0])
-	    foreign = afs_is_foreign_ticket_name(tcell,name,inst,pr_realmName);
+	    foreign = afs_is_foreign_ticket_name(name,inst,tcell,pr_realmName);
 
 	strncpy(vname, name, sizeof(vname));
 	if (ilen = strlen(inst)) {
@@ -2324,7 +2324,7 @@ WhoIsThisWithName(acall, at, aid, aname)
 	    strcat(vname, inst);
 	}
 	if ((clen = strlen(tcell))) {
-	    int foreign = afs_is_foreign_ticket_name(tcell,name,inst,pr_realmName);
+	    int foreign = afs_is_foreign_ticket_name(name,inst,tcell,pr_realmName);
 
 	    if (foreign) {
 		if (strlen(vname) + 1 + clen >= sizeof(vname))
diff --git a/src/util/afsutil_prototypes.h b/src/util/afsutil_prototypes.h
index a3151fc25..89f05365e 100644
--- a/src/util/afsutil_prototypes.h
+++ b/src/util/afsutil_prototypes.h
@@ -75,7 +75,7 @@ extern int64_t flipbase64_to_int64(char *s);
 /* get_krbrlm.c */
 extern int afs_krb_get_lrealm(char *r, int n);
 extern int afs_krb_exclusion(char *name);
-extern int afs_is_foreign_ticket_name(char *tcell, char *tname, char *tinst, char *localrealm);
+extern int afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localrealm);
 /* hostparse.c */
 extern struct hostent *hostutil_GetHostByName(register char *ahost);
 extern char *hostutil_GetNameByINet(afs_uint32 addr);
diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c
index b707954bd..c6f498041 100644
--- a/src/util/get_krbrlm.c
+++ b/src/util/get_krbrlm.c
@@ -114,7 +114,7 @@ afs_krb_exclusion(char * name)
 }
 
 int 
-afs_is_foreign_ticket_name(char *tcell, char *tname, char *tinst, char *localrealm)
+afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localrealm)
 {
     int foreign = 0;
 
@@ -134,7 +134,7 @@ afs_is_foreign_ticket_name(char *tcell, char *tname, char *tinst, char *localrea
 		    break;
 	    }
 
-	    if (i=0 && localrealm) {
+	    if (i==0 && localrealm) {
 		strncpy(local_realms[0], localrealm, AFS_REALM_SZ);
 		num_lrealms = 1;
 	    } else {
@@ -154,7 +154,7 @@ afs_is_foreign_ticket_name(char *tcell, char *tname, char *tinst, char *localrea
 	/* If yes, then make sure that the name is not present in 
 	 * an exclusion list */
 	if (lrealm_match) {
-	    if (tinst[0])
+	    if (tinst && tinst[0])
 		snprintf(uname,sizeof(uname),"%s.%s@%s",tname,tinst,tcell);
 	    else
 		snprintf(uname,sizeof(uname),"%s@%s",tname,tcell);
diff --git a/src/viced/host.c b/src/viced/host.c
index 18f8c78b9..26e7d3ba2 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -1511,7 +1511,7 @@ MapName_r(char *aname, char *acell, afs_int32 * aval)
 
     cnamelen = strlen(acell);
     if (cnamelen) {
-	if (afs_is_foreign_ticket_name(aname, "", acell, localcellname)) {
+	if (afs_is_foreign_ticket_name(aname, NULL, acell, localcellname)) {
 	    ViceLog(2,
 		    ("MapName: cell is foreign.  cell=%s, localcell=%s, localrealms={%s,%s,%s,%s}\n",
 		    acell, localcellname, local_realms[0],local_realms[1],local_realms[2],local_realms[3]));
-- 
2.39.5