tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-04-08 18:35:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: simplify sshsig_find_principals() similar to what happened to

Browse Source 
sshsig_check_allowed_keys() in r1.31, removing some dead code

OpenBSD-Commit-ID: a493e628d4d6c08f878c276d998f4313ba61702d
This commit is contained in:
djm@openbsd.org 2023-04-06 03:56:02 +00:00 committed by Damien Miller
parent 3a7b110fbc
commit 484c5e6168
No known key found for this signature in database
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sshsig.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshsig.c,v 1.31 2023/03/30 03:05:01 djm Exp $ */
/* $OpenBSD: sshsig.c,v 1.32 2023/04/06 03:56:02 djm Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@ -1018,7 +1018,7 @@ sshsig_find_principals(const char *path, const struct sshkey *sign_key,
char *line = NULL;
size_t linesize = 0;
u_long linenum = 0;
int r = SSH_ERR_INTERNAL_ERROR, oerrno;
int r = SSH_ERR_KEY_NOT_FOUND, oerrno;
if ((f = fopen(path, "r")) == NULL) {
oerrno = errno;
@ -1028,7 +1028,6 @@ sshsig_find_principals(const char *path, const struct sshkey *sign_key,
return SSH_ERR_SYSTEM_ERROR;
}
r = SSH_ERR_KEY_NOT_FOUND;
while (getline(&line, &linesize, f) != -1) {
linenum++;
r = check_allowed_keys_line(path, linenum, line,
@ -1056,7 +1055,7 @@ sshsig_find_principals(const char *path, const struct sshkey *sign_key,
return SSH_ERR_SYSTEM_ERROR;
}
fclose(f);
return r == 0 ? SSH_ERR_KEY_NOT_FOUND : r;
return r;
}
int