diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
| commit | 5962c0e9a3a89f39087a04044502f9b3a66676e6 (patch) | |
| tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/auth-passwd.c | |
| parent | 562de5d9f625969a0f9fa5a0d3b7f6ade9e46847 (diff) | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=128460
Diffstat (limited to 'crypto/openssh/auth-passwd.c')
| -rw-r--r-- | crypto/openssh/auth-passwd.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c index 70e1491368c5..38f610ab5a95 100644 --- a/crypto/openssh/auth-passwd.c +++ b/crypto/openssh/auth-passwd.c @@ -74,13 +74,6 @@ auth_password(Authctxt *authctxt, const char *password) if (*password == '\0' && options.permit_empty_passwd == 0) return 0; -#if defined(HAVE_OSF_SIA) - /* - * XXX: any reason this is before krb? could be moved to - * sys_auth_passwd()? -dt - */ - return auth_sia_password(authctxt, password) && ok; -#endif #ifdef KRB5 if (options.kerberos_authentication == 1) { int ret = auth_krb5_password(authctxt, password); |