mirror of
git://anongit.mindrot.org/openssh.git
synced 2025-01-22 17:33:07 +00:00
- (djm) Cleanup after sync:
- :%s/reverse_mapping_check/verify_reverse_mapping/g
This commit is contained in:
parent
cb8ea157b8
commit
f3451a2181
@ -1,4 +1,6 @@
|
||||
20020205
|
||||
- (djm) Cleanup after sync:
|
||||
- :%s/reverse_mapping_check/verify_reverse_mapping/g
|
||||
- (djm) OpenBSD CVS Sync
|
||||
- stevesk@cvs.openbsd.org 2002/01/24 21:09:25
|
||||
[channels.c misc.c misc.h packet.c]
|
||||
@ -7501,4 +7503,4 @@
|
||||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1826 2002/02/05 01:27:58 djm Exp $
|
||||
$Id: ChangeLog,v 1.1827 2002/02/05 01:40:46 djm Exp $
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
extern char *__progname;
|
||||
|
||||
RCSID("$Id: auth-pam.c,v 1.41 2001/11/09 20:22:17 stevesk Exp $");
|
||||
RCSID("$Id: auth-pam.c,v 1.42 2002/02/05 01:40:47 djm Exp $");
|
||||
|
||||
#define NEW_AUTHTOK_MSG \
|
||||
"Warning: Your password has expired, please change it now"
|
||||
@ -360,7 +360,7 @@ void start_pam(const char *user)
|
||||
fatal("PAM initialisation failed[%d]: %.200s",
|
||||
pam_retval, PAM_STRERROR(__pamh, pam_retval));
|
||||
|
||||
rhost = get_remote_name_or_ip(utmp_len, options.reverse_mapping_check);
|
||||
rhost = get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping);
|
||||
debug("PAM setting rhost to \"%.200s\"", rhost);
|
||||
|
||||
pam_retval = pam_set_item(__pamh, PAM_RHOST, rhost);
|
||||
|
@ -29,7 +29,7 @@ auth_sia_password(char *user, char *pass)
|
||||
SIAENTITY *ent = NULL;
|
||||
const char *host;
|
||||
|
||||
host = get_canonical_hostname(options.reverse_mapping_check);
|
||||
host = get_canonical_hostname(options.verify_reverse_mapping);
|
||||
|
||||
if (!user || !pass)
|
||||
return(0);
|
||||
@ -58,7 +58,7 @@ session_setup_sia(char *user, char *tty)
|
||||
SIAENTITY *ent = NULL;
|
||||
const char *host;
|
||||
|
||||
host = get_canonical_hostname (options.reverse_mapping_check);
|
||||
host = get_canonical_hostname (options.verify_reverse_mapping);
|
||||
|
||||
if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0,
|
||||
NULL) != SIASUCCESS) {
|
||||
|
2
auth1.c
2
auth1.c
@ -339,7 +339,7 @@ do_authloop(Authctxt *authctxt)
|
||||
if (authctxt->failures++ > AUTH_FAIL_MAX) {
|
||||
#ifdef WITH_AIXAUTHENTICATE
|
||||
loginfailed(authctxt->user,
|
||||
get_canonical_hostname(options.reverse_mapping_check),
|
||||
get_canonical_hostname(options.verify_reverse_mapping),
|
||||
"ssh");
|
||||
#endif /* WITH_AIXAUTHENTICATE */
|
||||
packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
|
||||
|
2
auth2.c
2
auth2.c
@ -264,7 +264,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
|
||||
if (authctxt->failures++ > AUTH_FAIL_MAX) {
|
||||
#ifdef WITH_AIXAUTHENTICATE
|
||||
loginfailed(authctxt->user,
|
||||
get_canonical_hostname(options.reverse_mapping_check),
|
||||
get_canonical_hostname(options.verify_reverse_mapping),
|
||||
"ssh");
|
||||
#endif /* WITH_AIXAUTHENTICATE */
|
||||
packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
|
||||
|
@ -195,7 +195,7 @@ do_authenticated(Authctxt *authctxt)
|
||||
#ifdef WITH_AIXAUTHENTICATE
|
||||
/* We don't have a pty yet, so just label the line as "ssh" */
|
||||
if (loginsuccess(authctxt->user,
|
||||
get_canonical_hostname(options.reverse_mapping_check),
|
||||
get_canonical_hostname(options.verify_reverse_mapping),
|
||||
"ssh", &aixloginmsg) < 0)
|
||||
aixloginmsg = NULL;
|
||||
#endif /* WITH_AIXAUTHENTICATE */
|
||||
@ -656,7 +656,7 @@ do_pre_login(Session *s)
|
||||
}
|
||||
|
||||
record_utmp_only(pid, s->tty, s->pw->pw_name,
|
||||
get_remote_name_or_ip(utmp_len, options.reverse_mapping_check),
|
||||
get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping),
|
||||
(struct sockaddr *)&from);
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user