Attachment 66 Details for Bug 204 – what about this? please test

[patch] what about this? please test

K5 (text/plain), 1.80 KB, created by Markus Friedl on 2002-04-08 20:59:03 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2002-04-08 20:59:03 AEST

Size: 1.80 KB

patch

obsolete

>Index: auth1.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth1.c,v
>retrieving revision 1.39
>diff -u -r1.39 auth1.c
>--- auth1.c	19 Mar 2002 14:27:39 -0000	1.39
>+++ auth1.c	8 Apr 2002 09:56:10 -0000
>@@ -335,9 +335,12 @@
> 	if ((style = strchr(user, ':')) != NULL)
> 		*style++ = '\0';
> 
>+#ifdef KRB5
> 	/* XXX - SSH.com Kerberos v5 braindeath. */
>-	if ((p = strchr(user, '@')) != NULL)
>-		*p = '\0';
>+	if ((datafellows & SSH_BUG_K5USER) && options.kerberos_authentication)
>+		if ((p = strchr(user, '@')) != NULL)
>+			*p = '\0';
>+#endif
> 
> 	authctxt = authctxt_new();
> 	authctxt->user = user;
>Index: compat.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.c,v
>retrieving revision 1.62
>diff -u -r1.62 compat.c
>--- compat.c	25 Mar 2002 21:13:51 -0000	1.62
>+++ compat.c	8 Apr 2002 09:56:10 -0000
>@@ -127,8 +127,12 @@
> 		  "1.2.19*,"
> 		  "1.2.20*,"
> 		  "1.2.21*,"
>-		  "1.2.22*",		SSH_BUG_IGNOREMSG },
>-		{ "1.3.2*",		SSH_BUG_IGNOREMSG },	/* f-secure */
>+		  "1.2.22*",		SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
>+		{ "1.3.2*",		/* F-Secure */
>+					SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },
>+		{ "1.2.1*,"
>+		  "1.2.2*,"
>+		  "1.2.3*",		SSH_BUG_K5USER },
> 		{ "*SSH Compatible Server*",			/* Netscreen */
> 					SSH_BUG_PASSWORDPAD },
> 		{ "*OSU_0*,"
>Index: compat.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.h,v
>retrieving revision 1.31
>diff -u -r1.31 compat.h
>--- compat.h	25 Mar 2002 21:13:51 -0000	1.31
>+++ compat.h	8 Apr 2002 09:56:10 -0000
>@@ -53,6 +53,7 @@
> #define SSH_BUG_DERIVEKEY	0x00040000
> #define SSH_BUG_DUMMYCHAN	0x00100000
> #define SSH_BUG_EXTEOF		0x00200000
>+#define SSH_BUG_K5USER		0x00400000
> 
> void     enable_compat13(void);
> void     enable_compat20(void);

Actions: View | Diff

Attachments on bug 204: 61 | 66