From: Tom Yu <tlyu@mit.edu>
Date: Mon, 20 Dec 2004 22:03:00 +0000 (+0000)
Subject: pullup from trunk
X-Git-Tag: krb5-1.4.3-beta1~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=630baed588539d1ffa943a434461127f2b6efae0;p=krb5.git

pullup from trunk

ticket: 2838
version_fixed: 1.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@16970 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 3467422dd..a02cd8d31 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-20  Tom Yu  <tlyu@mit.edu>
+
+	* kerberos.c (kerberos4_status): Null-terminate the correct
+	string.  Reported by Marcin Garski.
+
 2004-11-15  Tom Yu  <tlyu@mit.edu>
 
 	* auth-proto.h, auth.c: Merge Athena changes for requiring
diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c
index 8d4c7f330..7e0d7360c 100644
--- a/src/appl/telnet/libtelnet/kerberos.c
+++ b/src/appl/telnet/libtelnet/kerberos.c
@@ -619,7 +619,7 @@ kerberos4_status(ap, kname, level)
 	if (UserNameRequested) {
 		/* the name buffer comes from telnetd/telnetd{-ktd}.c */
 		strncpy(kname, UserNameRequested, 255);
-		name[255] = '\0';
+		kname[255] = '\0';
 	}
 
 	if (UserNameRequested && !kuserok(&adat, UserNameRequested)) {