summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/auth2.c b/auth2.c
index c887283a3..b74920578 100644
--- a/auth2.c
+++ b/auth2.c
@@ -25,11 +25,6 @@
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.40 2001/02/10 12:52:02 markus Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.40 2001/02/10 12:52:02 markus Exp $");
27 27
28#ifdef HAVE_OSF_SIA
29# include <sia.h>
30# include <siad.h>
31#endif
32
33#include <openssl/evp.h> 28#include <openssl/evp.h>
34 29
35#include "ssh2.h" 30#include "ssh2.h"
@@ -61,10 +56,6 @@ extern int session_id2_len;
61#ifdef WITH_AIXAUTHENTICATE 56#ifdef WITH_AIXAUTHENTICATE
62extern char *aixloginmsg; 57extern char *aixloginmsg;
63#endif 58#endif
64#ifdef HAVE_OSF_SIA
65extern int saved_argc;
66extern char **saved_argv;
67#endif
68 59
69static Authctxt *x_authctxt = NULL; 60static Authctxt *x_authctxt = NULL;
70static int one = 1; 61static int one = 1;
@@ -346,10 +337,7 @@ userauth_none(Authctxt *authctxt)
346#ifdef USE_PAM 337#ifdef USE_PAM
347 return auth_pam_password(authctxt->pw, ""); 338 return auth_pam_password(authctxt->pw, "");
348#elif defined(HAVE_OSF_SIA) 339#elif defined(HAVE_OSF_SIA)
349 return (sia_validate_user(NULL, saved_argc, saved_argv, 340 return 0;
350 get_canonical_hostname(options.reverse_mapping_check),
351 authctxt->user?authctxt->user:"NOUSER", NULL, 0,
352 NULL, "") == SIASUCCESS);
353#else /* !HAVE_OSF_SIA && !USE_PAM */ 341#else /* !HAVE_OSF_SIA && !USE_PAM */
354 return auth_password(authctxt->pw, ""); 342 return auth_password(authctxt->pw, "");
355#endif /* USE_PAM */ 343#endif /* USE_PAM */
@@ -374,10 +362,7 @@ userauth_passwd(Authctxt *authctxt)
374#ifdef USE_PAM 362#ifdef USE_PAM
375 auth_pam_password(authctxt->pw, password) == 1) 363 auth_pam_password(authctxt->pw, password) == 1)
376#elif defined(HAVE_OSF_SIA) 364#elif defined(HAVE_OSF_SIA)
377 sia_validate_user(NULL, saved_argc, saved_argv, 365 auth_sia_password(authctxt->user, password) == 1)
378 get_canonical_hostname(options.reverse_mapping_check),
379 authctxt->user?authctxt->user:"NOUSER", NULL, 0, NULL,
380 password) == SIASUCCESS)
381#else /* !USE_PAM && !HAVE_OSF_SIA */ 366#else /* !USE_PAM && !HAVE_OSF_SIA */
382 auth_password(authctxt->pw, password) == 1) 367 auth_password(authctxt->pw, password) == 1)
383#endif /* USE_PAM */ 368#endif /* USE_PAM */