Module Name: src
Committed By: christos
Date: Sun Apr 8 13:39:42 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: auth2-pubkey.c
Log Message:
fix compilation for non LDAP
remove error comment
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/crypto/external/bsd/openssh/dist/auth2-pubkey.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/auth2-pubkey.c
diff -u src/crypto/external/bsd/openssh/dist/auth2-pubkey.c:1.19 src/crypto/external/bsd/openssh/dist/auth2-pubkey.c:1.20
--- src/crypto/external/bsd/openssh/dist/auth2-pubkey.c:1.19 Fri Apr 6 14:58:59 2018
+++ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c Sun Apr 8 09:39:42 2018
@@ -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 @@ check_authkeys_file(struct ssh *ssh, str
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 @@ check_authkeys_file(struct ssh *ssh, str
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 == '#')
