Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation for non LDAP

Browse Source 
remove error comment
This commit is contained in:
christos 2018-04-08 13:39:42 +00:00
parent 03f0eed079
commit ff7da8bd8e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/external/bsd/openssh/dist/auth2-pubkey.c vendored
View File

@ -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, struct passwd *pw, FILE *f,
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, struct passwd *pw, FILE *f,
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 == '#')