From 9286fd701f1db3f6720d50cf3ec098e8d431723d Mon Sep 17 00:00:00 2001 From: Nick Sayer Date: Thu, 17 May 2001 16:28:11 +0000 Subject: [PATCH] Make the PAM user-override actually override the correect thing. --- contrib/telnet/libtelnet/sra.c | 6 +++--- 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 3f047995fc4..9c033c91112 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 3f047995fc4..9c033c91112 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;