diff options
| author | tim <tim> | 2005-08-31 16:59:49 +0000 |
|---|---|---|
| committer | tim <tim> | 2005-08-31 16:59:49 +0000 |
| commit | b321059f86b58b2dd3906308c94e9653869a9ae9 (patch) | |
| tree | 9a69b292e0cc769e879e00634f2a7bf2675fcedf /openbsd-compat/xcrypt.c | |
| parent | 75bbf44f08d9413198c24a3b8e1b39d488711bb0 (diff) | |
| download | openssh-b321059f86b58b2dd3906308c94e9653869a9ae9.tar.gz | |
- (tim) [configure.ac auth.c defines.h session.c openbsd-compat/port-uw.c
openbsd-compat/port-uw.h openbsd-compat/xcrypt.c] libiaf cleanup. Disable
libiaf bits for OpenServer6. Free memory allocated by ia_get_logpwd().
Feedback and OK dtucker@
Diffstat (limited to 'openbsd-compat/xcrypt.c')
| -rw-r--r-- | openbsd-compat/xcrypt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 45320327..9afa0b9f 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -91,12 +91,13 @@ shadow_pw(struct passwd *pw) struct spwd *spw = getspnam(pw->pw_name); if (spw != NULL) -#ifdef HAVE_LIBIAF - pw_password = get_iaf_password(pw); -#else pw_password = spw->sp_pwdp; -#endif /* HAVE_LIBIAF */ # endif + +#if defined(HAVE_LIBIAF) && !defined(BROKEN_LIBIAF) + return(get_iaf_password(pw)); +#endif + # if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) struct passwd_adjunct *spw; if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL) |