]> andersk Git - openssh.git/blobdiff - session.c
- (bal) Slight auth2-pam.c clean up.
[openssh.git] / session.c
index 82096c3abc4a1b8ebf57169b7caef0ba19b229d4..20975cb6cad93e3d0cf12365cd50e57c666ca00f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,21 +1,45 @@
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- */
-/*
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
  * SSH2 support by Markus Friedl.
  * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.29 2000/08/21 16:23:31 millert Exp $");
+RCSID("$OpenBSD: session.c,v 1.49 2001/01/18 17:00:00 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
 #include "pty.h"
 #include "packet.h"
 #include "buffer.h"
-#include "cipher.h"
 #include "mpaux.h"
 #include "servconf.h"
 #include "uidswap.h"
@@ -31,6 +55,12 @@ RCSID("$OpenBSD: session.c,v 1.29 2000/08/21 16:23:31 millert 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>
@@ -41,6 +71,12 @@ RCSID("$OpenBSD: session.c,v 1.29 2000/08/21 16:23:31 millert Exp $");
 # include <siad.h>
 #endif
 
+#ifdef HAVE_CYGWIN
+#include <windows.h>
+#include <sys/cygwin.h>
+#define is_winnt       (GetVersion() < 0x80000000)
+#endif
+
 /* AIX limits */
 #if defined(HAVE_GETUSERATTR) && !defined(S_UFSIZE_HARD) && defined(S_UFSIZE)
 # define S_UFSIZE_HARD  S_UFSIZE "_hard"
@@ -89,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,
@@ -98,24 +134,23 @@ 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;
+extern u_int utmp_len;
 
 extern int startup_pipe;
 
 /* Local Xauthority file. */
 static char *xauthfile;
 
+/* original command from peer. */
+char *original_command = NULL; 
+
 /* data */
 #define MAX_SESSIONS 10
 Session        sessions[MAX_SESSIONS];
+
 #ifdef WITH_AIXAUTHENTICATE
 /* AIX's lastlogin message, set in auth1.c */
 char *aixloginmsg;
@@ -177,13 +212,13 @@ void
 do_authenticated(struct passwd * pw)
 {
        Session *s;
-       int type;
+       int type, fd;
        int compression_level = 0, enable_compression_after_reply = 0;
        int have_pty = 0;
        char *command;
        int n_bytes;
        int plen;
-       unsigned int proto_len, data_len, dlen;
+       u_int proto_len, data_len, dlen;
 
        /*
         * Cancel the alarm we set to limit the time taken for
@@ -202,13 +237,13 @@ do_authenticated(struct passwd * pw)
         * by the client telling us, so we can equally well trust the client
         * not to request anything bogus.)
         */
-       if (!no_port_forwarding_flag)
+       if (!no_port_forwarding_flag && options.allow_tcp_forwarding)
                channel_permit_all_opens();
 
        s = session_new();
        s->pw = pw;
 
-#ifdef HAVE_LOGIN_CAP
+#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
        if ((lc = login_getclass(pw->pw_class)) == NULL) {
                error("unable to get login class");
                return;
@@ -332,7 +367,9 @@ do_authenticated(struct passwd * pw)
                                break;
                        }
                        strlcat(xauthfile, "/cookies", MAXPATHLEN);
-                       open(xauthfile, O_RDWR|O_CREAT|O_EXCL, 0600);
+                       fd = open(xauthfile, O_RDWR|O_CREAT|O_EXCL, 0600);
+                       if (fd >= 0)
+                               close(fd);
                        restore_uid();
                        fatal_add_cleanup(xauthfile_cleanup_proc, NULL);
                        success = 1;
@@ -352,6 +389,10 @@ do_authenticated(struct passwd * pw)
                                debug("Port forwarding not permitted for this authentication.");
                                break;
                        }
+                       if (!options.allow_tcp_forwarding) {
+                               debug("Port forwarding not permitted.");
+                               break;
+                       }
                        debug("Received TCP/IP port forwarding request.");
                        channel_input_port_forward_request(pw->pw_uid == 0, options.gateway_ports);
                        success = 1;
