From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 26 Jul 1996 03:44:13 +0000 (+0000)
Subject: SHADOW_TYPE is always defined so just against its value
X-Git-Tag: SUDO_1_5_0~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5da2ecd9e4fe1bc997999f5c750bab41b60fb1e;p=sudo

SHADOW_TYPE is always defined so just against its value
---

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