- (stevesk) [auth1.c] fix password auth for protocol 1 when

   !USE_PAM && !HAVE_OSF_SIA; merge issue.

diff --git a/ChangeLog b/ChangeLog
index d704cb0dab03e794a5f4ffba16e1d29052257f87..08e0bdd016d30d18eed7313d0489a6879086a031 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with
    UsePrivilegeSeparation=yes.
+ - (stevesk) [auth1.c] fix password auth for protocol 1 when
+   !USE_PAM && !HAVE_OSF_SIA; merge issue.
 
 20020331
  - (tim) [configure.ac] use /bin/test -L to work around broken builtin on

diff --git a/auth1.c b/auth1.c
index 4f33fa87870fe07ca7fcdd7858557c08fca3eea9..89ae47df246133f4f1177737b39df96f2d603556 100644 (file)
--- a/auth1.c
+++ b/auth1.c
@@ -253,6 +253,7 @@ do_authloop(Authctxt *authctxt)
                        /* Do SIA auth with password */
                        authenticated = auth_sia_password(authctxt->user, 
                            password);
+#else /* !USE_PAM && !HAVE_OSF_SIA */
                        /* Try authentication with the password. */
                        authenticated = PRIVSEP(auth_password(authctxt, password));
 #endif /* USE_PAM */