summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-17 22:34:22 +1000
committerDamien Miller <djm@mindrot.org>2000-05-17 22:34:22 +1000
commitdcb6ecd1b3b25b6909296ff0546ca6b18d0c19d3 (patch)
tree7eb6d184356f6aa00e62c71565568db706f2e960 /sshd.c
parent0e65eed58acc0053d163e96463a7c4d0684e55bd (diff)
- OpenBSD CVS update:
- markus@cvs.openbsd.org [ssh.c] fix usage() [ssh2.h] draft-ietf-secsh-architecture-05.txt [ssh.1] document ssh -T -N (ssh2 only) [channels.c serverloop.c ssh.h sshconnect.c sshd.c aux.c] enable nonblocking IO for sshd w/ proto 1, too; split out common code [aux.c] missing include
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/sshd.c b/sshd.c
index d1ed1506e..a13332cbd 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sshd.c,v 1.115 2000/05/03 10:21:49 markus Exp $"); 17RCSID("$OpenBSD: sshd.c,v 1.116 2000/05/17 08:20:16 markus Exp $");
18 18
19#include "xmalloc.h" 19#include "xmalloc.h"
20#include "rsa.h" 20#include "rsa.h"
@@ -262,21 +262,6 @@ key_regeneration_alarm(int sig)
262 errno = save_errno; 262 errno = save_errno;
263} 263}
264 264
265char *
266chop(char *s)
267{
268 char *t = s;
269 while (*t) {
270 if(*t == '\n' || *t == '\r') {
271 *t = '\0';
272 return s;
273 }
274 t++;
275 }
276 return s;
277
278}
279
280void 265void
281sshd_exchange_identification(int sock_in, int sock_out) 266sshd_exchange_identification(int sock_in, int sock_out)
282{ 267{