mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 15:25:58 +00:00
Code Issues Releases Wiki Activity

SHADOW_TYPE is always defined so just against its value

Browse Source
This commit is contained in:
Todd C. Miller
1996-07-26 03:44:13 +00:00
parent f13ef276c5
commit f5da2ecd9e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
check.c
View File

@@ -66,14 +66,14 @@ static char rcsid[] = "$Id$";
#include "sudo.h" #include "sudo.h"
#include <options.h> #include <options.h>
#include "insults.h" #include "insults.h"
#if defined(SHADOW_TYPE) && (SHADOW_TYPE == SPW_SECUREWARE) #if (SHADOW_TYPE == SPW_SECUREWARE)
# ifdef __hpux # ifdef __hpux
# include <hpsecurity.h> # include <hpsecurity.h>
# else # else
# include <sys/security.h> # include <sys/security.h>
# endif /* __hpux */ # endif /* __hpux */
# include <prot.h> # include <prot.h>
#endif /* SHADOW_TYPE == SPW_SECUREWARE */ #endif /* SPW_SECUREWARE */
#ifdef HAVE_KERB4 #ifdef HAVE_KERB4
# include <krb.h> # include <krb.h>
#endif /* HAVE_KERB4 */ #endif /* HAVE_KERB4 */
@@ -505,7 +505,7 @@ static void check_passwd()
* If we use shadow passwords with a different crypt(3) * If we use shadow passwords with a different crypt(3)
* check that here, else use standard crypt(3). * check that here, else use standard crypt(3).
*/ */
# ifdef SHADOW_TYPE # if (SHADOW_TYPE != SPW_NONE) && (SHADOW_TYPE != SPW_BSD)
# if (SHADOW_TYPE == SPW_ULTRIX4) # if (SHADOW_TYPE == SPW_ULTRIX4)
if (!strcmp(user_passwd, (char *) crypt16(pass, user_passwd))) if (!strcmp(user_passwd, (char *) crypt16(pass, user_passwd)))
return; /* if the passwd is correct return() */ return; /* if the passwd is correct return() */
@@ -536,7 +536,7 @@ static void check_passwd()
exit(1); exit(1);
} }
# endif /* SECUREWARE && __alpha */ # endif /* SECUREWARE && __alpha */
# endif /* SHADOW_TYPE */ # endif /* SHADOW_TYPE != SPW_NONE && SHADOW_TYPE != SPW_BSD */
/* Normal UN*X password check */ /* Normal UN*X password check */
if (!strcmp(user_passwd, (char *) crypt(pass, user_passwd))) if (!strcmp(user_passwd, (char *) crypt(pass, user_passwd)))