← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dropbear/utopic-proposed

« back to all changes in this revision

Viewing changes to common-channel.c

  • Committer: Bazaar Package Importer
  • Author(s): Gerrit Pape, Matt Johnston, Gerrit Pape
  • Date: 2008-11-19 20:58:59 UTC
  • mfrom: (1.4.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20081119205859-dmeze0y6b16ia93v
Tags: 0.52-1
http://bugs.debian.org/495823
http://bugs.debian.org/495825
http://bugs.debian.org/465903
[ Matt Johnston ]
* New upstream release.
  * dbclient.1: mention optional 'command' argument (closes: #495823).

[ Gerrit Pape ]
* debian/diff/0001-dbclient.1-dbclient-uses-compression-if...diff:
  new; dbclient.1: dbclient uses compression if compiled with zlib
  support (thx Luca Capello, closes: #495825).
* debian/initramfs/*: new; cryptroot remote unlocking on boot feature
  (thx debian@x.ray.net).
* debian/rules: install debian/initramfs/* (thx debian@x.ray.net).
* debian/control: Suggests: udev (for cryptroot support, thx
  debian@x.ray.net).
* debian/dropbear.postinst: conditionally run update-initramfs -u
  (for cryptroot support, thx debian@x.ray.net. closes: #465903).
* debian/diff/0002-dropbearkey.8-mention-y-option-add-example.diff:
  new; mention -y option, add example (thx debian@x.ray.net).

Show diffs side-by-side

added added

removed removed

Lines of Context:
common-channel.c
276
276
                channel->flushing = 1;
277
277
        }
278
278
        
279
 
        // if a type-specific check_close is defined we will only exit
280
 
        // once that has been triggered. this is only used for a server "session"
281
 
        // channel, to ensure that the shell has exited (and the exit status 
282
 
        // retrieved) before we close things up.        
 
279
        /* if a type-specific check_close is defined we will only exit
 
280
           once that has been triggered. this is only used for a server "session"
 
281
           channel, to ensure that the shell has exited (and the exit status 
 
282
           retrieved) before we close things up. */
283
283
        if (!channel->type->check_close 
284
284
                        || channel->type->check_close(channel)) {
285
285
                close_allowed = 1;
572
572
        
573
573
        channel = getchannel();
574
574
 
 
575
        if (channel->sent_close) {
 
576
                TRACE(("leave recv_msg_channel_request: already closed channel"))
 
577
                return;
 
578
        }
 
579
 
575
580
        if (channel->type->reqhandler) {
576
581
                channel->type->reqhandler(channel);
577
582
        } else {
686
691
                dropbear_exit("received data after eof");
687
692
        }
688
693
 
689
 
        if (fd < 0) {
 
694
        if (fd < 0) {
690
695
                /* If we have encountered failed write, the far side might still
691
696
                 * be sending data without having yet received our close notification.
692
697
                 * We just drop the data. */