tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: add some debug output showing how many key file/command lines

Browse Source 
were processed. Useful to see whether a file or command actually has keys
present

OpenBSD-Commit-ID: 0bd9ff94e84e03a22df8e6c12f6074a95d27f23c
This commit is contained in:
djm@openbsd.org 2021-09-29 01:33:32 +00:00 committed by Damien Miller
parent 15abdd5235
commit ce4854e12e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
auth2-pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.109 2021/07/23 03:37:52 djm Exp $ */ /* $OpenBSD: auth2-pubkey.c,v 1.110 2021/09/29 01:33:32 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -376,7 +376,7 @@ process_principals(struct ssh *ssh, FILE *f, const char *file,
{ {
char loc[256], *line = NULL, *cp, *ep; char loc[256], *line = NULL, *cp, *ep;
size_t linesize = 0; size_t linesize = 0;
u_long linenum = 0; u_long linenum = 0, nonblank = 0;
u_int found_principal = 0; u_int found_principal = 0;
if (authoptsp != NULL) if (authoptsp != NULL)
@ -397,10 +397,12 @@ process_principals(struct ssh *ssh, FILE *f, const char *file,
if (!*cp || *cp == '\n') if (!*cp || *cp == '\n')
continue; continue;
nonblank++;
snprintf(loc, sizeof(loc), "%.200s:%lu", file, linenum); snprintf(loc, sizeof(loc), "%.200s:%lu", file, linenum);
if (check_principals_line(ssh, cp, cert, loc, authoptsp) == 0) if (check_principals_line(ssh, cp, cert, loc, authoptsp) == 0)
found_principal = 1; found_principal = 1;
} }
debug2_f("%s: processed %lu/%lu lines", file, nonblank, linenum);
free(line); free(line);
return found_principal; return found_principal;
} }
@ -719,7 +721,7 @@ check_authkeys_file(struct ssh *ssh, struct passwd *pw, FILE *f,
char *cp, *line = NULL, loc[256]; char *cp, *line = NULL, loc[256];
size_t linesize = 0; size_t linesize = 0;
int found_key = 0; int found_key = 0;
u_long linenum = 0; u_long linenum = 0, nonblank = 0;
if (authoptsp != NULL) if (authoptsp != NULL)
*authoptsp = NULL; *authoptsp = NULL;
@ -735,11 +737,14 @@ check_authkeys_file(struct ssh *ssh, struct passwd *pw, FILE *f,
skip_space(&cp); skip_space(&cp);
if (!*cp || *cp == '\n' || *cp == '#') if (!*cp || *cp == '\n' || *cp == '#')
continue; continue;
nonblank++;
snprintf(loc, sizeof(loc), "%.200s:%lu", file, linenum); snprintf(loc, sizeof(loc), "%.200s:%lu", file, linenum);
if (check_authkey_line(ssh, pw, key, cp, loc, authoptsp) == 0) if (check_authkey_line(ssh, pw, key, cp, loc, authoptsp) == 0)
found_key = 1; found_key = 1;
} }
free(line); free(line);
debug2_f("%s: processed %lu/%lu lines", file, nonblank, linenum);
return found_key; return found_key;
} }