comparison cli-authpasswd.c @ 330:5488db2e9e4e

merge of 332f709a4cb39cde4cedab7c3be89e05f3023067 and ca4ca78b82c5d430c69ce01bf794e8886ce81431
author Matt Johnston <matt@ucc.asn.au>
date Sat, 10 Jun 2006 16:39:40 +0000
parents 475a818dd6e7
children 8f3ec7c104d9
comparison
equal deleted inserted replaced
329:8ed0dce45126 330:5488db2e9e4e
123 #ifdef ENABLE_CLI_ASKPASS_HELPER 123 #ifdef ENABLE_CLI_ASKPASS_HELPER
124 if (want_askpass()) 124 if (want_askpass())
125 password = gui_getpass("Password: "); 125 password = gui_getpass("Password: ");
126 else 126 else
127 #endif 127 #endif
128 password = getpass("Password: "); 128 password = getpass_or_cancel("Password: ");
129
130 if (password == NULL)
131 return 0;
132 129
133 buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); 130 buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);
134 131
135 buf_putstring(ses.writepayload, cli_opts.username, 132 buf_putstring(ses.writepayload, cli_opts.username,
136 strlen(cli_opts.username)); 133 strlen(cli_opts.username));