- (djm) Cleanup after sync:
- :%s/reverse_mapping_check/verify_reverse_mapping/g
diff --git a/ChangeLog b/ChangeLog
index 25b3996..0fb2e84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/auth-pam.c b/auth-pam.c
index 0132e47..d97d981 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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 @@
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);
diff --git a/auth-sia.c b/auth-sia.c
index 4e947cd..8585f5d 100644
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -29,7 +29,7 @@
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 @@
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) {
diff --git a/auth1.c b/auth1.c
index bae00fb..cba3f7d 100644
--- a/auth1.c
+++ b/auth1.c
@@ -339,7 +339,7 @@
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);
diff --git a/auth2.c b/auth2.c
index 08f7191..22b5586 100644
--- a/auth2.c
+++ b/auth2.c
@@ -264,7 +264,7 @@
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);
diff --git a/session.c b/session.c
index c6e527f..9bc01a0 100644
--- a/session.c
+++ b/session.c
@@ -195,7 +195,7 @@
#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 @@
}
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