Attachment #556 for bug #802




	if (*password == '\0' && options.permit_empty_passwd == 0)
		return 0;

#if defined(HAVE_OSF_SIA)
	/*
	 * XXX: any reason this is before krb?  could be moved to
	 * sys_auth_passwd()?  -dt
	 */
	return auth_sia_password(authctxt, password) && ok;
#endif
#ifdef KRB5
	if (options.kerberos_authentication == 1) {
		int ret = auth_krb5_password(authctxt, password);

Lines 47-53 extern int saved_argc; Link Here

(-)auth-sia.c (-1 / +1 lines)
47	extern char **saved_argv;	47	extern char **saved_argv;
48		48
49	int	49	int
50	auth_sia_password(Authctxt authctxt, char pass)	50	sys_auth_password(Authctxt authctxt, char pass)
51	{	51	{
52	int ret;	52	int ret;
53	SIAENTITY *ent = NULL;	53	SIAENTITY *ent = NULL;

Lines 26-32 Link Here

(-)auth-sia.h (-1 / +1 lines)
26		26
27	#ifdef HAVE_OSF_SIA	27	#ifdef HAVE_OSF_SIA
28		28
29	int auth_sia_password(Authctxt , char );	29	int sys_auth_password(Authctxt , char );
30	void session_setup_sia(struct passwd , char );	30	void session_setup_sia(struct passwd , char );
31		31
32	#endif /* HAVE_OSF_SIA */	32	#endif /* HAVE_OSF_SIA */

Lines 616-621 struct winsize { Link Here

(-)defines.h (+7 lines)
616	# define USE_LASTLOG	616	# define USE_LASTLOG
617	#endif	617	#endif
618		618
		619	#ifdef HAVE_OSF_SIA
		620	# ifdef USE_SHADOW
		621	# undef USE_SHADOW
		622	# endif
		623	# define CUSTOM_SYS_AUTH_PASSWD 1
		624	#endif
		625
619	/** end of login recorder definitions */	626	/** end of login recorder definitions */
620		627
621	#endif /* _DEFINES_H */	628	#endif /* _DEFINES_H */

Lines 24-31 Link Here

(-)openbsd-compat/xcrypt.c (-4 lines)
24		24
25	#include "includes.h"	25	#include "includes.h"
26		26
27	#if !defined(HAVE_OSF_SIA)
28
29	# ifdef HAVE_CRYPT_H	27	# ifdef HAVE_CRYPT_H
30	# include <crypt.h>	28	# include <crypt.h>
31	# endif	29	# endif
Lines 108-112 shadow_pw(struct passwd *pw) Link Here
108		106
109	return pw_password;	107	return pw_password;
110	}	108	}
111
112	#endif /* !defined(HAVE_OSF_SIA) */

Return to bug 802

Lines 73-85 auth_password(Authctxt *authctxt, const Link Here

(-)auth-passwd.c (-7 lines)
73	if (*password == '\0' && options.permit_empty_passwd == 0)	73	if (*password == '\0' && options.permit_empty_passwd == 0)
74	return 0;	74	return 0;
75		75
76	#if defined(HAVE_OSF_SIA)
77	/*
78	* XXX: any reason this is before krb? could be moved to
79	* sys_auth_passwd()? -dt
80	*/
81	return auth_sia_password(authctxt, password) && ok;
82	#endif
83	#ifdef KRB5	76	#ifdef KRB5
84	if (options.kerberos_authentication == 1) {	77	if (options.kerberos_authentication == 1) {
85	int ret = auth_krb5_password(authctxt, password);	78	int ret = auth_krb5_password(authctxt, password);