===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/pty.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/ssh/Attic/pty.c	1999/11/24 19:53:48	1.8
+++ src/usr.bin/ssh/Attic/pty.c	1999/12/06 12:10:12	1.9
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: pty.c,v 1.8 1999/11/24 19:53:48 markus Exp $");
+RCSID("$Id: pty.c,v 1.9 1999/12/06 12:10:12 deraadt Exp $");
 
 #include "pty.h"
 #include "ssh.h"
@@ -36,17 +36,19 @@
  */
 
 int 
-pty_allocate(int *ptyfd, int *ttyfd, char *namebuf)
+pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 {
-#ifdef HAVE_OPENPTY
+#if defined(HAVE_OPENPTY) || defined(BSD4_4)
 	/* openpty(3) exists in OSF/1 and some other os'es */
+	char buf[64];
 	int i;
 
-	i = openpty(ptyfd, ttyfd, namebuf, NULL, NULL);
+	i = openpty(ptyfd, ttyfd, buf, NULL, NULL);
 	if (i < 0) {
 		error("openpty: %.100s", strerror(errno));
 		return 0;
 	}
+	strlcpy(namebuf, buf, namebuflen);	/* possible truncation */
 	return 1;
 #else /* HAVE_OPENPTY */
 #ifdef HAVE__GETPTY
@@ -61,7 +63,7 @@
 		error("_getpty: %.100s", strerror(errno));
 		return 0;
 	}
-	strcpy(namebuf, slave);
+	strlcpy(namebuf, slave, namebuflen);
 	/* Open the slave side. */
 	*ttyfd = open(namebuf, O_RDWR | O_NOCTTY);
 	if (*ttyfd < 0) {
@@ -95,7 +97,7 @@
 	pts = ptsname(ptm);
 	if (pts == NULL)
 		error("Slave pty side name could not be obtained.");
-	strcpy(namebuf, pts);
+	strlcpy(namebuf, pts, namebuflen);
 	*ptyfd = ptm;
 
 	/* Open the slave side. */
@@ -126,7 +128,7 @@
 	name = ttyname(*ptyfd);
 	if (!name)
 		fatal("Open of /dev/ptc returns device for which ttyname fails.");
-	strcpy(namebuf, name);
+	strlcpy(namebuf, name, namebuflen);
 	*ttyfd = open(name, O_RDWR | O_NOCTTY);
 	if (*ttyfd < 0) {
 		error("Could not open pty slave side %.100s: %.100s",
@@ -150,8 +152,8 @@
 		*ptyfd = open(buf, O_RDWR | O_NOCTTY);
 		if (*ptyfd < 0)
 			continue;
-		snprintf(namebuf, sizeof buf, "/dev/tty%c%c", ptymajors[i / num_minors],
-			 ptyminors[i % num_minors]);
+		snprintf(namebuf, sizeof namebuflen, "/dev/tty%c%c",
+		    ptymajors[i / num_minors], ptyminors[i % num_minors]);
 
 		/* Open the slave side. */
 		*ttyfd = open(namebuf, O_RDWR | O_NOCTTY);