openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-22 05:05:03 +00:00
Code Issues Projects Releases Wiki Activity

Move setting of user, service and style earlier since -portable needs to

Browse Source 
use these when setting up PAM.  Removes two diffs vs portable.
This commit is contained in:
dtucker
2026-02-08 00:16:34 +00:00
parent 302ec5d73b
commit 0a1a5efb05
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/ssh/auth2.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: auth2.c,v 1.171 2026/02/07 17:04:22 dtucker Exp $ */
/* $OpenBSD: auth2.c,v 1.172 2026/02/08 00:16:34 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -282,6 +282,9 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
if (authctxt->attempt++ == 0) {
/* setup auth context */
authctxt->pw = mm_getpwnamallow(ssh, user);
authctxt->user = xstrdup(user);
authctxt->service = xstrdup(service);
authctxt->style = style ? xstrdup(style) : NULL;
if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
authctxt->valid = 1;
debug2_f("setting up authctxt for %s", user);
@@ -293,9 +296,6 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
ssh_packet_set_log_preamble(ssh, "%suser %s",
authctxt->valid ? "authenticating " : "invalid ", user);
setproctitle("%s [net]", authctxt->valid ? user : "unknown");
authctxt->user = xstrdup(user);
authctxt->service = xstrdup(service);
authctxt->style = style ? xstrdup(style) : NULL;
mm_inform_authserv(service, style);
userauth_banner(ssh);
if ((r = kex_server_update_ext_info(ssh)) != 0)