- provos@cvs.openbsd.org 2002/03/18 17:50:31

     [auth-bsdauth.c auth-options.c auth-rh-rsa.c auth-rsa.c auth-skey.c auth.h
      auth1.c auth2-chall.c auth2.c kex.c kex.h kexdh.c kexgex.c servconf.c
      session.h servconf.h serverloop.c session.c sshd.c]
     integrate privilege separated openssh; its turned off by default for now.
     work done by me and markus@

applied, but outside of ensure that smaller code bits migrated with
their owners.. no work was tried to 'fix' it to work. =)  Later project!

1 files changed, 32 insertions, 2 deletions

diff --git a/session.h b/session.h
index ec8284a5f..81f024c9b 100644
--- a/session.h
+++ b/session.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: session.h,v 1.14 2002/02/03 17:53:25 markus Exp $     */
+/*      $OpenBSD: session.h,v 1.15 2002/03/18 17:50:31 provos Exp $     */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,12 +26,42 @@
 #ifndef SESSION_H
 #define SESSION_H
 
+#define TTYSZ 64
+typedef struct Session Session;
+struct Session {
+        int     used;
+        int     self;
+        struct passwd *pw;
+        Authctxt *authctxt;
+        pid_t   pid;
+        /* tty */
+        char    *term;
+        int     ptyfd, ttyfd, ptymaster;
+        int     row, col, xpixel, ypixel;
+        char    tty[TTYSZ];
+        /* X11 */
+        int     display_number;
+        char    *display;
+        int     screen;
+        char    *auth_display;
+        char    *auth_proto;
+        char    *auth_data;
+        int     single_connection;
+        /* proto 2 */
+        int     chanid;
+        int     is_subsystem;
+};
+
 void     do_authenticated(Authctxt *);
 
 int      session_open(Authctxt*, int);
 int      session_input_channel_req(Channel *, const char *);
 void     session_close_by_pid(pid_t, int);
 void     session_close_by_channel(int, void *);
-void     session_destroy_all(void);
+void     session_destroy_all(void (*)(Session *));
 
+Session *session_new(void);
+Session *session_by_tty(char *);
+void     session_close(Session *);
+void     do_setusercontext(struct passwd *);
 #endif