- (djm) Pick up LOGIN_PROGRAM from environment or PATH if not set by headers

 - (djm) OpenBSD CVS updates:
   - deraadt@cvs.openbsd.org 2000/08/18 20:07:23
     [ssh.c]
     accept remsh as a valid name as well; roman@buildpoint.com
   - deraadt@cvs.openbsd.org 2000/08/18 20:17:13
     [deattack.c crc32.c packet.c]
     rename crc32() to ssh_crc32() to avoid zlib name clash.  do not move to
     libz crc32 function yet, because it has ugly "long"'s in it;
     oneill@cs.sfu.ca
   - deraadt@cvs.openbsd.org 2000/08/18 20:26:08
     [scp.1 scp.c]
     -S prog support; tv@debian.org
   - deraadt@cvs.openbsd.org 2000/08/18 20:50:07
     [scp.c]
     knf
   - deraadt@cvs.openbsd.org 2000/08/18 20:57:33
     [log-client.c]
     shorten
   - markus@cvs.openbsd.org  2000/08/19 12:48:11
     [channels.c channels.h clientloop.c ssh.c ssh.h]
     support for ~. in ssh2
   - deraadt@cvs.openbsd.org 2000/08/19 15:29:40
     [crc32.h]
     proper prototype
   - markus@cvs.openbsd.org  2000/08/19 15:34:44
     [authfd.c authfd.h key.c key.h ssh-add.1 ssh-add.c ssh-agent.1]
     [ssh-agent.c ssh-keygen.c sshconnect1.c sshconnect2.c Makefile]
     [fingerprint.c fingerprint.h]
     add SSH2/DSA support to the agent and some other DSA related cleanups.
     (note that we cannot talk to ssh.com's ssh2 agents)
   - markus@cvs.openbsd.org  2000/08/19 15:55:52
     [channels.c channels.h clientloop.c]
     more ~ support for ssh2
   - markus@cvs.openbsd.org  2000/08/19 16:21:19
     [clientloop.c]
     oops
   - millert@cvs.openbsd.org 2000/08/20 12:25:53
     [session.c]
     We have to stash the result of get_remote_name_or_ip() before we
     close our socket or getpeername() will get EBADF and the process
     will exit.  Only a problem for "UseLogin yes".
   - millert@cvs.openbsd.org 2000/08/20 12:30:59
     [session.c]
     Only check /etc/nologin if "UseLogin no" since login(1) may have its
     own policy on determining who is allowed to login when /etc/nologin
     is present.  Also use the _PATH_NOLOGIN define.
   - millert@cvs.openbsd.org 2000/08/20 12:42:43
     [auth1.c auth2.c session.c ssh.c]
     Add calls to setusercontext() and login_get*().  We basically call
     setusercontext() in most places where previously we did a setlogin().
     Add default login.conf file and put root in the "daemon" login class.
   - millert@cvs.openbsd.org 2000/08/21 10:23:31
     [session.c]
     Fix incorrect PATH setting; noted by Markus.

1 files changed, 19 insertions, 9 deletions

diff --git a/ssh.c b/ssh.c
index 58e4d7bd9..39512c5f1 100644
--- a/ssh.c
+++ b/ssh.c
@@ -11,7 +11,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.58 2000/07/16 08:27:22 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.61 2000/08/20 18:42:40 millert Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/dsa.h>
@@ -253,8 +253,8 @@ main(int ac, char **av)
                 cp = strrchr(av0, '/') + 1;
         else
                 cp = av0;
-        if (strcmp(cp, "rsh") != 0 && strcmp(cp, "ssh") != 0 &&
-            strcmp(cp, "rlogin") != 0 && strcmp(cp, "slogin") != 0)
+        if (strcmp(cp, "rsh") && strcmp(cp, "ssh") && strcmp(cp, "rlogin") &&
+            strcmp(cp, "slogin") && strcmp(cp, "remsh"))
                 host = cp;
 
         for (optind = 1; optind < ac; optind++) {
@@ -490,6 +490,9 @@ main(int ac, char **av)
         pwcopy.pw_passwd = xstrdup(pw->pw_passwd);
         pwcopy.pw_uid = pw->pw_uid;
         pwcopy.pw_gid = pw->pw_gid;
+#ifdef HAVE_PW_CLASS_IN_PASSWD
+        pwcopy.pw_class = xstrdup(pw->pw_class);
+#endif
         pwcopy.pw_dir = xstrdup(pw->pw_dir);
         pwcopy.pw_shell = xstrdup(pw->pw_shell);
         pw = &pwcopy;
@@ -871,7 +874,7 @@ ssh_session(void)
         }
 
         /* Enter the interactive session. */
-        return client_loop(have_tty, tty_flag ? options.escape_char : -1);
+        return client_loop(have_tty, tty_flag ? options.escape_char : -1, 0);
 }
 
 void
@@ -954,9 +957,16 @@ int
 ssh_session2(void)
 {
         int window, packetmax, id;
-        int in  = dup(STDIN_FILENO);
-        int out = dup(STDOUT_FILENO);
-        int err = dup(STDERR_FILENO);
+        int in, out, err;
+
+        /* If requested, let ssh continue in the background. */
+        if (fork_after_authentication_flag)
+                if (daemon(1, 1) < 0)
+                        fatal("daemon() failed: %.200s", strerror(errno));
+
+        in  = dup(STDIN_FILENO);
+        out = dup(STDOUT_FILENO);
+        err = dup(STDERR_FILENO);
 
         if (in < 0 || out < 0 || err < 0)
                 fatal("dump in/out/err failed");
@@ -972,13 +982,13 @@ ssh_session2(void)
                 packetmax = window/2;
         }
 
+/*XXX MAXPACK */
         id = channel_new(
             "session", SSH_CHANNEL_OPENING, in, out, err,
             window, packetmax, CHAN_EXTENDED_WRITE, xstrdup("client-session"));
 
-
         channel_open(id);
         channel_register_callback(id, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION, client_init, (void *)0);
 
-        return client_loop(tty_flag, tty_flag ? options.escape_char : -1);
+        return client_loop(tty_flag, tty_flag ? options.escape_char : -1, id);
 }