Please test this snapshot

[Damien Miller]

On Fri, 30 Jun 2000, John P Speno wrote:

> On Thu, Jun 29, 2000 at 07:02:05AM +1000, Damien Miller wrote:
> > 
> > BTW this snapshot contains DEC OSF/Tru64 SIA support, enable it
> > using "USE_SIA=1 ./configure [options]". I would like some feedback
> > from DEC users as to the correctness of this code (as I know nothing
> > about SIA).
> 
> There's a few compile errors under Tru64 UNIX 5.0a here:

Does this help?

Index: auth1.c
===================================================================
RCS file: /var/cvs/openssh/auth1.c,v
retrieving revision 1.4
diff -u -r1.4 auth1.c
--- auth1.c	2000/06/28 05:22:42	1.4
+++ auth1.c	2000/07/01 02:54:00
@@ -310,7 +310,6 @@
 			authenticated = auth_pam_password(pw, password);
 #elif defined(HAVE_OSF_SIA)
 			/* Do SIA auth with password */
-			host = get_canonical_hostname();
 			if (sia_validate_user(NULL, saved_argc, saved_argv, 
 				get_canonical_hostname(), pw->pw_name, NULL, 0, 
 				NULL, password) == SIASUCCESS) {
@@ -505,7 +504,11 @@
 #endif /* KRB4 */
 #ifdef USE_PAM
 	    auth_pam_password(pw, "")) {
-#else /* USE_PAM */
+#elif defined(HAVE_OSF_SIA)
+	    (sia_validate_user(NULL, saved_argc, saved_argv, 
+	    get_canonical_hostname(), pw->pw_name, NULL, 0, NULL, 
+	    "") == SIASUCCESS)) {
+#else /* !HAVE_OSF_SIA && !USE_PAM */
 	    auth_password(pw, "")) {
 #endif /* USE_PAM */
 		/* Authentication with empty password succeeded. */

-d


-- 
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)