- deraadt@cvs.openbsd.org 2002/06/26 13:20:57

[openssh.git] / session.c

diff --git a/session.c b/session.c
index d2a460f8985efe5fc2220948c8df4478cf194d9a..51c8a0ae45f624b44cfc4b9188417ed443fdaa67 100644 (file)
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.136 2002/06/10 22:28:41 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.141 2002/06/26 08:58:26 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -162,8 +162,8 @@ auth_input_request_forwarding(struct passwd * pw)
                auth_sock_dir = NULL;
                return 0;
        }
-       snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%d",
-                auth_sock_dir, (int) getpid());
+       snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%ld",
+                auth_sock_dir, (long) getpid());
 
        /* delete agent socket on fatal() */
        fatal_add_cleanup(auth_sock_cleanup_proc, pw);
@@ -252,8 +252,8 @@ do_authenticated1(Authctxt *authctxt)
        Session *s;
        char *command;
        int success, type, screen_flag;
-       int compression_level = 0, enable_compression_after_reply = 0;
-       u_int proto_len, data_len, dlen;
+       int enable_compression_after_reply = 0;
+       u_int proto_len, data_len, dlen, compression_level = 0;
 
        s = session_new();
        s->authctxt = authctxt;
@@ -279,6 +279,10 @@ do_authenticated1(Authctxt *authctxt)
                                    compression_level);
                                break;
                        }
+                       if (!options.compression) {
+                               debug2("compression disabled");
+                               break;
+                       }
                        /* Enable compression after we have responded with SUCCESS. */
                        enable_compression_after_reply = 1;
                        success = 1;
