X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/34bce9a5b537094d0417f1f0a72cd27c73ef6b41..3dc1102ec55da4c4f412db1224270bd3e60962cc:/session.c

diff --git a/session.c b/session.c
index c6253139..c490f087 100644
--- a/session.c
+++ b/session.c
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.8 2000/04/29 16:06:08 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.12 2000/05/03 18:03:07 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -57,6 +57,7 @@ struct Session {
 Session *session_new(void);
 void	session_set_fds(Session *s, int fdin, int fdout, int fderr);
 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);
 
@@ -70,7 +71,7 @@ extern ServerOptions options;
 #ifdef HAVE___PROGNAME
 extern char *__progname;
 #else /* HAVE___PROGNAME */
-const char *__progname = "sshd";
+static const char *__progname = "sshd";
 #endif /* HAVE___PROGNAME */
 
 extern int log_stderr;
@@ -240,6 +241,8 @@ do_authenticated(struct passwd * pw)
 			tty_parse_modes(s->ttyfd, &n_bytes);
 			packet_integrity_check(plen, 4 + dlen + 4 * 4 + n_bytes, type);
 
+			session_proctitle(s);
+
 			/* Indicate that we now have a pty. */
 			success = 1;
 			have_pty = 1;
@@ -312,7 +315,7 @@ do_authenticated(struct passwd * pw)
 				break;
 			}
 			debug("Received TCP/IP port forwarding request.");
-			channel_input_port_forward_request(pw->pw_uid == 0);
+			channel_input_port_forward_request(pw->pw_uid == 0, options.gateway_ports);
 			success = 1;
 			break;
 
@@ -397,7 +400,7 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
 	if (s == NULL)
 		fatal("do_exec_no_pty: no session");
 
-	setproctitle("%s@notty", pw->pw_name);
+	session_proctitle(s);
 
 #ifdef USE_PAM
 			do_pam_setcred();
@@ -527,7 +530,6 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
 		last_login_time = get_last_login_time(pw->pw_uid, pw->pw_name,
 						      buf, sizeof(buf));
 	}
-	setproctitle("%s@%s", pw->pw_name, strrchr(s->tty, '/') + 1);
 
 #ifdef USE_PAM
 			do_pam_session(pw->pw_name, s->tty);
@@ -563,7 +565,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
 		/* Close the extra descriptor for the pseudo tty. */
 		close(ttyfd);
 
-///XXXX ? move to do_child() ??
+/* XXXX ? move to do_child() ??*/
 		/*
 		 * Get IP address of client.  This is needed because we want
 		 * to record where the user logged in from.  If the
@@ -1257,6 +1259,8 @@ session_pty_req(Session *s)
 	/* Get window size from the packet. */
 	pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
 
+	session_proctitle(s);
+
 	/* XXX parse and set terminal modes */
 	xfree(term_modes);
 	return 1;
@@ -1499,6 +1503,7 @@ session_close(Session *s)
 {
 	session_pty_cleanup(s);
 	session_free(s);
+	session_proctitle(s);
 }
 
 void
@@ -1542,6 +1547,34 @@ session_close_by_channel(int id, void *arg)
 	}
 }
 
+char *
+session_tty_list(void)
+{
+	static char buf[1024];
+	int i;
+	buf[0] = '\0';
+	for(i = 0; i < MAX_SESSIONS; i++) {
+		Session *s = &sessions[i];
+		if (s->used && s->ttyfd != -1) {
+			if (buf[0] != '\0')
+				strlcat(buf, ",", sizeof buf);
+			strlcat(buf, strrchr(s->tty, '/') + 1, sizeof buf);
+		}
+	}
+	if (buf[0] == '\0')
+		strlcpy(buf, "notty", sizeof buf);
+	return buf;
+}
+
+void
+session_proctitle(Session *s)
+{
+	if (s->pw == NULL)
+		error("no user for session %d", s->self);
+	else
+		setproctitle("%s@%s", s->pw->pw_name, session_tty_list());
+}
+
 void
 do_authenticated2(void)
 {