diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-14 10:47:15 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-14 10:47:15 +1100 |
commit | a34a28bf86c04eb35c522b1e31c32e94edf355d2 (patch) | |
tree | b048bcbc954cae87930fe287a92197abccceb1de /pty.c | |
parent | c6b3bbe2b991f4f87ca1f8214f43c13a5a73f385 (diff) |
- OpenBSD CVS Changes
- [canohost.c]
fix get_remote_port() and friends for sshd -i;
Holger.Trapp@Informatik.TU-Chemnitz.DE
- [mpaux.c]
make code simpler. no need for memcpy. niels@ ok
- [pty.c]
namebuflen not sizeof namebuflen; bnd@ep-ag.com via djm@mindrot.org
fix proto; markus
- [ssh.1]
typo; mark.baushke@solipsa.com
- [channels.c ssh.c ssh.h sshd.c]
type conflict for 'extern Type *options' in channels.c; dot@dotat.at
- [sshconnect.c]
move checking of hostkey into own function.
- [version.h]
OpenSSH-1.2.1
Diffstat (limited to 'pty.c')
-rw-r--r-- | pty.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -14,8 +14,9 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: pty.c,v 1.8 1999/12/08 23:16:55 damien Exp $"); | 17 | RCSID("$Id: pty.c,v 1.9 1999/12/13 23:47:16 damien Exp $"); |
18 | 18 | ||
19 | #include <util.h> | ||
19 | #include "pty.h" | 20 | #include "pty.h" |
20 | #include "ssh.h" | 21 | #include "ssh.h" |
21 | 22 | ||
@@ -163,7 +164,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
163 | *ptyfd = open(buf, O_RDWR | O_NOCTTY); | 164 | *ptyfd = open(buf, O_RDWR | O_NOCTTY); |
164 | if (*ptyfd < 0) | 165 | if (*ptyfd < 0) |
165 | continue; | 166 | continue; |
166 | snprintf(namebuf, sizeof namebuflen, "/dev/tty%c%c", | 167 | snprintf(namebuf, namebuflen, "/dev/tty%c%c", |
167 | ptymajors[i / num_minors], ptyminors[i % num_minors]); | 168 | ptymajors[i / num_minors], ptyminors[i % num_minors]); |
168 | 169 | ||
169 | /* Open the slave side. */ | 170 | /* Open the slave side. */ |