diff options
author | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-12-07 15:38:31 +1100 |
commit | 037a0dc0835bb5a442bdcbeecdd5baed723f0b45 (patch) | |
tree | d02954d57ac437fd036e3e9544f24559ca8f0f0f /ssh.h | |
parent | eabf3417bc73ca9546a3ed489cd809ffdf303853 (diff) |
- Merged more OpenBSD changes:
- [atomicio.c authfd.c scp.c serverloop.c ssh.h sshconnect.c sshd.c]
move atomicio into it's own file. wrap all socket write()s which
were doing write(sock, buf, len) != len, with atomicio() calls.
- [auth-skey.c]
fd leak
- [authfile.c]
properly name fd variable
- [channels.c]
display great hatred towards strcpy
- [pty.c pty.h sshd.c]
use openpty() if it exists (it does on BSD4_4)
- [tildexpand.c]
check for ~ expansion past MAXPATHLEN
- Modified helper.c to use new atomicio function.
- Reformat Makefile a little
- Moved RC4 routines from rc4.[ch] into helper.c
- Added autoconf code to detect /dev/ptmx (Solaris) and /dev/ptc (AIX)
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.18 1999/12/07 03:54:53 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.19 1999/12/07 04:38:32 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -702,9 +702,14 @@ struct envstring { | |||
702 | struct envstring *next; | 702 | struct envstring *next; |
703 | char *s; | 703 | char *s; |
704 | }; | 704 | }; |
705 | |||
706 | /* | ||
707 | * Ensure all of data on socket comes through. f==read || f==write | ||
708 | */ | ||
709 | int atomicio(int (*f)(), int fd, void *s, size_t n); | ||
710 | |||
705 | #ifdef KRB4 | 711 | #ifdef KRB4 |
706 | #include <krb.h> | 712 | #include <krb.h> |
707 | |||
708 | /* | 713 | /* |
709 | * Performs Kerberos v4 mutual authentication with the client. This returns 0 | 714 | * Performs Kerberos v4 mutual authentication with the client. This returns 0 |
710 | * if the client could not be authenticated, and 1 if authentication was | 715 | * if the client could not be authenticated, and 1 if authentication was |