View | Details | Raw Unified | Return to bug 802 | Differences between
and this patch

Collapse All | Expand All

(-)auth-passwd.c (-7 / +8 lines)
Lines 79-94 Link Here
79
	 * sys_auth_passwd()?  -dt
79
	 * sys_auth_passwd()?  -dt
80
	 */
80
	 */
81
	return auth_sia_password(authctxt, password) && ok;
81
	return auth_sia_password(authctxt, password) && ok;
82
#endif
82
#else
83
#ifdef KRB5
83
# ifdef KRB5
84
	if (options.kerberos_authentication == 1) {
84
	if (options.kerberos_authentication == 1) {
85
		int ret = auth_krb5_password(authctxt, password);
85
		int ret = auth_krb5_password(authctxt, password);
86
		if (ret == 1 || ret == 0)
86
		if (ret == 1 || ret == 0)
87
			return ret && ok;
87
			return ret && ok;
88
		/* Fall back to ordinary passwd authentication. */
88
		/* Fall back to ordinary passwd authentication. */
89
	}
89
	}
90
#endif
90
# endif
91
#ifdef HAVE_CYGWIN
91
# ifdef HAVE_CYGWIN
92
	if (is_winnt) {
92
	if (is_winnt) {
93
		HANDLE hToken = cygwin_logon_user(pw, password);
93
		HANDLE hToken = cygwin_logon_user(pw, password);
94
94
Lines 97-104 Link Here
97
		cygwin_set_impersonation_token(hToken);
97
		cygwin_set_impersonation_token(hToken);
98
		return ok;
98
		return ok;
99
	}
99
	}
100
#endif
100
# endif
101
#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
101
# if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
102
	if (!expire_checked) {
102
	if (!expire_checked) {
103
		expire_checked = 1;
103
		expire_checked = 1;
104
		if (auth_shadow_pwexpired(authctxt)) {
104
		if (auth_shadow_pwexpired(authctxt)) {
Lines 106-114 Link Here
106
			authctxt->force_pwchange = 1;
106
			authctxt->force_pwchange = 1;
107
		}
107
		}
108
	}
108
	}
109
#endif
109
# endif
110
		
110
		
111
	return (sys_auth_passwd(authctxt, password) && ok);
111
	return (sys_auth_passwd(authctxt, password) && ok);
112
#endif /* !defined(HAVE_OSF_SIA) */
112
}
113
}
113
114
114
#ifdef BSD_AUTH
115
#ifdef BSD_AUTH

Return to bug 802