From ad3423c57fc1bff01815ac2e37e6a3f6647c3937 Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Fri, 11 Jul 1997 21:53:26 +0000
Subject: [PATCH] Better return values from 524_conv, also zero terminate
 string.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2158 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/principal.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index af2419eb9..dad82a9b7 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -535,23 +535,24 @@ krb5_524_conv_principal(krb5_context context,
 	i = principal->name.name_string.val[1];
 	break;
     default:
-	return -1;
+	return KRB5_PARSE_MALFORMED;
     }
     
     if(strcmp(n, "host") == 0){
 	char *p;
 	n = "rcmd";
 	strncpy(tmpinst, i, sizeof(tmpinst));
+	tmpinst[sizeof(tmpinst) - 1] = 0;
 	p = strchr(tmpinst, '.');
 	if(p) *p = 0;
 	i = tmpinst;
     }
     if(strlen(r) >= 40)
-	return -1;
+	return KRB5_PARSE_MALFORMED;
     if(strlen(n) >= 40)
-	return -1;
+	return KRB5_PARSE_MALFORMED;
     if(strlen(i) >= 40)
-	return -1;
+	return KRB5_PARSE_MALFORMED;
     strcpy(realm, r);
     strcpy(name, n);
     strcpy(instance, i);