diff options
| author | nsayer <nsayer@FreeBSD.org> | 2001-05-17 16:28:11 +0000 |
|---|---|---|
| committer | nsayer <nsayer@FreeBSD.org> | 2001-05-17 16:28:11 +0000 |
| commit | e25576d211ee35a2f7a955536089adaad947d9b1 (patch) | |
| tree | c8677e101c685968a1fc4ec55b70586127e7a567 | |
| parent | 8ed702383fb71581fa139a8a70b92984f6b9ba38 (diff) | |
| download | FreeBSD-src-e25576d211ee35a2f7a955536089adaad947d9b1.zip FreeBSD-src-e25576d211ee35a2f7a955536089adaad947d9b1.tar.gz | |
Make the PAM user-override actually override the correect thing.
| -rw-r--r-- | contrib/telnet/libtelnet/sra.c | 6 | ||||
| -rw-r--r-- | crypto/telnet/libtelnet/sra.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/telnet/libtelnet/sra.c b/contrib/telnet/libtelnet/sra.c index 3f04799..9c033c9 100644 --- a/contrib/telnet/libtelnet/sra.c +++ b/contrib/telnet/libtelnet/sra.c @@ -574,7 +574,7 @@ auth_conv(int num_msg, const struct pam_message **msg, } /* - * The PAM version as a side effect may put a new username in *user. + * The PAM version as a side effect may put a new username in *name. */ int check_user(const char *name, const char *pass) { @@ -623,11 +623,11 @@ int check_user(const char *name, const char *pass) */ if ((e = pam_get_item(pamh, PAM_USER, &item)) == PAM_SUCCESS) { - strcpy(user, (const char *) item); + strcpy(name, (const char *) item); } else syslog(LOG_ERR, "Couldn't get PAM_USER: %s", pam_strerror(pamh, e)); - if (isroot(user) && !rootterm(line)) + if (isroot(name) && !rootterm(line)) rval = 0; else rval = 1; diff --git a/crypto/telnet/libtelnet/sra.c b/crypto/telnet/libtelnet/sra.c index 3f04799..9c033c9 100644 --- a/crypto/telnet/libtelnet/sra.c +++ b/crypto/telnet/libtelnet/sra.c @@ -574,7 +574,7 @@ auth_conv(int num_msg, const struct pam_message **msg, } /* - * The PAM version as a side effect may put a new username in *user. + * The PAM version as a side effect may put a new username in *name. */ int check_user(const char *name, const char *pass) { @@ -623,11 +623,11 @@ int check_user(const char *name, const char *pass) */ if ((e = pam_get_item(pamh, PAM_USER, &item)) == PAM_SUCCESS) { - strcpy(user, (const char *) item); + strcpy(name, (const char *) item); } else syslog(LOG_ERR, "Couldn't get PAM_USER: %s", pam_strerror(pamh, e)); - if (isroot(user) && !rootterm(line)) + if (isroot(name) && !rootterm(line)) rval = 0; else rval = 1; |
