summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorkre <kre@NetBSD.org>2019-04-21 01:32:04 +0000
committerkre <kre@NetBSD.org>2019-04-21 01:32:04 +0000
commit8432a11dcc0e00b4a99c56afeed80cd1555aa266 (patch)
tree5057f560a375021c6883183ba5592acf2ad76a17 /crypto
parent5d94902884ea9f9c74151bac7b5977a13431a0c8 (diff)
Put declaration of 'userauth_kerberos' inside #if KRB5 where it belongs.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssh/dist/sshconnect2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/external/bsd/openssh/dist/sshconnect2.c b/crypto/external/bsd/openssh/dist/sshconnect2.c
index 63c2e4134f9..b47d409e5e9 100644
--- a/crypto/external/bsd/openssh/dist/sshconnect2.c
+++ b/crypto/external/bsd/openssh/dist/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sshconnect2.c,v 1.33 2019/04/20 17:16:40 christos Exp $ */
+/* $NetBSD: sshconnect2.c,v 1.34 2019/04/21 01:32:04 kre Exp $ */
/* $OpenBSD: sshconnect2.c,v 1.303 2019/02/12 23:53:10 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshconnect2.c,v 1.33 2019/04/20 17:16:40 christos Exp $");
+__RCSID("$NetBSD: sshconnect2.c,v 1.34 2019/04/21 01:32:04 kre Exp $");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
@@ -79,7 +79,9 @@ const char *auth_get_canonical_hostname(struct ssh *, int);
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
+#ifdef KRB5
static int userauth_kerberos(struct ssh *);
+#endif
/* import */
extern char *client_version_string;