@@ -364,10 +405,6 @@ do_authenticated(struct passwd * pw)
 
                case SSH_CMSG_EXEC_SHELL:
                case SSH_CMSG_EXEC_CMD:
-                       /* Set interactive/non-interactive mode. */
-                       packet_set_interactive(have_pty || s->display != NULL,
-                           options.keepalives);
-
                        if (type == SSH_CMSG_EXEC_CMD) {
                                command = packet_get_string(&dlen);
                                debug("Exec command '%.500s'", command);
@@ -377,6 +414,7 @@ do_authenticated(struct passwd * pw)
                                packet_integrity_check(plen, 0, type);
                        }
                        if (forced_command != NULL) {
+                               original_command = command;
                                command = forced_command;
                                debug("Forced command '%.500s'", forced_command);
                        }
@@ -449,6 +487,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.
@@ -497,9 +537,15 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
                do_child(command, pw, NULL, s->display, s->auth_proto, s->auth_data, NULL);
                /* NOTREACHED */
        }
+#ifdef HAVE_CYGWIN
+       if (is_winnt)
+               cygwin_set_impersonation_token(INVALID_HANDLE_VALUE);
+#endif
        if (pid < 0)
                packet_disconnect("fork failed: %.100s", strerror(errno));
        s->pid = pid;
+       /* Set interactive/non-interactive mode. */
+       packet_set_interactive(s->display != NULL);
 #ifdef USE_PIPES
        /* We are the parent.  Close the child sides of the pipes. */
        close(pin[0]);
@@ -558,6 +604,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);
 
@@ -580,14 +628,18 @@ 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,
                    s->auth_data, s->tty);
                /* NOTREACHED */
        }
+#ifdef HAVE_CYGWIN
+       if (is_winnt)
+               cygwin_set_impersonation_token(INVALID_HANDLE_VALUE);
+#endif
        if (pid < 0)
                packet_disconnect("fork failed: %.100s", strerror(errno));
        s->pid = pid;
@@ -611,6 +663,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
        s->ptymaster = ptymaster;
 
        /* Enter interactive session. */
+       packet_set_interactive(1);
        if (compat20) {
                session_set_fds(s, ptyfd, fdout, -1);
        } else {
@@ -633,11 +686,12 @@ 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;
        char buf[256];
+       char hostname[MAXHOSTNAMELEN];
        socklen_t fromlen;
        struct sockaddr_storage from;
        struct stat st;
@@ -659,11 +713,29 @@ do_login(Session *s)
                }
        }
 
+       /* Get the time and hostname when the user last logged in. */
+       hostname[0] = '\0';
+       last_login_time = get_last_login_time(pw->pw_uid, pw->pw_name,
+           hostname, sizeof(hostname));
+
        /* Record that there was a login on that tty from the remote host. */
        record_login(pid, s->tty, pw->pw_name, pw->pw_uid,
            get_remote_name_or_ip(), (struct sockaddr *)&from);
 
-       /* Done if .hushlogin exists. */
+#ifdef USE_PAM
+       /*
+        * If password change is needed, do it now.
+        * This needs to occur before the ~/.hushlogin check.
+        */
+       if (pam_password_change_required()) {
+               print_pam_messages();
+               do_pam_chauthtok();
+       }
+#endif
+
+       /* 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)
@@ -673,27 +745,22 @@ do_login(Session *s)
                return;
 
 #ifdef USE_PAM
-       print_pam_messages();
+       if (!pam_password_change_required())
+               print_pam_messages();
 #endif /* USE_PAM */
 #ifdef WITH_AIXAUTHENTICATE
        if (aixloginmsg && *aixloginmsg)
                printf("%s\n", aixloginmsg);
 #endif /* WITH_AIXAUTHENTICATE */
 
