Attachment 556 Details for Bug 802 – Move sys_auth_password for OSF SIA to auth-sia.c

[patch] Move sys_auth_password for OSF SIA to auth-sia.c

openssh-osfsia.patch (text/plain), 2.85 KB, created by Darren Tucker on 2004-02-27 15:28:57 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-02-27 15:28:57 AEDT

Size: 2.85 KB

patch

obsolete

>Index: auth-passwd.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-passwd.c,v
>retrieving revision 1.72
>diff -u -p -r1.72 auth-passwd.c
>--- auth-passwd.c	21 Feb 2004 23:23:35 -0000	1.72
>+++ auth-passwd.c	27 Feb 2004 03:30:48 -0000
>@@ -73,13 +73,6 @@ auth_password(Authctxt *authctxt, const 
> 	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);
>Index: auth-sia.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-sia.c,v
>retrieving revision 1.14
>diff -u -p -r1.14 auth-sia.c
>--- auth-sia.c	22 Nov 2003 03:25:16 -0000	1.14
>+++ auth-sia.c	27 Feb 2004 03:31:21 -0000
>@@ -47,7 +47,7 @@ extern int saved_argc;
> extern char **saved_argv;
> 
> int
>-auth_sia_password(Authctxt *authctxt, char *pass)
>+sys_auth_password(Authctxt *authctxt, char *pass)
> {
> 	int ret;
> 	SIAENTITY *ent = NULL;
>Index: auth-sia.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/auth-sia.h,v
>retrieving revision 1.5
>diff -u -p -r1.5 auth-sia.h
>--- auth-sia.h	18 May 2003 14:50:02 -0000	1.5
>+++ auth-sia.h	27 Feb 2004 04:23:11 -0000
>@@ -26,7 +26,7 @@
> 
> #ifdef HAVE_OSF_SIA
> 
>-int	auth_sia_password(Authctxt *, char *);
>+int	sys_auth_password(Authctxt *, char *);
> void	session_setup_sia(struct passwd *, char *);
> 
> #endif /* HAVE_OSF_SIA */
>Index: defines.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/defines.h,v
>retrieving revision 1.110
>diff -u -p -r1.110 defines.h
>--- defines.h	10 Feb 2004 02:01:14 -0000	1.110
>+++ defines.h	27 Feb 2004 04:18:54 -0000
>@@ -616,6 +616,13 @@ struct winsize {
> #  define USE_LASTLOG
> #endif
> 
>+#ifdef HAVE_OSF_SIA
>+# ifdef USE_SHADOW
>+#  undef USE_SHADOW
>+# endif
>+# define CUSTOM_SYS_AUTH_PASSWD 1
>+#endif
>+
> /** end of login recorder definitions */
> 
> #endif /* _DEFINES_H */
>Index: openbsd-compat/xcrypt.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/openbsd-compat/xcrypt.c,v
>retrieving revision 1.5
>diff -u -p -r1.5 xcrypt.c
>--- openbsd-compat/xcrypt.c	25 Sep 2003 10:18:34 -0000	1.5
>+++ openbsd-compat/xcrypt.c	27 Feb 2004 04:16:48 -0000
>@@ -24,8 +24,6 @@
> 
> #include "includes.h"
> 
>-#if !defined(HAVE_OSF_SIA)
>-
> # ifdef HAVE_CRYPT_H
> #  include <crypt.h>
> # endif
>@@ -108,5 +106,3 @@ shadow_pw(struct passwd *pw)
> 
> 	return pw_password;
> }
>-
>-#endif /* !defined(HAVE_OSF_SIA) */

Flags:

djm: ok+

Actions: View | Diff

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