Attachment 554 Details for Bug 802 – More correct SIA fix.

[patch] More correct SIA fix.

sia.patch (text/plain), 1.24 KB, created by Ben Lindstrom on 2004-02-27 14:20:47 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Lindstrom

Created: 2004-02-27 14:20:47 AEDT

Size: 1.24 KB

patch

obsolete

>Index: auth-passwd.c
>===================================================================
>RCS file: /var/cvs/openssh/auth-passwd.c,v
>retrieving revision 1.72
>diff -u -r1.72 auth-passwd.c
>--- auth-passwd.c	21 Feb 2004 23:23:35 -0000	1.72
>+++ auth-passwd.c	27 Feb 2004 03:15:23 -0000
>@@ -79,16 +79,16 @@
> 	 * sys_auth_passwd()?  -dt
> 	 */
> 	return auth_sia_password(authctxt, password) && ok;
>-#endif
>-#ifdef KRB5
>+#else
>+# ifdef KRB5
> 	if (options.kerberos_authentication == 1) {
> 		int ret = auth_krb5_password(authctxt, password);
> 		if (ret == 1 || ret == 0)
> 			return ret && ok;
> 		/* Fall back to ordinary passwd authentication. */
> 	}
>-#endif
>-#ifdef HAVE_CYGWIN
>+# endif
>+# ifdef HAVE_CYGWIN
> 	if (is_winnt) {
> 		HANDLE hToken = cygwin_logon_user(pw, password);
> 
>@@ -97,8 +97,8 @@
> 		cygwin_set_impersonation_token(hToken);
> 		return ok;
> 	}
>-#endif
>-#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
>+# endif
>+# if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
> 	if (!expire_checked) {
> 		expire_checked = 1;
> 		if (auth_shadow_pwexpired(authctxt)) {
>@@ -106,9 +106,10 @@
> 			authctxt->force_pwchange = 1;
> 		}
> 	}
>-#endif
>+# endif
> 		
> 	return (sys_auth_passwd(authctxt, password) && ok);
>+#endif /* !defined(HAVE_OSF_SIA) */
> }
> 
> #ifdef BSD_AUTH

Actions: View | Diff

Attachments on bug 802: 554 | 555 | 556 | 558