-       /*
-        * Get the time when the user last logged in.  'buf' will be set
-        * to contain the hostname the last login was from. 
-        */
-       last_login_time = get_last_login_time(pw->pw_uid, pw->pw_name,
-           buf, sizeof(buf));
        if (last_login_time != 0) {
                time_string = ctime(&last_login_time);
                if (strchr(time_string, '\n'))
                        *strchr(time_string, '\n') = 0;
-               if (strcmp(buf, "") == 0)
+               if (strcmp(hostname, "") == 0)
                        printf("Last login: %s\r\n", time_string);
                else
-                       printf("Last login: %s from %s\r\n", time_string, buf);
+                       printf("Last login: %s from %s\r\n", time_string, hostname);
        }
        if (options.print_motd) {
 #ifdef HAVE_LOGIN_CAP
@@ -715,10 +782,10 @@ do_login(Session *s)
  * already exists, its value is overriden.
  */
 void
-child_set_env(char ***envp, unsigned int *envsizep, const char *name,
+child_set_env(char ***envp, u_int *envsizep, const char *name,
              const char *value)
 {
-       unsigned int i, namelen;
+       u_int i, namelen;
        char **env;
 
        /*
@@ -756,7 +823,7 @@ child_set_env(char ***envp, unsigned int *envsizep, const char *name,
  * and assignments of the form name=value.  No other forms are allowed.
  */
 void
-read_environment_file(char ***env, unsigned int *envsize,
+read_environment_file(char ***env, u_int *envsize,
                      const char *filename)
 {
        FILE *f;
@@ -814,7 +881,7 @@ void do_pam_environment(char ***env, int *envsize)
                        strncpy(var_name, pam_env[i], equals - pam_env[i]);
                        strcpy(var_val, equals + 1);
 
-                       debug("PAM environment: %s=%s", var_name, var_val);
+                       debug3("PAM environment: %s=%s", var_name, var_val);
 
                        child_set_env(env, envsize, var_name, var_val);
                }
@@ -822,6 +889,32 @@ void do_pam_environment(char ***env, int *envsize)
 }
 #endif /* USE_PAM */
 
+
+#ifdef HAVE_CYGWIN
+void copy_environment(char ***env, int *envsize)
+{
+       char *equals, var_name[512], var_val[512];
+       int i;
+
+       for(i = 0; environ[i] != NULL; i++) {
+               if ((equals = strstr(environ[i], "=")) == NULL)
+                       continue;
+                       
+               if (strlen(environ[i]) < (sizeof(var_name) - 1)) {
+                       memset(var_name, '\0', sizeof(var_name));
+                       memset(var_val, '\0', sizeof(var_val));
+
+                       strncpy(var_name, environ[i], equals - environ[i]);
+                       strcpy(var_val, equals + 1);
+
+                       debug3("Copy environment: %s=%s", var_name, var_val);
+
+                       child_set_env(env, envsize, var_name, var_val);
+               }
+       }
+}
+#endif
+
 #if defined(HAVE_GETUSERATTR)
 /*
  * AIX-specific login initialisation
@@ -911,11 +1004,11 @@ do_child(const char *command, struct passwd * pw, const char *term,
         const char *display, const char *auth_proto,
         const char *auth_data, const char *ttyname)
 {
-       const char *shell, *hostname, *cp = NULL;
+       const char *shell, *hostname = NULL, *cp = NULL;
        char buf[256];
        char cmd[1024];
        FILE *f = NULL;
-       unsigned int envsize, i;
+       u_int envsize, i;
        char **env;
        extern char **environ;
        struct stat st;
@@ -923,6 +1016,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)
@@ -968,7 +1069,11 @@ do_child(const char *command, struct passwd * pw, const char *term,
                        exit(1);
                }
 #else /* HAVE_OSF_SIA */
+#ifdef HAVE_CYGWIN
+               if (is_winnt) {
+#else
                if (getuid() == 0 || geteuid() == 0) {
+#endif
 # ifdef HAVE_GETUSERATTR
                        set_limits_from_userattr(pw->pw_name);
 # endif /* HAVE_GETUSERATTR */
@@ -991,11 +1096,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 */
@@ -1007,14 +1121,25 @@ 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 */
                }
 #endif /* HAVE_OSF_SIA */
 
+#ifdef HAVE_CYGWIN
+               if (is_winnt)
+#endif
                if (getuid() != pw->pw_uid || geteuid() != pw->pw_uid)
-                       fatal("Failed to set uids to %d.", (int) pw->pw_uid);
+                       fatal("Failed to set uids to %u.", (u_int) pw->pw_uid);
        }
        /*
         * Get the shell from the password data.  An empty shell field is
@@ -1042,6 +1167,14 @@ do_child(const char *command, struct passwd * pw, const char *term,
        env = xmalloc(envsize * sizeof(char *));
        env[0] = NULL;
 
+#ifdef HAVE_CYGWIN
+       /*
+        * The Windows environment contains some setting which are
+        * important for a running system. They must not be dropped.
+        */
+       copy_environment(&env, &envsize);
+#endif
+
        if (!options.use_login) {
                /* Set basic environment. */
                child_set_env(&env, &envsize, "USER", pw->pw_name);
@@ -1050,9 +1183,17 @@ do_child(const char *command, struct passwd * pw, const char *term,
 #ifdef HAVE_LOGIN_CAP
                (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH);
                child_set_env(&env, &envsize, "PATH", getenv("PATH"));
-#else
+#else /* HAVE_LOGIN_CAP */
+# ifndef HAVE_CYGWIN
+               /*
+                * There's no standard path on Windows. The path contains
+                * important components pointing to the system directories,
+                * needed for loading shared libraries. So the path better
+                * remains intact here.
+                */
                child_set_env(&env, &envsize, "PATH", _PATH_STDPATH);
-#endif
+# endif /* HAVE_CYGWIN */
+#endif /* HAVE_LOGIN_CAP */
 
                snprintf(buf, sizeof buf, "%.200s/%.50s",
                         _PATH_MAILDIR, pw->pw_name);
@@ -1089,17 +1230,16 @@ do_child(const char *command, struct passwd * pw, const char *term,
                child_set_env(&env, &envsize, "TERM", term);
        if (display)
                child_set_env(&env, &envsize, "DISPLAY", display);
+       if (original_command)
+               child_set_env(&env, &envsize, "SSH_ORIGINAL_COMMAND",
+                   original_command);
 
 #ifdef _AIX
-       {
-           char *authstate,*krb5cc;
-
-          if ((authstate = getenv("AUTHSTATE")) != NULL)
-                child_set_env(&env,&envsize,"AUTHSTATE",authstate);
-
-          if ((krb5cc = getenv("KRB5CCNAME")) != NULL)
-                child_set_env(&env,&envsize,"KRB5CCNAME",krb5cc);
-       }
+       if ((cp = getenv("AUTHSTATE")) != NULL)
+               child_set_env(&env, &envsize, "AUTHSTATE", cp);
+       if ((cp = getenv("KRB5CCNAME")) != NULL)
+               child_set_env(&env, &envsize, "KRB5CCNAME", cp);
+       read_environment_file(&env, &envsize, "/etc/environment");
 #endif
 
 #ifdef KRB4
@@ -1116,8 +1256,6 @@ do_child(const char *command, struct passwd * pw, const char *term,
        do_pam_environment(&env, &envsize);
 #endif /* USE_PAM */
 
-       read_environment_file(&env,&envsize,"/etc/environment");
-
        if (xauthfile)
                child_set_env(&env, &envsize, "XAUTHORITY", xauthfile);
        if (auth_get_socket_name() != NULL)
@@ -1197,7 +1335,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
        if (!options.use_login) {
                if (stat(SSH_USER_RC, &st) >= 0) {
                        if (debug_flag)
-                               fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_USER_RC);
+                               fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_USER_RC);
 
                        f = popen(_PATH_BSHELL " " SSH_USER_RC, "w");
                        if (f) {
@@ -1208,7 +1346,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                fprintf(stderr, "Could not run %s\n", SSH_USER_RC);
                } else if (stat(SSH_SYSTEM_RC, &st) >= 0) {
                        if (debug_flag)
-                               fprintf(stderr, "Running "_PATH_BSHELL" %s\n", SSH_SYSTEM_RC);
+                               fprintf(stderr, "Running %s %s\n", _PATH_BSHELL, SSH_SYSTEM_RC);
 
                        f = popen(_PATH_BSHELL " " SSH_SYSTEM_RC, "w");
                        if (f) {
@@ -1226,11 +1364,13 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                            "Running %.100s add %.100s %.100s %.100s\n",
                                            options.xauth_location, display,
                                            auth_proto, auth_data);
+#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
                                        if (screen != NULL)
                                                fprintf(stderr,
                                                    "Adding %.*s/unix%s %s %s\n",
-                                                   screen-display, display,
+                                                   (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
+#endif
                                }
                                snprintf(cmd, sizeof cmd, "%s -q -",
                                    options.xauth_location);
@@ -1238,10 +1378,12 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                if (f) {
                                        fprintf(f, "add %s %s %s\n", display,
                                            auth_proto, auth_data);
+#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
                                        if (screen != NULL) 
                                                fprintf(f, "add %.*s/unix%s %s %s\n",
-                                                   screen-display, display,
+                                                   (int)(screen-display), display,
                                                    screen, auth_proto, auth_data);
+#endif
                                        pclose(f);
                                } else {
                                        fprintf(stderr, "Could not run %s\n",
@@ -1436,7 +1578,7 @@ session_window_change_req(Session *s)
 int
 session_pty_req(Session *s)
 {
-       unsigned int len;
+       u_int len;
        char *term_modes;       /* encoded terminal modes */
 
        if (no_pty_flag)
@@ -1485,7 +1627,7 @@ session_pty_req(Session *s)
 int
 session_subsystem_req(Session *s)
 {
-       unsigned int len;
+       u_int len;
        int success = 0;
        char *subsys = packet_get_string(&len);
        int i;
@@ -1511,6 +1653,7 @@ session_subsystem_req(Session *s)
 int
 session_x11_req(Session *s)
 {
+       int fd;
        if (no_x11_forwarding_flag) {
                debug("X11 forwarding disabled in user configuration file.");
                return 0;
@@ -1555,7 +1698,9 @@ session_x11_req(Session *s)
                return 0;
        }
        strlcat(xauthfile, "/cookies", MAXPATHLEN);
-       open(xauthfile, O_RDWR|O_CREAT|O_EXCL, 0600);
+       fd = open(xauthfile, O_RDWR|O_CREAT|O_EXCL, 0600);
+       if (fd >= 0)
+               close(fd);
        restore_uid();
        fatal_add_cleanup(xauthfile_cleanup_proc, s);
        return 1;
@@ -1578,11 +1723,11 @@ session_shell_req(Session *s)
 int
 session_exec_req(Session *s)
 {
-       unsigned int len;
+       u_int len;
        char *command = packet_get_string(&len);
        packet_done();
        if (forced_command) {
-               xfree(command);
+               original_command = command;
                command = forced_command;
                debug("Forced command '%.500s'", forced_command);
        }
@@ -1596,10 +1741,27 @@ 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)
 {
-       unsigned int len;
+       u_int len;
        int reply;
        int success = 0;
        char *rtype;
@@ -1632,6 +1794,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);
                }
@@ -1662,7 +1826,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
@@ -1835,9 +2000,8 @@ session_proctitle(Session *s)
 }
 
 void
-do_authenticated2(void)
+do_authenticated2(Authctxt *authctxt)
 {
-       struct passwd *pw;
 
        /*
         * Cancel the alarm we set to limit the time taken for
@@ -1848,9 +2012,8 @@ do_authenticated2(void)
                close(startup_pipe);
                startup_pipe = -1;
        }
-#ifdef HAVE_LOGIN_CAP
-       pw = auth_get_user();
-       if ((lc = login_getclass(pw->pw_class)) == NULL) {
+#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
+       if ((lc = login_getclass(authctxt->pw->pw_class)) == NULL) {
                error("unable to get login class");
                return;
        }
This page took 0.064593 seconds and 4 git commands to generate.