From: Theodore Tso <tytso@mit.edu>
Date: Thu, 11 Jan 1996 02:03:41 +0000 (+0000)
Subject: Applied patch submitted by Doug Engbert, so that the configurable
X-Git-Tag: krb5-1.0-beta6~645
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06b31e632f9f56df7ced6edc4f4811e37f79dfbb;p=krb5.git

Applied patch submitted by Doug Engbert, so that the configurable
authentication patch takes into account the null entry at the end of
the list.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7289 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 6d5335863..b512c1c73 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 10 21:01:36 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* walk_rtree.c (krb5_walk_realm_tree): Applied patch submitted by
+		Doug Engbert, so that the configurable authentication
+		patch takes into account the null entry at the end of the
+		list.
+
 Tue Jan  9 22:04:09 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* fwd_tgt.c (krb5_fwd_tgt_creds): New function which handles all
diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c
index 886085f77..835d899c4 100644
--- a/src/lib/krb5/krb/walk_rtree.c
+++ b/src/lib/krb5/krb/walk_rtree.c
@@ -138,6 +138,7 @@ krb5_walk_realm_tree(context, client, server, tree, realm_branch_char)
 		cap_nodes[links] = cap_server; /* put server on end of list */
 						/* this simplifies the code later and make */
 						/* cleanup eaiser as well */
+		links++;		/* count the null entry at end */
 	} else {			/* no path use hierarchical method */
 	krb5_xfree(cap_names[2]); /* failed, don't need server string */
 #endif
@@ -227,6 +228,7 @@ krb5_walk_realm_tree(context, client, server, tree, realm_branch_char)
 	return retval;
     }
 #ifdef CONFIGURABLE_AUTHENTICATION_PATH
+	links--;				/* dont count the null entry on end */
 	if (cap_code == 0) {    /* found a path above */
 		tmpcrealm.data = client->data;
 		tmpcrealm.length = client->length;