--- src/lib/krb5/krb/walk_rtree.c~	2007-06-19 21:22:50.000000000 +0200
+++ src/lib/krb5/krb/walk_rtree.c	2008-04-25 14:47:11.000000000 +0200
@@ -190,6 +190,14 @@
 		com_sdot = scp;
 		nocommon = 0;
 	    }
+	    if ((slen == 1) && (ccp == com_cdot - (com_sdot - scp))) {
+		/* 1st server component shares ending with 1st client comp. */
+		break;
+	    }
+	    if ((clen == 1) && (scp == com_sdot - (com_cdot - ccp))) {
+		/* 1st client component shares ending with 1st server comp. */
+		break;
+	    }
 	}
 
 	/* ccp, scp point to common root.