don't use user_name macro, it will go away

diff --git a/auth/afs.c b/auth/afs.c
index 08f31b7cae697ad0743746d20a3bc1efffaf83c1..936aedb7797595d20c84a60cf57a9d2a701b2b83 100644 (file)
--- 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 c269c3071e6da61e037075d24eac64fdf8473d5f..d87b020b39f9d1524b47b81eaf18494939857fc3 100644 (file)
--- 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);