- (stevesk) pam_start() doesn't use DNS now for sshd -u0.

This commit is contained in:
Kevin Steves 2001-04-23 17:28:28 +00:00
parent c65e6a0fec
commit 5f3b9b9091
2 changed files with 9 additions and 6 deletions

View File

@ -3,6 +3,7 @@
- markus@cvs.openbsd.org 2001/04/22 23:58:36 - markus@cvs.openbsd.org 2001/04/22 23:58:36
[ssh-keygen.1 ssh.1 sshd.8] [ssh-keygen.1 ssh.1 sshd.8]
document hostbased and other cleanup document hostbased and other cleanup
- (stevesk) pam_start() doesn't use DNS now for sshd -u0.
20010422 20010422
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5231,4 +5232,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1160 2001/04/23 13:02:16 mouring Exp $ $Id: ChangeLog,v 1.1161 2001/04/23 17:28:28 stevesk Exp $

View File

@ -35,7 +35,7 @@
extern char *__progname; extern char *__progname;
RCSID("$Id: auth-pam.c,v 1.35 2001/04/20 17:43:47 stevesk Exp $"); RCSID("$Id: auth-pam.c,v 1.36 2001/04/23 17:28:29 stevesk Exp $");
#define NEW_AUTHTOK_MSG \ #define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now" "Warning: Your password has expired, please change it now"
@ -348,6 +348,8 @@ void start_pam(const char *user)
{ {
int pam_retval; int pam_retval;
extern ServerOptions options; extern ServerOptions options;
extern u_int utmp_len;
const char *rhost;
debug("Starting up PAM with username \"%.200s\"", user); debug("Starting up PAM with username \"%.200s\"", user);
@ -357,10 +359,10 @@ void start_pam(const char *user)
fatal("PAM initialisation failed[%d]: %.200s", fatal("PAM initialisation failed[%d]: %.200s",
pam_retval, PAM_STRERROR(__pamh, pam_retval)); pam_retval, PAM_STRERROR(__pamh, pam_retval));
debug("PAM setting rhost to \"%.200s\"", rhost = get_remote_name_or_ip(utmp_len, options.reverse_mapping_check);
get_canonical_hostname(options.reverse_mapping_check)); debug("PAM setting rhost to \"%.200s\"", rhost);
pam_retval = pam_set_item(__pamh, PAM_RHOST,
get_canonical_hostname(options.reverse_mapping_check)); pam_retval = pam_set_item(__pamh, PAM_RHOST, rhost);
if (pam_retval != PAM_SUCCESS) if (pam_retval != PAM_SUCCESS)
fatal("PAM set rhost failed[%d]: %.200s", pam_retval, fatal("PAM set rhost failed[%d]: %.200s", pam_retval,
PAM_STRERROR(__pamh, pam_retval)); PAM_STRERROR(__pamh, pam_retval));