diff options
| author | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
| commit | 6534271ec8abc00a8016a575a8e7151d944ef5a8 (patch) | |
| tree | a7d90beaf7fa4922f64c5a6eca7154fa082e43a1 /crypto/openssh/auth-pam.c | |
| parent | d3e3318ac7d7a176fefa5849509c01442694b4c7 (diff) | |
| download | FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.zip FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.tar.gz | |
Fix conflicts.
Diffstat (limited to 'crypto/openssh/auth-pam.c')
| -rw-r--r-- | crypto/openssh/auth-pam.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c index 16d5ac7..03a464d 100644 --- a/crypto/openssh/auth-pam.c +++ b/crypto/openssh/auth-pam.c @@ -223,9 +223,9 @@ int do_pam_account(char *username, char *remote_user) do_pam_set_conv(&conv); debug("PAM setting rhost to \"%.200s\"", - get_canonical_hostname(options.reverse_mapping_check)); + get_canonical_hostname(options.verify_reverse_mapping)); pam_retval = pam_set_item(pamh, PAM_RHOST, - get_canonical_hostname(options.reverse_mapping_check)); + get_canonical_hostname(options.verify_reverse_mapping)); if (pam_retval != PAM_SUCCESS) { fatal("PAM set rhost failed[%d]: %.200s", pam_retval, PAM_STRERROR(pamh, pam_retval)); |
