diff options
| author | Damien Miller <djm@mindrot.org> | 1999-12-28 15:09:35 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-12-28 15:09:35 +1100 |
| commit | beb4ba5a68dbfa478bcc375cc885a047a8301c0d (patch) | |
| tree | f612c8142e3891e40e68797c00a339a8efde0a40 /auth-passwd.c | |
| parent | 4ff2b9bf429f40cb4d8119108cd7c4aa76c081ee (diff) | |
| download | openssh-git-beb4ba5a68dbfa478bcc375cc885a047a8301c0d.tar.gz | |
- Portability fixes for Irix 5.3 (now compiles OK!)
- autoconf and other misc cleanups
Diffstat (limited to 'auth-passwd.c')
| -rw-r--r-- | auth-passwd.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index 058dde82..0311a493 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -9,9 +9,9 @@ #include "includes.h" -#ifndef HAVE_LIBPAM +#ifndef USE_PAM -RCSID("$Id: auth-passwd.c,v 1.11 1999/12/24 23:11:29 damien Exp $"); +RCSID("$Id: auth-passwd.c,v 1.12 1999/12/28 04:09:36 damien Exp $"); #include "packet.h" #include "ssh.h" @@ -19,12 +19,14 @@ RCSID("$Id: auth-passwd.c,v 1.11 1999/12/24 23:11:29 damien Exp $"); #include "xmalloc.h" #ifdef HAVE_SHADOW_H -#include <shadow.h> -#endif - -#ifdef HAVE_MD5_PASSWORDS -#include "md5crypt.h" +# include <shadow.h> #endif +#if defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD) +# include <crypt.h> +#endif /* defined(HAVE_CRYPT_H) && !defined(CRYPT_H_BREAKS_BUILD) */ +#if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) +# include "md5crypt.h" +#endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */ /* * Tries to authenticate the user using password. Returns true if @@ -101,4 +103,4 @@ auth_password(struct passwd * pw, const char *password) /* Authentication is accepted if the encrypted passwords are identical. */ return (strcmp(encrypted_password, pw_password) == 0); } -#endif /* !HAVE_LIBPAM */ +#endif /* !USE_PAM */ |