- (stevesk) [auth2.c] merge cleanup/sync

This commit is contained in:
Kevin Steves 2002-03-22 20:43:05 +00:00
parent 1adb120779
commit 205cc1ef46
2 changed files with 5 additions and 6 deletions

View File

@ -4,6 +4,7 @@
- (stevesk) configure and cpp __FUNCTION__ gymnastics to handle nielsisms - (stevesk) configure and cpp __FUNCTION__ gymnastics to handle nielsisms
- (stevesk) [monitor_fdpass.c] support for access rights style file - (stevesk) [monitor_fdpass.c] support for access rights style file
descriptor passing descriptor passing
- (stevesk) [auth2.c] merge cleanup/sync
20020321 20020321
- (bal) OpenBSD CVS Sync - (bal) OpenBSD CVS Sync
@ -7998,4 +7999,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1970 2002/03/22 19:32:53 stevesk Exp $ $Id: ChangeLog,v 1.1971 2002/03/22 20:43:05 stevesk Exp $

View File

@ -184,14 +184,12 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
if (authctxt->attempt++ == 0) { if (authctxt->attempt++ == 0) {
/* setup auth context */ /* setup auth context */
struct passwd *pw = NULL; authctxt->pw = PRIVSEP(getpwnamallow(user));
pw = PRIVSEP(getpwnamallow(user)); if (authctxt->pw && strcmp(service, "ssh-connection")==0) {
if (pw && strcmp(service, "ssh-connection")==0) {
authctxt->pw = pwcopy(pw);
authctxt->valid = 1; authctxt->valid = 1;
debug2("input_userauth_request: setting up authctxt for %s", user); debug2("input_userauth_request: setting up authctxt for %s", user);
#ifdef USE_PAM #ifdef USE_PAM
start_pam(pw->pw_name); start_pam(authctxt->pw->pw_name);
#endif #endif
} else { } else {
log("input_userauth_request: illegal user %s", user); log("input_userauth_request: illegal user %s", user);