Commit 71dc7792 authored by Niels Möller's avatar Niels Möller

* src/lsh_proxy.c: Adapted to stricter alist typing.

* src/lshd.c: Likewise.

Rev: src/lsh_proxy.c:1.19
Rev: src/lshd.c:1.105
parent bb1a7df4
...@@ -690,10 +690,10 @@ int main(int argc, char **argv) ...@@ -690,10 +690,10 @@ int main(int argc, char **argv)
ALIST_SET(algorithms_server, ALIST_SET(algorithms_server,
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1,
make_dh_server(make_dh1(&r->super))); &make_dh_server(make_dh1(&r->super))->super);
ALIST_SET(algorithms_client, ALIST_SET(algorithms_client,
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1,
make_dh_client(make_dh1(&r->super))); &make_dh_client(make_dh1(&r->super))->super);
make_kexinit make_kexinit
= make_simple_kexinit(&r->super, = make_simple_kexinit(&r->super,
......
...@@ -397,7 +397,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state) ...@@ -397,7 +397,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP1_SHA1; LIST(self->kex_algorithms)[i++] = ATOM_DIFFIE_HELLMAN_GROUP1_SHA1;
ALIST_SET(self->super.algorithms, ALIST_SET(self->super.algorithms,
ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1,
make_dh_server(make_dh1(&self->random->super))); &make_dh_server(make_dh1(&self->random->super))
->super);
} }
#if WITH_SRP #if WITH_SRP
if (self->with_srp_keyexchange) if (self->with_srp_keyexchange)
...@@ -406,7 +407,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state) ...@@ -406,7 +407,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
LIST(self->kex_algorithms)[i++] = ATOM_SRP_RING1_SHA1_LOCAL; LIST(self->kex_algorithms)[i++] = ATOM_SRP_RING1_SHA1_LOCAL;
ALIST_SET(self->super.algorithms, ALIST_SET(self->super.algorithms,
ATOM_SRP_RING1_SHA1_LOCAL, ATOM_SRP_RING1_SHA1_LOCAL,
make_srp_server(make_srp1(&self->random->super), db)); &make_srp_server(make_srp1(&self->random->super), db)
->super);
} }
#endif /* WITH_SRP */ #endif /* WITH_SRP */
} }
...@@ -438,7 +440,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state) ...@@ -438,7 +440,8 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
{ {
LIST(self->userauth_methods)[i++] = ATOM_PASSWORD; LIST(self->userauth_methods)[i++] = ATOM_PASSWORD;
ALIST_SET(self->userauth_algorithms, ALIST_SET(self->userauth_algorithms,
ATOM_PASSWORD, make_userauth_password(db)); ATOM_PASSWORD,
&make_userauth_password(db)->super);
} }
if (self->with_publickey) if (self->with_publickey)
{ {
...@@ -446,14 +449,14 @@ main_argp_parser(int key, char *arg, struct argp_state *state) ...@@ -446,14 +449,14 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
LIST(self->userauth_methods)[i++] = ATOM_PUBLICKEY; LIST(self->userauth_methods)[i++] = ATOM_PUBLICKEY;
ALIST_SET(self->userauth_algorithms, ALIST_SET(self->userauth_algorithms,
ATOM_PUBLICKEY, ATOM_PUBLICKEY,
make_userauth_publickey &make_userauth_publickey
(db, (db,
make_alist(1, make_alist(1,
ATOM_SSH_DSS, ATOM_SSH_DSS,
make_authorization_db(ssh_format("authorized_keys_sha1"), make_authorization_db(ssh_format("authorized_keys_sha1"),
&sha1_algorithm), &sha1_algorithm),
-1))
-1))); ->super);
} }
} }
else else
...@@ -693,7 +696,7 @@ int main(int argc, char **argv) ...@@ -693,7 +696,7 @@ int main(int argc, char **argv)
#if WITH_PTY_SUPPORT #if WITH_PTY_SUPPORT
if (options->with_pty) if (options->with_pty)
ALIST_SET(supported_channel_requests, ALIST_SET(supported_channel_requests,
ATOM_PTY_REQ, &pty_request_handler); ATOM_PTY_REQ, &pty_request_handler.super);
#endif /* WITH_PTY_SUPPORT */ #endif /* WITH_PTY_SUPPORT */
session_setup = make_install_fix_channel_open_handler session_setup = make_install_fix_channel_open_handler
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment