- (djm) Cleanup after sync:

   - :%s/reverse_mapping_check/verify_reverse_mapping/g

diff --git a/ChangeLog b/ChangeLog
index f30c252ba7f7ec1d5085fe37394483eceba575a7..1e165060e41a793225d8384839dd085113fc6d91 100644 (file)
--- 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]

diff --git a/auth-pam.c b/auth-pam.c
index 801c9eb64b4c8d6c9e0dbc9bdccb59da77146085..687c95ccd0cbfea5e484159e9829e1046adf46fb 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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);

diff --git a/auth-sia.c b/auth-sia.c
index 4e947cd4ed1dc428c0afcea00bbe5f4876ecb7e6..8585f5d6b6fb4ba541eda0a9d0f4d7a24326ea78 100644 (file)
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -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) {

diff --git a/auth1.c b/auth1.c
index bae00fb53dd74e3421711e28c50e4d7921d6254e..cba3f7d613b1672b5bbf246e3378b5421293ce8e 100644 (file)
--- a/auth1.c
+++ b/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);

diff --git a/auth2.c b/auth2.c
index 08f7191862fd38f9cfa6c400d5b843aa47cef9d5..22b5586967d561dbb5305a13969ca837d3b288d3 100644 (file)
--- a/auth2.c
+++ b/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);

diff --git a/session.c b/session.c
index c6e527ffdb9d9cbf5469e9c54e41b7baf5becf62..9bc01a06fcd6f38f6089929d1a595ecbc6bf0e11 100644 (file)
--- a/session.c
+++ b/session.c
@@ -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