diff options
| author | Damien Miller <djm@mindrot.org> | 2001-02-18 17:01:00 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-02-18 17:01:00 +1100 |
| commit | 60396b060b803fd2d20aa151dc0432a344f798b0 (patch) | |
| tree | 6027eced4465cbb8ab7146ba6cd3f9a89c38bd03 /auth-passwd.c | |
| parent | 75da9a9e721bf0f73aab8a28505a62224c327d18 (diff) | |
| download | openssh-git-60396b060b803fd2d20aa151dc0432a344f798b0.tar.gz | |
- (djm) Merge BSD_AUTH support from Markus Friedl and David J. MacKenzie
enable with --with-bsd-auth.
Diffstat (limited to 'auth-passwd.c')
| -rw-r--r-- | auth-passwd.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index c849abdc..5a91e558 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -77,14 +77,17 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.21 2001/02/12 16:16:23 markus Exp $"); #define is_winnt (GetVersion() < 0x80000000) #endif + +extern ServerOptions options; + /* * Tries to authenticate the user using password. Returns true if * authentication succeeds. */ int -auth_password(struct passwd * pw, const char *password) +auth_password(Authctxt *authctxt, const char *password) { - extern ServerOptions options; + struct passwd * pw = authctxt->pw; char *encrypted_password; char *pw_password; char *salt; @@ -122,6 +125,13 @@ auth_password(struct passwd * pw, const char *password) #endif if (*password == '\0' && options.permit_empty_passwd == 0) return 0; +#ifdef BSD_AUTH + if (auth_userokay(pw->pw_name, authctxt->style, "auth-ssh", + (char *)password) == 0) + return 0; + else + return 1; +#endif #ifdef HAVE_CYGWIN if (is_winnt) { |