comparison cli-main.c @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents 7f604f9b3756 70811267715c
children c19acba28590
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
101 cli_opts.username, cli_opts.remotehost, 101 cli_opts.username, cli_opts.remotehost,
102 cli_opts.remoteport, format); 102 cli_opts.remoteport, format);
103 } 103 }
104 104
105 /* Do the cleanup first, since then the terminal will be reset */ 105 /* Do the cleanup first, since then the terminal will be reset */
106 cli_session_cleanup(); 106 session_cleanup();
107 common_session_cleanup();
108 107
109 _dropbear_log(LOG_INFO, fmtbuf, param); 108 _dropbear_log(LOG_INFO, fmtbuf, param);
110 109
111 exit(exitcode); 110 exit(exitcode);
112 } 111 }