diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-pam.c | 4 | ||||
-rw-r--r-- | auth-sia.c | 4 | ||||
-rw-r--r-- | auth1.c | 2 | ||||
-rw-r--r-- | auth2.c | 2 | ||||
-rw-r--r-- | session.c | 4 |
6 files changed, 11 insertions, 9 deletions
@@ -1,4 +1,6 @@ | |||
1 | 20020205 | 1 | 20020205 |
2 | - (djm) Cleanup after sync: | ||
3 | - :%s/reverse_mapping_check/verify_reverse_mapping/g | ||
2 | - (djm) OpenBSD CVS Sync | 4 | - (djm) OpenBSD CVS Sync |
3 | - stevesk@cvs.openbsd.org 2002/01/24 21:09:25 | 5 | - stevesk@cvs.openbsd.org 2002/01/24 21:09:25 |
4 | [channels.c misc.c misc.h packet.c] | 6 | [channels.c misc.c misc.h packet.c] |
@@ -7501,4 +7503,4 @@ | |||
7501 | - Wrote replacements for strlcpy and mkdtemp | 7503 | - Wrote replacements for strlcpy and mkdtemp |
7502 | - Released 1.0pre1 | 7504 | - Released 1.0pre1 |
7503 | 7505 | ||
7504 | $Id: ChangeLog,v 1.1826 2002/02/05 01:27:58 djm Exp $ | 7506 | $Id: ChangeLog,v 1.1827 2002/02/05 01:40:46 djm Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 0132e47bd..d97d981c4 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | extern char *__progname; | 36 | extern char *__progname; |
37 | 37 | ||
38 | RCSID("$Id: auth-pam.c,v 1.41 2001/11/09 20:22:17 stevesk Exp $"); | 38 | RCSID("$Id: auth-pam.c,v 1.42 2002/02/05 01:40:47 djm Exp $"); |
39 | 39 | ||
40 | #define NEW_AUTHTOK_MSG \ | 40 | #define NEW_AUTHTOK_MSG \ |
41 | "Warning: Your password has expired, please change it now" | 41 | "Warning: Your password has expired, please change it now" |
@@ -360,7 +360,7 @@ void start_pam(const char *user) | |||
360 | fatal("PAM initialisation failed[%d]: %.200s", | 360 | fatal("PAM initialisation failed[%d]: %.200s", |
361 | pam_retval, PAM_STRERROR(__pamh, pam_retval)); | 361 | pam_retval, PAM_STRERROR(__pamh, pam_retval)); |
362 | 362 | ||
363 | rhost = get_remote_name_or_ip(utmp_len, options.reverse_mapping_check); | 363 | rhost = get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping); |
364 | debug("PAM setting rhost to \"%.200s\"", rhost); | 364 | debug("PAM setting rhost to \"%.200s\"", rhost); |
365 | 365 | ||
366 | pam_retval = pam_set_item(__pamh, PAM_RHOST, rhost); | 366 | pam_retval = pam_set_item(__pamh, PAM_RHOST, rhost); |
diff --git a/auth-sia.c b/auth-sia.c index 4e947cd4e..8585f5d6b 100644 --- a/auth-sia.c +++ b/auth-sia.c | |||
@@ -29,7 +29,7 @@ auth_sia_password(char *user, char *pass) | |||
29 | SIAENTITY *ent = NULL; | 29 | SIAENTITY *ent = NULL; |
30 | const char *host; | 30 | const char *host; |
31 | 31 | ||
32 | host = get_canonical_hostname(options.reverse_mapping_check); | 32 | host = get_canonical_hostname(options.verify_reverse_mapping); |
33 | 33 | ||
34 | if (!user || !pass) | 34 | if (!user || !pass) |
35 | return(0); | 35 | return(0); |
@@ -58,7 +58,7 @@ session_setup_sia(char *user, char *tty) | |||
58 | SIAENTITY *ent = NULL; | 58 | SIAENTITY *ent = NULL; |
59 | const char *host; | 59 | const char *host; |
60 | 60 | ||
61 | host = get_canonical_hostname (options.reverse_mapping_check); | 61 | host = get_canonical_hostname (options.verify_reverse_mapping); |
62 | 62 | ||
63 | if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0, | 63 | if (sia_ses_init(&ent, saved_argc, saved_argv, host, user, tty, 0, |
64 | NULL) != SIASUCCESS) { | 64 | NULL) != SIASUCCESS) { |
@@ -339,7 +339,7 @@ do_authloop(Authctxt *authctxt) | |||
339 | if (authctxt->failures++ > AUTH_FAIL_MAX) { | 339 | if (authctxt->failures++ > AUTH_FAIL_MAX) { |
340 | #ifdef WITH_AIXAUTHENTICATE | 340 | #ifdef WITH_AIXAUTHENTICATE |
341 | loginfailed(authctxt->user, | 341 | loginfailed(authctxt->user, |
342 | get_canonical_hostname(options.reverse_mapping_check), | 342 | get_canonical_hostname(options.verify_reverse_mapping), |
343 | "ssh"); | 343 | "ssh"); |
344 | #endif /* WITH_AIXAUTHENTICATE */ | 344 | #endif /* WITH_AIXAUTHENTICATE */ |
345 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 345 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
@@ -264,7 +264,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) | |||
264 | if (authctxt->failures++ > AUTH_FAIL_MAX) { | 264 | if (authctxt->failures++ > AUTH_FAIL_MAX) { |
265 | #ifdef WITH_AIXAUTHENTICATE | 265 | #ifdef WITH_AIXAUTHENTICATE |
266 | loginfailed(authctxt->user, | 266 | loginfailed(authctxt->user, |
267 | get_canonical_hostname(options.reverse_mapping_check), | 267 | get_canonical_hostname(options.verify_reverse_mapping), |
268 | "ssh"); | 268 | "ssh"); |
269 | #endif /* WITH_AIXAUTHENTICATE */ | 269 | #endif /* WITH_AIXAUTHENTICATE */ |
270 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); | 270 | packet_disconnect(AUTH_FAIL_MSG, authctxt->user); |
@@ -195,7 +195,7 @@ do_authenticated(Authctxt *authctxt) | |||
195 | #ifdef WITH_AIXAUTHENTICATE | 195 | #ifdef WITH_AIXAUTHENTICATE |
196 | /* We don't have a pty yet, so just label the line as "ssh" */ | 196 | /* We don't have a pty yet, so just label the line as "ssh" */ |
197 | if (loginsuccess(authctxt->user, | 197 | if (loginsuccess(authctxt->user, |
198 | get_canonical_hostname(options.reverse_mapping_check), | 198 | get_canonical_hostname(options.verify_reverse_mapping), |
199 | "ssh", &aixloginmsg) < 0) | 199 | "ssh", &aixloginmsg) < 0) |
200 | aixloginmsg = NULL; | 200 | aixloginmsg = NULL; |
201 | #endif /* WITH_AIXAUTHENTICATE */ | 201 | #endif /* WITH_AIXAUTHENTICATE */ |
@@ -656,7 +656,7 @@ do_pre_login(Session *s) | |||
656 | } | 656 | } |
657 | 657 | ||
658 | record_utmp_only(pid, s->tty, s->pw->pw_name, | 658 | record_utmp_only(pid, s->tty, s->pw->pw_name, |
659 | get_remote_name_or_ip(utmp_len, options.reverse_mapping_check), | 659 | get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), |
660 | (struct sockaddr *)&from); | 660 | (struct sockaddr *)&from); |
661 | } | 661 | } |
662 | #endif | 662 | #endif |