diff options
| author | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 16:18:26 +0000 |
| commit | 14172c52f89fa504003826ed2e4e2c0ac246505d (patch) | |
| tree | bc48bd740145eea64393ed391fc1d972c83f991c /crypto/openssh/auth-bsdauth.c | |
| parent | 456370e53073cd38d0ddc4001283f1c131d1428e (diff) | |
| parent | 64c731d52472fb486558425128009691392e0bef (diff) | |
| download | FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.zip FreeBSD-src-14172c52f89fa504003826ed2e4e2c0ac246505d.tar.gz | |
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed
upstream) and a number of security fixes which we had already backported.
MFC after: 1 week
Diffstat (limited to 'crypto/openssh/auth-bsdauth.c')
| -rw-r--r-- | crypto/openssh/auth-bsdauth.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssh/auth-bsdauth.c b/crypto/openssh/auth-bsdauth.c index 0b3262b..37ff893 100644 --- a/crypto/openssh/auth-bsdauth.c +++ b/crypto/openssh/auth-bsdauth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth-bsdauth.c,v 1.11 2007/09/21 08:15:29 djm Exp $ */ +/* $OpenBSD: auth-bsdauth.c,v 1.13 2014/06/24 01:13:21 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -26,6 +26,8 @@ #include "includes.h" #include <sys/types.h> +#include <stdarg.h> +#include <stdio.h> #include <stdarg.h> @@ -54,6 +56,11 @@ bsdauth_query(void *ctx, char **name, char **infotxt, Authctxt *authctxt = ctx; char *challenge = NULL; + *infotxt = NULL; + *numprompts = 0; + *prompts = NULL; + *echo_on = NULL; + if (authctxt->as != NULL) { debug2("bsdauth_query: try reuse session"); challenge = auth_getitem(authctxt->as, AUTHV_CHALLENGE); |
