diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2017-05-30 14:27:22 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-31 10:50:20 +1000 |
| commit | 5a146bbd4fdf5c571f9fb438e5210d28cead76d9 (patch) | |
| tree | 3a71031a294c0c6dbe8bff5bee6b3c2bbc619b98 /auth2-none.c | |
| parent | 60306b2d2f029f91927c6aa7c8e08068519a0fa2 (diff) | |
upstream commit
switch auth2-none.c to modern APIs; ok djm@
Upstream-ID: 07252b58e064d332214bcabbeae8e08c44b2001b
Diffstat (limited to 'auth2-none.c')
| -rw-r--r-- | auth2-none.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/auth2-none.c b/auth2-none.c index e71e2219..da6e2dd1 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-none.c,v 1.18 2014/07/15 15:54:14 millert Exp $ */ +/* $OpenBSD: auth2-none.c,v 1.19 2017/05/30 14:27:22 markus Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -37,7 +37,7 @@ #include "atomicio.h" #include "xmalloc.h" -#include "key.h" +#include "sshkey.h" #include "hostfile.h" #include "auth.h" #include "packet.h" @@ -47,6 +47,7 @@ #include "servconf.h" #include "compat.h" #include "ssh2.h" +#include "ssherr.h" #ifdef GSSAPI #include "ssh-gss.h" #endif @@ -61,10 +62,14 @@ static int none_enabled = 1; static int userauth_none(Authctxt *authctxt) { + struct ssh *ssh = active_state; /* XXX */ + int r; + none_enabled = 0; - packet_check_eom(); + if ((r = sshpkt_get_end(ssh)) != 0) + fatal("%s: %s", __func__, ssh_err(r)); if (options.permit_empty_passwd && options.password_authentication) - return (PRIVSEP(auth_password(authctxt, ""))); + return (PRIVSEP(auth_password(ssh->authctxt, ""))); return (0); } |