diff options
| author | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-09-30 13:38:06 +0000 |
| commit | 4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a (patch) | |
| tree | e8ca9ffe5bcb164be41a74f30a765b86bb38c885 /crypto/openssh/auth2.c | |
| parent | 1a954502d4f34f44a7b1d861ea2dadc117ca6a64 (diff) | |
| download | FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.zip FreeBSD-src-4ff234ef46a16b6174dfb970b7bbc9fe2baf3e1a.tar.gz | |
Merge conflicts.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/auth2.c')
| -rw-r--r-- | crypto/openssh/auth2.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/crypto/openssh/auth2.c b/crypto/openssh/auth2.c index b37eb38..8261e35 100644 --- a/crypto/openssh/auth2.c +++ b/crypto/openssh/auth2.c @@ -1,3 +1,4 @@ +/* $OpenBSD: auth2.c,v 1.113 2006/08/03 03:34:41 deraadt Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -23,25 +24,33 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $"); -RCSID("$FreeBSD$"); +__RCSID("$FreeBSD$"); + +#include <sys/types.h> + +#include <pwd.h> +#include <stdarg.h> +#include <string.h> -#include "canohost.h" -#include "ssh2.h" #include "xmalloc.h" +#include "ssh2.h" #include "packet.h" #include "log.h" +#include "buffer.h" #include "servconf.h" #include "compat.h" +#include "key.h" +#include "hostfile.h" #include "auth.h" #include "dispatch.h" #include "pathnames.h" -#include "monitor_wrap.h" #include "buffer.h" +#include "canohost.h" #ifdef GSSAPI #include "ssh-gss.h" #endif +#include "monitor_wrap.h" /* import */ extern ServerOptions options; @@ -98,6 +107,7 @@ do_authentication2(Authctxt *authctxt) dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); } +/*ARGSUSED*/ static void input_service_request(int type, u_int32_t seq, void *ctxt) { @@ -131,6 +141,7 @@ input_service_request(int type, u_int32_t seq, void *ctxt) xfree(service); } +/*ARGSUSED*/ static void input_userauth_request(int type, u_int32_t seq, void *ctxt) { |
