[src/trunk]: src/crypto/external/bsd/openssh/dist fix compilation for non LDAP

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a043b4fc10c
branches:  trunk
changeset: 360984:0a043b4fc10c
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 08 13:39:42 2018 +0000

description:
fix compilation for non LDAP
remove error comment

diffstat:

 crypto/external/bsd/openssh/dist/auth2-pubkey.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 5861728ff8c9 -r 0a043b4fc10c crypto/external/bsd/openssh/dist/auth2-pubkey.c
--- a/crypto/external/bsd/openssh/dist/auth2-pubkey.c   Sun Apr 08 13:38:31 2018 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-pubkey.c   Sun Apr 08 13:39:42 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-pubkey.c,v 1.19 2018/04/06 18:58:59 christos Exp $       */
+/*     $NetBSD: auth2-pubkey.c,v 1.20 2018/04/08 13:39:42 christos Exp $       */
 /* $OpenBSD: auth2-pubkey.c,v 1.77 2018/03/03 03:15:51 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-pubkey.c,v 1.19 2018/04/06 18:58:59 christos Exp $");
+__RCSID("$NetBSD: auth2-pubkey.c,v 1.20 2018/04/08 13:39:42 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -692,9 +692,9 @@
        char *cp, line[SSH_MAX_PUBKEY_BYTES], loc[256];
        int found_key = 0;
        u_long linenum = 0;
-       struct sshkey *found = NULL;
        struct sshauthopt *opts = NULL;
 #ifdef WITH_LDAP_PUBKEY
+       struct sshkey *found = NULL;
        ldap_key_t * k;
        unsigned int i = 0;
        const char *reason;
@@ -780,7 +780,6 @@
                        continue;
 
                /* Skip leading whitespace, empty and comment lines. */
-/*###782 [cc] error: 'cp' undeclared (first use in this function)%%%*/
                cp = line;
                skip_space(&cp);
                if (!*cp || *cp == '\n' || *cp == '#')