isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed SKey support

Browse Source
This commit is contained in:
Todd C. Miller
1995-11-19 23:23:46 +00:00
parent 402ce291c6
commit 53ae703b75
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
check.c
View File

@@ -473,8 +473,7 @@ static void check_passwd()
# endif /* SECUREWARE */ # endif /* SECUREWARE */
#endif /* SHADOW_TYPE */ #endif /* SHADOW_TYPE */
#ifdef HAVE_SKEY #ifdef HAVE_SKEY
int pw_ok = 1; struct passwd *pw_ent;
struct passwd *pw_ent = getpwuid(uid);
#endif /* HAVE_SKEY */ #endif /* HAVE_SKEY */
char *encrypted=epasswd; /* this comes from /etc/passwd */ char *encrypted=epasswd; /* this comes from /etc/passwd */
#if defined(HAVE_KERB4) && defined(USE_GETPASS) #if defined(HAVE_KERB4) && defined(USE_GETPASS)
@@ -543,9 +542,14 @@ static void check_passwd()
/* /*
* you get TRIES_FOR_PASSWORD times to guess your password * you get TRIES_FOR_PASSWORD times to guess your password
*/ */
#ifdef HAVE_SKEY
pw_ent = getpwuid(uid);
#endif /* HAVE_SKEY */
while (counter > 0) { while (counter > 0) {
#ifdef HAVE_SKEY #ifdef HAVE_SKEY
pass = skey_getpass(prompt, pw_ent, pw_ok); set_perms(PERM_ROOT);
pass = skey_getpass(prompt, pw_ent, 1);
set_perms(PERM_USER);
#else #else
# ifdef USE_GETPASS # ifdef USE_GETPASS
# ifdef HAVE_KERB4 # ifdef HAVE_KERB4
@@ -581,9 +585,13 @@ static void check_passwd()
#endif /* SHADOW_TYPE */ #endif /* SHADOW_TYPE */
#ifdef HAVE_SKEY #ifdef HAVE_SKEY
set_perms(PERM_ROOT);
if (!strcmp(pw_ent->pw_passwd, skey_crypt(pass, pw_ent->pw_passwd, if (!strcmp(pw_ent->pw_passwd, skey_crypt(pass, pw_ent->pw_passwd,
pw_ent, pw_ok))) pw_ent, 0))) {
set_perms(PERM_USER);
return; /* if the passwd is correct return() */ return; /* if the passwd is correct return() */
}
set_perms(PERM_USER);
#else #else
if (!strcmp(encrypted, (char *) crypt(pass, encrypted))) if (!strcmp(encrypted, (char *) crypt(pass, encrypted)))
return; /* if the passwd is correct return() */ return; /* if the passwd is correct return() */