merge strcpy_truncate branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5027 ec53bebd-3082-4978-b11e-865c3cabbd6b
1998-06-09 19:25:40 +00:00
parent e255dfc950
commit a5f54865d4
87 changed files with 689 additions and 499 deletions
--- a/lib/des/fcrypt.c
+++ b/lib/des/fcrypt.c
@@ -203,9 +203,8 @@ crypt_md5(pw, salt)
 		    MD5Update(&ctx, pw+j, 1);

 	/* Now make the output string */
-	strcpy(passwd,magic);
-	strncat(passwd,sp,sl);
-	strcat(passwd,"$");
+	snprintf (passwd, sizeof(passwd),
+		  "%s%.*s$", magic, sl, sp);

 	MD5Final(final,&ctx);