Attachment 225 Details for Bug 387 – ugly fix

[patch] ugly fix

FAKE (text/plain), 2.95 KB, created by Markus Friedl on 2003-02-08 00:03:42 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2003-02-08 00:03:42 AEDT

Size: 2.95 KB

patch

obsolete

>Index: monitor.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/monitor.c,v
>retrieving revision 1.31
>diff -u -r1.31 monitor.c
>--- monitor.c	4 Feb 2003 09:33:22 -0000	1.31
>+++ monitor.c	7 Feb 2003 11:00:11 -0000
>@@ -791,6 +791,7 @@
> 
> 	buffer_clear(m);
> 	buffer_put_int(m, allowed);
>+	buffer_put_int(m, forced_command != NULL);
> 
> 	mm_append_debug(m);
> 
>@@ -1153,6 +1154,7 @@
> 	}
> 	buffer_clear(m);
> 	buffer_put_int(m, allowed);
>+	buffer_put_int(m, forced_command != NULL);
> 
> 	/* clear temporarily storage (used by generate challenge) */
> 	monitor_reset_key_state();
>Index: monitor_wrap.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/monitor_wrap.c,v
>retrieving revision 1.21
>diff -u -r1.21 monitor_wrap.c
>--- monitor_wrap.c	4 Feb 2003 09:33:22 -0000	1.21
>+++ monitor_wrap.c	7 Feb 2003 12:57:57 -0000
>@@ -34,6 +34,7 @@
> #include "dh.h"
> #include "kex.h"
> #include "auth.h"
>+#include "auth-options.h"
> #include "buffer.h"
> #include "bufaux.h"
> #include "packet.h"
>@@ -310,7 +311,7 @@
> 	Buffer m;
> 	u_char *blob;
> 	u_int len;
>-	int allowed = 0;
>+	int allowed = 0, have_forced = 0;
> 
> 	debug3("%s entering", __func__);
> 
>@@ -332,6 +333,14 @@
> 
> 	allowed = buffer_get_int(&m);
> 
>+	/* fake forced command */
>+	if (forced_command) {
>+		xfree(forced_command);
>+		forced_command = NULL;
>+	}
>+	have_forced = buffer_get_int(&m);
>+	forced_command = have_forced ? xstrdup("true") : NULL;
>+
> 	/* Send potential debug messages */
> 	mm_send_debug(&m);
> 
>@@ -834,7 +843,7 @@
> 	Key *key;
> 	u_char *blob;
> 	u_int blen;
>-	int allowed = 0;
>+	int allowed = 0, have_forced = 0;
> 
> 	debug3("%s entering", __func__);
> 
>@@ -846,6 +855,14 @@
> 
> 	allowed = buffer_get_int(&m);
> 
>+	/* fake forced command */
>+	if (forced_command) {
>+		xfree(forced_command);
>+		forced_command = NULL;
>+	}
>+	have_forced = buffer_get_int(&m);
>+	forced_command = have_forced ? xstrdup("true") : NULL;
>+
> 	if (allowed && rkey != NULL) {
> 		blob = buffer_get_string(&m, &blen);
> 		if ((key = key_from_blob(blob, blen)) == NULL)
>Index: readconf.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/readconf.c,v
>retrieving revision 1.102
>diff -u -r1.102 readconf.c
>--- readconf.c	5 Feb 2003 09:02:28 -0000	1.102
>+++ readconf.c	7 Feb 2003 11:12:04 -0000
>@@ -26,6 +26,8 @@
> #include "kex.h"
> #include "mac.h"
> 
>+char *forced_command = NULL; /*XXX*/
>+
> /* Format of the configuration file:
> 
>    # Configuration data is parsed as follows:
>Index: ssh-keyscan.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-keyscan.c,v
>retrieving revision 1.40
>diff -u -r1.40 ssh-keyscan.c
>--- ssh-keyscan.c	6 Jul 2002 17:47:58 -0000	1.40
>+++ ssh-keyscan.c	7 Feb 2003 11:12:27 -0000
>@@ -34,6 +34,8 @@
>    Default value is AF_UNSPEC means both IPv4 and IPv6. */
> int IPv4or6 = AF_UNSPEC;
> 
>+char *forced_command = NULL; /*XXX*/
>+
> int ssh_port = SSH_DEFAULT_PORT;
> 
> #define KT_RSA1	1

Actions: View | Diff

Attachments on bug 387: 139 | 225 | 230