diff options
| author | Damien Miller <djm@mindrot.org> | 2001-02-13 15:25:23 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-02-13 15:25:23 +0100 |
| commit | 92ddb7d6f0d6a1942e27f75883d29dc0ea99223f (patch) | |
| tree | 505a90486e59c722c4226a7c597b449f4b651529 /auth1.c | |
| parent | - (bal) Missing function prototype in bsd-snprintf.c patch by (diff) | |
| download | openssh-92ddb7d6f0d6a1942e27f75883d29dc0ea99223f.tar.xz openssh-92ddb7d6f0d6a1942e27f75883d29dc0ea99223f.zip | |
- (djm) Split out and improve OSF SIA auth code. Patch from Chris Adams
<cmadams@hiwaay.net> with a little modification and KNF.
Diffstat (limited to 'auth1.c')
| -rw-r--r-- | auth1.c | 18 |
1 files changed, 4 insertions, 14 deletions
@@ -12,11 +12,6 @@ #include "includes.h" RCSID("$OpenBSD: auth1.c,v 1.15 2001/02/07 22:35:45 markus Exp $"); -#ifdef HAVE_OSF_SIA -# include <sia.h> -# include <siad.h> -#endif - #include "xmalloc.h" #include "rsa.h" #include "ssh1.h" @@ -36,10 +31,6 @@ extern char *forced_command; #ifdef WITH_AIXAUTHENTICATE extern char *aixloginmsg; #endif /* WITH_AIXAUTHENTICATE */ -#ifdef HAVE_OSF_SIA -extern int saved_argc; -extern char **saved_argv; -#endif /* HAVE_OSF_SIA */ /* * convert ssh auth msg type into description @@ -98,6 +89,8 @@ do_authloop(Authctxt *authctxt) #endif #ifdef USE_PAM auth_pam_password(pw, "")) { +#elif defined(HAVE_OSF_SIA) + 0) { #else auth_password(pw, "")) { #endif @@ -265,11 +258,8 @@ do_authloop(Authctxt *authctxt) authenticated = auth_pam_password(pw, password); #elif defined(HAVE_OSF_SIA) /* Do SIA auth with password */ - if (sia_validate_user(NULL, saved_argc, saved_argv, - get_canonical_hostname(options.reverse_mapping_check), - authctxt->user?authctxt->user:"NOUSER", NULL, - 0, NULL, password) == SIASUCCESS) - authenticated = 1; + authenticated = auth_sia_password(authctxt->user, + password); #else /* !USE_PAM && !HAVE_OSF_SIA */ /* Try authentication with the password. */ authenticated = auth_password(pw, password); |