- djm@cvs.openbsd.org 2001/03/25 00:01:34

     [session.c]
     shorten; ok markus@

diff --git a/ChangeLog b/ChangeLog
index b8a18db62046fad366a4c019940d4edbd743b25d..c6063ec961ef6857a8e89246cdd238be55b967a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
  - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)
  - Fix pointer issues in waitpid() and wait() replaces.  Patch by Lutz 
    Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
+ - OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2001/03/25 00:01:34
+     [session.c]
+     shorten; ok markus@
 
 20010324
  - Fixed permissions ssh-keyscan.  Thanks to Christopher Linn <celinn@mtu.edu>.

diff --git a/session.c b/session.c
index af5c836bce963661d5210a64cf82e4446b73a4db..70d3e32785022e3a3518c1a51b23ddb8fc4952c8 100644 (file)
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.67 2001/03/23 14:28:32 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.68 2001/03/25 00:01:34 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1510,20 +1510,11 @@ session_new(void)
        for(i = 0; i < MAX_SESSIONS; i++) {
                Session *s = &sessions[i];
                if (! s->used) {
-                       s->pid = 0;
-                       s->is_subsystem = 0;
+                       memset(s, 0, sizeof(*s));
                        s->chanid = -1;
                        s->ptyfd = -1;
                        s->ttyfd = -1;
-                       s->tty[0] = '\0';                                                       
-                       s->term = NULL;
-                       s->pw = NULL;
-                       s->display = NULL;
-                       s->screen = 0;
-                       s->auth_data = NULL;
-                       s->auth_proto = NULL;
                        s->used = 1;
-                       s->pw = NULL;
                        debug("session_new: session %d", i);
                        return s;
                }