- 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)

1 files changed, 11 insertions, 8 deletions

diff --git a/sshd.c b/sshd.c
index 60d34d8b6..0c15e2837 100644
--- a/sshd.c
+++ b/sshd.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: sshd.c,v 1.34 1999/12/07 03:56:27 damien Exp $");
+RCSID("$Id: sshd.c,v 1.35 1999/12/07 04:38:32 damien Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -812,7 +812,7 @@ main(int ac, char **av)
                 /* Send our protocol version identification. */
                 snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n",
                          PROTOCOL_MAJOR, PROTOCOL_MINOR, SSH_VERSION);
-                if (write(sock_out, buf, strlen(buf)) != strlen(buf))
+                if (atomicio(write, sock_out, buf, strlen(buf)) != strlen(buf))
                         fatal("Could not write ident string to %s.", get_remote_ipaddr());
 
                 /* Read other side\'s version identification. */
@@ -838,9 +838,10 @@ main(int ac, char **av)
          * several versions and set appropriate flags to handle them.
          */
         if (sscanf(buf, "SSH-%d.%d-%[^\n]\n", &remote_major, &remote_minor,
-                   remote_version) != 3) {
-                const char *s = "Protocol mismatch.\n";
-                (void) write(sock_out, s, strlen(s));
+            remote_version) != 3) {
+                char *s = "Protocol mismatch.\n";
+
+                (void) atomicio(write, sock_out, s, strlen(s));
                 close(sock_in);
                 close(sock_out);
                 fatal("Bad protocol version identification '%.100s' from %s",
@@ -849,8 +850,9 @@ main(int ac, char **av)
         debug("Client protocol version %d.%d; client software version %.100s",
               remote_major, remote_minor, remote_version);
         if (remote_major != PROTOCOL_MAJOR) {
-                const char *s = "Protocol major versions differ.\n";
-                (void) write(sock_out, s, strlen(s));
+                char *s = "Protocol major versions differ.\n";
+
+                (void) atomicio(write, sock_out, s, strlen(s));
                 close(sock_in);
                 close(sock_out);
                 fatal("Protocol major versions differ for %s: %d vs. %d",
@@ -1737,7 +1739,8 @@ do_authenticated(struct passwd * pw)
                         debug("Allocating pty.");
 
                         /* Allocate a pty and open it. */
-                        if (!pty_allocate(&ptyfd, &ttyfd, ttyname)) {
+                        if (!pty_allocate(&ptyfd, &ttyfd, ttyname,
+                            sizeof(ttyname))) {
                                 error("Failed to allocate pty.");
                                 goto fail;
                         }