@@ -435,7 +439,7 @@ do_authenticated1(Authctxt *authctxt)
 void
 do_exec_no_pty(Session *s, const char *command)
 {
-       int pid;
+       pid_t pid;
 
 #ifdef USE_PIPES
        int pin[2], pout[2], perr[2];
@@ -845,6 +849,9 @@ child_set_env(char ***envp, u_int *envsizep, const char *name,
        } else {
                /* New variable.  Expand if necessary. */
                if (i >= (*envsizep) - 1) {
+                       if (*envsizep >= 1000)
+                               fatal("child_set_env: too many env vars,"
+                                   " skipping: %.100s", name);
                        (*envsizep) += 50;
                        env = (*envp) = xrealloc(env, (*envsizep) * sizeof(char *));
                }
@@ -1148,15 +1155,20 @@ do_nologin(struct passwd *pw)
 void
 do_setusercontext(struct passwd *pw)
 {
+       char tty='\0';
+
 #ifdef HAVE_CYGWIN
        if (is_winnt) {
 #else /* HAVE_CYGWIN */
        if (getuid() == 0 || geteuid() == 0) {
 #endif /* HAVE_CYGWIN */
-#ifdef HAVE_GETUSERATTR
-               set_limits_from_userattr(pw->pw_name);
-#endif /* HAVE_GETUSERATTR */
+#ifdef HAVE_SETPCRED
+               setpcred(pw->pw_name);
+#endif /* HAVE_SETPCRED */
 #ifdef HAVE_LOGIN_CAP
+#ifdef __bsdi__
+               setpgid(0, 0);
+#endif
                if (setusercontext(lc, pw, pw->pw_uid,
                    (LOGIN_SETALL & ~LOGIN_SETPATH)) < 0) {
                        perror("unable to set user context");
@@ -1192,6 +1204,10 @@ do_setusercontext(struct passwd *pw)
 # if defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY)
                irix_setusercontext(pw);
 #  endif /* defined(WITH_IRIX_PROJECT) || defined(WITH_IRIX_JOBS) || defined(WITH_IRIX_ARRAY) */
+# ifdef _AIX
+               /* XXX: Disable tty setting.  Enabled if required later */
+               aix_usrinfo(pw, &tty, -1);
+# endif /* _AIX */
                /* Permanently switch to the desired uid. */
                permanently_set_uid(pw);
 #endif
@@ -1254,9 +1270,6 @@ do_child(Session *s, const char *command)
                        do_motd();
 #else /* HAVE_OSF_SIA */
                do_nologin(pw);
-# ifdef _AIX
-               aix_usrinfo(pw, s->tty, s->ttyfd);
-# endif /* _AIX */
                do_setusercontext(pw);
 #endif /* HAVE_OSF_SIA */
        }
@@ -1430,12 +1443,12 @@ session_dump(void)
        int i;
        for (i = 0; i < MAX_SESSIONS; i++) {
                Session *s = &sessions[i];
-               debug("dump: used %d session %d %p channel %d pid %d",
+               debug("dump: used %d session %d %p channel %d pid %ld",
                    s->used,
                    s->self,
                    s,
                    s->chanid,
-                   s->pid);
+                   (long)s->pid);
        }
 }
 
@@ -1493,13 +1506,13 @@ static Session *
 session_by_pid(pid_t pid)
 {
        int i;
-       debug("session_by_pid: pid %d", pid);
+       debug("session_by_pid: pid %ld", (long)pid);
        for (i = 0; i < MAX_SESSIONS; i++) {
                Session *s = &sessions[i];
                if (s->used && s->pid == pid)
                        return s;
        }
-       error("session_by_pid: unknown pid %d", pid);
+       error("session_by_pid: unknown pid %ld", (long)pid);
        session_dump();
        return NULL;
 }
@@ -1789,8 +1802,8 @@ session_exit_message(Session *s, int status)
        if ((c = channel_lookup(s->chanid)) == NULL)
                fatal("session_exit_message: session %d: no channel %d",
                    s->self, s->chanid);
-       debug("session_exit_message: session %d channel %d pid %d",
-           s->self, s->chanid, s->pid);
+       debug("session_exit_message: session %d channel %d pid %ld",
+           s->self, s->chanid, (long)s->pid);
 
        if (WIFEXITED(status)) {
                channel_request_start(s->chanid, "exit-status", 0);
@@ -1829,7 +1842,7 @@ session_exit_message(Session *s, int status)
 void
 session_close(Session *s)
 {
-       debug("session_close: session %d pid %d", s->self, s->pid);
+       debug("session_close: session %d pid %ld", s->self, (long)s->pid);
        if (s->ttyfd != -1) {
                fatal_remove_cleanup(session_pty_cleanup, (void *)s);
                session_pty_cleanup(s);
@@ -1853,7 +1866,8 @@ session_close_by_pid(pid_t pid, int status)
 {
        Session *s = session_by_pid(pid);
        if (s == NULL) {
-               debug("session_close_by_pid: no session for pid %d", pid);
+               debug("session_close_by_pid: no session for pid %ld",
+                   (long)pid);
                return;
        }
        if (s->chanid != -1)
@@ -1873,7 +1887,8 @@ session_close_by_channel(int id, void *arg)
                debug("session_close_by_channel: no session for id %d", id);
                return;
        }
-       debug("session_close_by_channel: channel %d child %d", id, s->pid);
+       debug("session_close_by_channel: channel %d child %ld",
+           id, (long)s->pid);
        if (s->pid != 0) {
                debug("session_close_by_channel: channel %d: has child", id);
                /*
@@ -1964,9 +1979,9 @@ session_setup_x11fwd(Session *s)
                debug("X11 display already set.");
                return 0;
        }
-       s->display_number = x11_create_display_inet(options.x11_display_offset,
-           options.x11_use_localhost, s->single_connection);
-       if (s->display_number == -1) {
+       if (x11_create_display_inet(options.x11_display_offset,
+           options.x11_use_localhost, s->single_connection,
+           &s->display_number) == -1) {
                debug("x11_create_display_inet failed.");
                return 0;
        }
@@ -1980,9 +1995,9 @@ session_setup_x11fwd(Session *s)
         * different than the DISPLAY string for localhost displays.
         */
        if (options.x11_use_localhost) {
-               snprintf(display, sizeof display, "localhost:%d.%d",
+               snprintf(display, sizeof display, "localhost:%u.%u",
                    s->display_number, s->screen);
-               snprintf(auth_display, sizeof auth_display, "unix:%d.%d",
+               snprintf(auth_display, sizeof auth_display, "unix:%u.%u",
                    s->display_number, s->screen);
                s->display = xstrdup(display);
                s->auth_display = xstrdup(auth_display);
@@ -1998,10 +2013,10 @@ session_setup_x11fwd(Session *s)
                        return 0;
                }
                memcpy(&my_addr, he->h_addr_list[0], sizeof(struct in_addr));
-               snprintf(display, sizeof display, "%.50s:%d.%d", inet_ntoa(my_addr),
+               snprintf(display, sizeof display, "%.50s:%u.%u", inet_ntoa(my_addr),
                    s->display_number, s->screen);
 #else
-               snprintf(display, sizeof display, "%.400s:%d.%d", hostname,
+               snprintf(display, sizeof display, "%.400s:%u.%u", hostname,
                    s->display_number, s->screen);
 #endif
                s->display = xstrdup(display);