Improve kbdauth_init.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@640 7dcaeef0-15fb-0310-b436-a5af3365683c
Этот коммит содержится в:
родитель
84629a394e
Коммит
ddd1d62429
@ -1005,10 +1005,10 @@ static void kbdint_clean(struct ssh_kbdint *kbd) {
|
|||||||
* of the draft */
|
* of the draft */
|
||||||
static int kbdauth_init(SSH_SESSION *session, const char *user,
|
static int kbdauth_init(SSH_SESSION *session, const char *user,
|
||||||
const char *submethods) {
|
const char *submethods) {
|
||||||
STRING *usr = NULL;
|
STRING *usr;
|
||||||
STRING *sub = NULL;
|
STRING *sub;
|
||||||
STRING *service = NULL;
|
STRING *service;
|
||||||
STRING *method = NULL;
|
STRING *method;
|
||||||
int rc = SSH_AUTH_ERROR;
|
int rc = SSH_AUTH_ERROR;
|
||||||
|
|
||||||
enter_function();
|
enter_function();
|
||||||
@ -1030,22 +1030,12 @@ static int kbdauth_init(SSH_SESSION *session, const char *user,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0) {
|
if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_REQUEST) < 0 ||
|
||||||
goto error;
|
buffer_add_ssh_string(session->out_buffer, usr) < 0 ||
|
||||||
}
|
buffer_add_ssh_string(session->out_buffer, service) < 0 ||
|
||||||
if (buffer_add_ssh_string(session->out_buffer, usr) < 0) {
|
buffer_add_ssh_string(session->out_buffer, method) < 0 ||
|
||||||
goto error;
|
buffer_add_u32(session->out_buffer, 0) < 0 ||
|
||||||
}
|
buffer_add_ssh_string(session->out_buffer, sub) < 0) {
|
||||||
if (buffer_add_ssh_string(session->out_buffer, service) < 0) {
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
if (buffer_add_ssh_string(session->out_buffer, method) < 0) {
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
if (buffer_add_u32(session->out_buffer, 0) < 0) {
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
if (buffer_add_ssh_string(session->out_buffer, sub) < 0) {
|
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user