comparison cli-authpasswd.c @ 278:e109fb08b8ee

merge of 4cbdd6e0a0d8c061075b9ed7609a06c4547f67d3 and 5d396842815593611f0d61762440145d1fc74d5a
author Matt Johnston <matt@ucc.asn.au>
date Wed, 08 Mar 2006 12:53:09 +0000
parents 475a818dd6e7
children 8f3ec7c104d9
comparison
equal deleted inserted replaced
276:3cea9d789cca 278:e109fb08b8ee
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));