RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Add server debugging for hostbased auth. 

auth_debug_add queues messages about the auth process which is sent to
the client after successful authentication.  This also sends those to
the server debug log to aid in debugging.  From bz#3507, ok djm@

OpenBSD-Commit-ID: 46ff67518cccf9caf47e06393e2a121ee5aa258a
This commit is contained in:
dtucker@openbsd.org 2022-12-09 00:17:40 +00:00 committed by Darren Tucker
parent b85c3581c1
commit a6183e25e3
No known key found for this signature in database
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth-rhosts.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth-rhosts.c,v 1.56 2022/02/23 21:21:49 djm Exp $ */ /* $OpenBSD: auth-rhosts.c,v 1.57 2022/12/09 00:17:40 dtucker Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -19,6 +19,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_NETGROUP_H #ifdef HAVE_NETGROUP_H
# include <netgroup.h> # include <netgroup.h>
@ -283,6 +284,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
xasprintf(&path, "%s/%s", xasprintf(&path, "%s/%s",
pw->pw_dir, rhosts_files[rhosts_file_index]); pw->pw_dir, rhosts_files[rhosts_file_index]);
if (stat(path, &st) == -1) { if (stat(path, &st) == -1) {
debug3_f("stat %s: %s", path, strerror(errno));
free(path); free(path);
continue; continue;
} }

11
auth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth.c,v 1.158 2022/06/03 04:47:21 djm Exp $ */ /* $OpenBSD: auth.c,v 1.159 2022/12/09 00:17:40 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -571,14 +571,13 @@ auth_debug_add(const char *fmt,...)
va_list args; va_list args;
int r; int r;
if (auth_debug == NULL)
return;
va_start(args, fmt); va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args); vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args); va_end(args);
if ((r = sshbuf_put_cstring(auth_debug, buf)) != 0) debug3("%s", buf);
fatal_fr(r, "sshbuf_put_cstring"); if (auth_debug != NULL)
if ((r = sshbuf_put_cstring(auth_debug, buf)) != 0)
fatal_fr(r, "sshbuf_put_cstring");
} }
void void