From: Todd C. Miller Date: Sun, 11 Jul 1999 19:09:21 +0000 (+0000) Subject: don't use user_name macro, it will go away X-Git-Tag: SUDO_1_6_0~245 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61e798ffd0890547198107abe8375177cedefc4f;p=sudo don't use user_name macro, it will go away --- diff --git a/auth/afs.c b/auth/afs.c index 08f31b7ca..936aedb77 100644 --- a/auth/afs.c +++ b/auth/afs.c @@ -59,7 +59,7 @@ afs_verify(pw, pass, data) /* Try to just check the password */ ka_StringToKey(pass, NULL, &afs_key); - if (ka_GetAdminToken(user_name, /* name */ + if (ka_GetAdminToken(pw->pw_name, /* name */ NULL, /* instance */ NULL, /* realm */ &afs_key, /* key (contains password) */ @@ -71,7 +71,7 @@ afs_verify(pw, pass, data) /* Fall back on old method XXX - needed? */ setpag(); if (ka_UserAuthenticateGeneral(KA_USERAUTH_VERSION+KA_USERAUTH_DOSETPAG, - user_name, /* name */ + pw->pw_name, /* name */ NULL, /* instance */ NULL, /* realm */ pass, /* password */ diff --git a/auth/pam.c b/auth/pam.c index c269c3071..d87b020b3 100644 --- a/auth/pam.c +++ b/auth/pam.c @@ -66,7 +66,7 @@ pam_setup(pw, promptp, data) /* Initial PAM setup */ pam_conv.conv = sudo_conv; PAM_nullpw = 0; - if (pam_start("sudo", user_name, &pam_conv, &pamh) != PAM_SUCCESS) { + if (pam_start("sudo", pw->pw_name, &pam_conv, &pamh) != PAM_SUCCESS) { set_perms(PERM_USER, 0); log_error(BAD_AUTH_INIT); inform_user(BAD_AUTH_INIT);