Module Name: src
Committed By: kre
Date: Sun Apr 21 01:32:04 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: sshconnect2.c
Log Message:
Put declaration of 'userauth_kerberos' inside #if KRB5 where it belongs.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/sshconnect2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.33 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.34
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.33 Sat Apr 20 17:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c Sun Apr 21 01:32:04 2019
@@ -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_hostn
#ifdef GSSAPI
#include "ssh-gss.h"
#endif
+#ifdef KRB5
static int userauth_kerberos(struct ssh *);
+#endif
/* import */
extern char *client_version_string;
