Imported Upstream version 1.6.9p16

[debian/sudo] / sudo.c

diff --git a/sudo.c b/sudo.c
index 0e7f6c7efb0401abb7d667bc24279a223880ba0d..aec3acf6bc6f2d74b48fe96d8f29077fae528bc3 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -105,7 +105,7 @@
 #include "version.h"
 
 #ifndef lint
-__unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.38 2008/03/05 19:34:49 millert Exp $";
+__unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.39 2008/04/10 17:56:05 millert Exp $";
 #endif /* lint */
 
 /*
@@ -280,7 +280,7 @@ main(argc, argv, envp)
 
        /* Local sudoers file overrides LDAP if we have a match. */
        v = sudoers_lookup(pwflag);
-       if (ISSET(v, VALIDATE_OK))
+       if (validated == VALIDATE_ERROR || ISSET(v, VALIDATE_OK))
            validated = v;
     }
 #else