Simple string cleanup.

ok todd@

2 files changed, 9 insertions, 6 deletions

diff --git a/usr.sbin/afs/src/appl/fs/fs_setacl.c b/usr.sbin/afs/src/appl/fs/fs_setacl.c
index 4c8ebc88a2d..80b2f1d1bfb 100644
--- a/usr.sbin/afs/src/appl/fs/fs_setacl.c
+++ b/usr.sbin/afs/src/appl/fs/fs_setacl.c
@@ -116,8 +116,9 @@ afs_setacl(char *path, char *user, char *rights)
 	position && acl->NumPositiveEntries; 
 	position = position->next) {
 	if (position->RightsMask) {
-	    sprintf(tmpstr, "%s %d\n", position->name, position->RightsMask);
-	    strcat(acltext,tmpstr);
+	    snprintf(tmpstr, sizeof(tmpstr), "%s %d\n",
+		     position->name, position->RightsMask);
+	    strlcat(acltext, tmpstr, sizeof(acltext));
 	} else
 	    acl->NumPositiveEntries--;
     }
@@ -125,8 +126,9 @@ afs_setacl(char *path, char *user, char *rights)
 	position && acl->NumNegativeEntries;
 	position = position->next) {
 	if (position->RightsMask) {
-	    sprintf(tmpstr, "%s %d\n", position->name, position->RightsMask);
-	    strcat(acltext,tmpstr);
+	    snprintf(tmpstr, sizeof(tmpstr), "%s %d\n",
+		     position->name, position->RightsMask);
+	    strlcat(acltext, tmpstr, sizeof(acltext));
 	} else
 	    acl->NumNegativeEntries--;
     }
diff --git a/usr.sbin/afs/src/arlad/inter.c b/usr.sbin/afs/src/arlad/inter.c
index 9b77b8bc42c..5fa1fe09865 100644
--- a/usr.sbin/afs/src/arlad/inter.c
+++ b/usr.sbin/afs/src/arlad/inter.c
@@ -1085,8 +1085,9 @@ cm_walk (VenusFid fid,
 	     * the expansion of the symlink and append fname to it.
 	     */
 	    if (fname != NULL) {
-		strcat (symlink, "/");
-		strcat (symlink, fname);
+		    
+		strlcat (symlink, "/", sizeof(symlink));
+		strlcat (symlink, fname, sizeof(symlink));
 	    }
 	    strlcpy(store_name, symlink, sizeof(store_name));
 	    fname = store_name;