- (stevesk) OpenBSD CVS updates:

[openssh.git] / session.c

diff --git a/session.c b/session.c
index 4325ed3a4764af43b17c51e0c17d1ab29eca6842..1e996f95a98da251b7f2a7b34c877e2fa865cf1f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.40 2000/10/15 14:14:01 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.44 2000/11/14 23:44:19 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -55,6 +55,12 @@ RCSID("$OpenBSD: session.c,v 1.40 2000/10/15 14:14:01 markus Exp $");
 #ifdef WITH_IRIX_PROJECT
 #include <proj.h>
 #endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_JOBS
+#include <sys/resource.h>
+#endif 
+#ifdef WITH_IRIX_AUDIT
+#include <sat.h>
+#endif /* WITH_IRIX_AUDIT */
 
 #if defined(HAVE_USERSEC_H)
 #include <usersec.h>
@@ -119,7 +125,7 @@ void        session_pty_cleanup(Session *s);
 void   session_proctitle(Session *s);
 void   do_exec_pty(Session *s, const char *command, struct passwd * pw);
 void   do_exec_no_pty(Session *s, const char *command, struct passwd * pw);
-void   do_login(Session *s);
+void   do_login(Session *s, const char *command);
 
 void
 do_child(const char *command, struct passwd * pw, const char *term,
@@ -128,12 +134,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
 
 /* import */
 extern ServerOptions options;
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "sshd";
-#endif /* HAVE___PROGNAME */
-
 extern int log_stderr;
 extern int debug_flag;
 extern unsigned int utmp_len;
@@ -479,8 +480,6 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
        if (s == NULL)
                fatal("do_exec_no_pty: no session");
 
-       signal(SIGPIPE, SIG_DFL);
-
        session_proctitle(s);
 
 #ifdef USE_PAM
@@ -492,6 +491,8 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
                /* Child.  Reinitialize the log since the pid has changed. */
                log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
+               signal(SIGPIPE, SIG_DFL);
+
                /*
                 * Create a new session and process group since the 4.4BSD
                 * setlogin() affects the entire process group.
@@ -605,6 +606,8 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
                /* Child.  Reinitialize the log because the pid has changed. */
                log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
+               signal(SIGPIPE, SIG_DFL);
+
                /* Close the master side of the pseudo tty. */
                close(ptyfd);
 
@@ -627,8 +630,8 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
                close(ttyfd);
 
                /* record login, etc. similar to login(1) */
-               if (command == NULL && !options.use_login)
-                       do_login(s);
+               if (!(options.use_login && command == NULL))
+                       do_login(s, command);
 
                /* Do common processing for the child, such as execing the command. */
                do_child(command, pw, s->term, s->display, s->auth_proto,
@@ -684,7 +687,7 @@ get_remote_name_or_ip(void)
 
 /* administrative, login(1)-like work */
 void
-do_login(Session *s)
+do_login(Session *s, const char *command)
 {
        FILE *f;
        char *time_string;
@@ -731,7 +734,9 @@ do_login(Session *s)
        }
 #endif
 
-       /* Done if .hushlogin exists. */
+       /* Done if .hushlogin exists or a command given. */
+       if (command != NULL)
+               return;
        snprintf(buf, sizeof(buf), "%.200s/.hushlogin", pw->pw_dir);
 #ifdef HAVE_LOGIN_CAP
        if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0)
@@ -1012,6 +1017,14 @@ do_child(const char *command, struct passwd * pw, const char *term,
 #ifdef WITH_IRIX_PROJECT
        prid_t projid;
 #endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_JOBS
+       jid_t jid = 0;
+#else
+#ifdef WITH_IRIX_ARRAY
+       int jid = 0;
+#endif /* WITH_IRIX_ARRAY */
+#endif /* WITH_IRIX_JOBS */
+
 
        /* login(1) is only called if we execute the login shell */
        if (options.use_login && command != NULL)
@@ -1084,11 +1097,20 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                exit(1);
                        }
                        endgrent();
+#  ifdef WITH_IRIX_JOBS
+                       jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
+                       if (jid == -1) {
+                               fatal("Failed to create job container: %.100s",
+                                     strerror(errno));
+                        }
+#  endif /* WITH_IRIX_JOBS */
 #  ifdef WITH_IRIX_ARRAY
                        /* initialize array session */
-                       if (newarraysess() != 0)
-                               fatal("Failed to set up new array session: %.100s",
-                                     strerror(errno));
+                       if (jid == 0) {
+                               if (newarraysess() != 0)
+                                       fatal("Failed to set up new array session: %.100s",
+                                             strerror(errno));
+                       }
 #  endif /* WITH_IRIX_ARRAY */
 #  ifdef WITH_IRIX_PROJECT
                        /* initialize irix project info */
@@ -1100,6 +1122,14 @@ do_child(const char *command, struct passwd * pw, const char *term,
                          fatal("Failed to initialize project %d for %s: %.100s",
                                (int)projid, pw->pw_name, strerror(errno));
 #  endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_AUDIT
+                       if (sysconf(_SC_AUDIT)) {
+                               debug("Setting sat id to %d", (int) pw->pw_uid);
+                               if (satsetid(pw->pw_uid))
+                                       debug("error setting satid: %.100s", strerror(errno));
+                       }
+#endif /* WITH_IRIX_AUDIT */
+
                        /* Permanently switch to the desired uid. */
                        permanently_set_uid(pw->pw_uid);
 # endif /* HAVE_LOGIN_CAP */
@@ -1712,6 +1742,23 @@ session_exec_req(Session *s)
        return 1;
 }
 
+int
+session_auth_agent_req(Session *s)
+{
+       static int called = 0;
+       packet_done();
+       if (no_agent_forwarding_flag) {
+               debug("session_auth_agent_req: no_agent_forwarding_flag");
+               return 0;
+       }
+       if (called) {
+               return 0;
+       } else {
+               called = 1;
+               return auth_input_request_forwarding(s->pw);
+       }
+}
+
 void
 session_input_channel_req(int id, void *arg)
 {
@@ -1748,6 +1795,8 @@ session_input_channel_req(int id, void *arg)
                        success =  session_pty_req(s);
                } else if (strcmp(rtype, "x11-req") == 0) {
                        success = session_x11_req(s);
+               } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) {
+                       success = session_auth_agent_req(s);
                } else if (strcmp(rtype, "subsystem") == 0) {
                        success = session_subsystem_req(s);
                }
@@ -1778,7 +1827,8 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr)
                fatal("no channel for session %d", s->self);
        channel_set_fds(s->chanid,
            fdout, fdin, fderr,
-           fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ);
+           fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
+           1);
 }
 
 void
@@ -1850,13 +1900,9 @@ session_exit_message(Session *s, int status)
         * interested in data we write.
         * Note that we must not call 'chan_read_failed', since there could
         * be some more data waiting in the pipe.
-        * djm - This is no longer true as we have allowed one pass through 
-        * the select loop before killing the connection
         */
        if (c->ostate != CHAN_OUTPUT_CLOSED)
                chan_write_failed(c);
-       if (c->istate != CHAN_INPUT_CLOSED)
-               chan_read_failed(c);
        s->chanid = -1;
 }