[BACK]Return to channels.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/channels.c between version 1.155 and 1.156

version 1.155, 2001/12/29 21:56:01 version 1.156, 2002/01/05 10:43:40
Line 13 
Line 13 
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  *   *
  * SSH2 support added by Markus Friedl.   * SSH2 support added by Markus Friedl.
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.   * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  * Copyright (c) 1999 Dug Song.  All rights reserved.   * Copyright (c) 1999 Dug Song.  All rights reserved.
  * Copyright (c) 1999 Theo de Raadt.  All rights reserved.   * Copyright (c) 1999 Theo de Raadt.  All rights reserved.
  *   *
Line 872 
Line 872 
                 else                  else
                         channel_pre_open_15(c, readset, writeset);                          channel_pre_open_15(c, readset, writeset);
         } else if (ret == -1) {          } else if (ret == -1) {
                   log("X11 connection rejected because of wrong authentication.");
                 debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);                  debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
                 chan_read_failed(c);    /** force close? */                  chan_read_failed(c);
                 chan_write_failed(c);                  buffer_clear(&c->input);
                   chan_ibuf_empty(c);
                   buffer_clear(&c->output);
                   /* for proto v1, the peer will send an IEOF */
                   if (compat20)
                           chan_write_failed(c);
                   else
                           c->type = SSH_CHANNEL_OPEN;
                 debug("X11 closed %d i%d/o%d", c->self, c->istate, c->ostate);                  debug("X11 closed %d i%d/o%d", c->self, c->istate, c->ostate);
         }          }
 }  }
Line 1807 
Line 1815 
         chan_rcvd_ieof(c);          chan_rcvd_ieof(c);
   
         /* XXX force input close */          /* XXX force input close */
         if (c->force_drain) {          if (c->force_drain && c->istate == CHAN_INPUT_OPEN) {
                 debug("channel %d: FORCE input drain", c->self);                  debug("channel %d: FORCE input drain", c->self);
                 c->istate = CHAN_INPUT_WAIT_DRAIN;                  c->istate = CHAN_INPUT_WAIT_DRAIN;
         }          }
Legend:
Removed from v.1.155  
changed lines
  Added in v.1.156