Attachment #225 for bug #387

Lines 791-796 Link Here

(-)monitor.c (+2 lines)
791		791
792	buffer_clear(m);	792	buffer_clear(m);
793	buffer_put_int(m, allowed);	793	buffer_put_int(m, allowed);
		794	buffer_put_int(m, forced_command != NULL);
794		795
795	mm_append_debug(m);	796	mm_append_debug(m);
796		797
Lines 1153-1158 Link Here
1153	}	1154	}
1154	buffer_clear(m);	1155	buffer_clear(m);
1155	buffer_put_int(m, allowed);	1156	buffer_put_int(m, allowed);
		1157	buffer_put_int(m, forced_command != NULL);
1156		1158
1157	/* clear temporarily storage (used by generate challenge) */	1159	/* clear temporarily storage (used by generate challenge) */
1158	monitor_reset_key_state();	1160	monitor_reset_key_state();




#include "dh.h"
#include "kex.h"
#include "auth.h"
#include "auth-options.h"
#include "buffer.h"
#include "bufaux.h"
#include "packet.h"

	Buffer m;
	u_char *blob;
	u_int len;
	int allowed = 0, have_forced = 0;

	debug3("%s entering", __func__);



	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);


	Key *key;
	u_char *blob;
	u_int blen;
	int allowed = 0, have_forced = 0;

	debug3("%s entering", __func__);



	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)

Lines 26-31 Link Here

(-)readconf.c (+2 lines)
26	#include "kex.h"	26	#include "kex.h"
27	#include "mac.h"	27	#include "mac.h"
28		28
		29	char forced_command = NULL; /XXX*/
		30
29	/* Format of the configuration file:	31	/* Format of the configuration file:
30		32
31	# Configuration data is parsed as follows:	33	# Configuration data is parsed as follows:

Lines 34-39 Link Here

(-)ssh-keyscan.c (+2 lines)
34	Default value is AF_UNSPEC means both IPv4 and IPv6. */	34	Default value is AF_UNSPEC means both IPv4 and IPv6. */
35	int IPv4or6 = AF_UNSPEC;	35	int IPv4or6 = AF_UNSPEC;
36		36
		37	char forced_command = NULL; /XXX*/
		38
37	int ssh_port = SSH_DEFAULT_PORT;	39	int ssh_port = SSH_DEFAULT_PORT;
38		40
39	#define KT_RSA1 1	41	#define KT_RSA1 1

Return to bug 387

Lines 34-39 Link Here

(-)monitor_wrap.c (-2 / +19 lines)
34	#include "dh.h"	34	#include "dh.h"
35	#include "kex.h"	35	#include "kex.h"
36	#include "auth.h"	36	#include "auth.h"
		37	#include "auth-options.h"
37	#include "buffer.h"	38	#include "buffer.h"
38	#include "bufaux.h"	39	#include "bufaux.h"
39	#include "packet.h"	40	#include "packet.h"
Lines 310-316 Link Here
310	Buffer m;	311	Buffer m;
311	u_char *blob;	312	u_char *blob;
312	u_int len;	313	u_int len;
313	int allowed = 0;	314	int allowed = 0, have_forced = 0;
314		315
315	debug3("%s entering", __func__);	316	debug3("%s entering", __func__);
316		317
Lines 332-337 Link Here
332		333
333	allowed = buffer_get_int(&m);	334	allowed = buffer_get_int(&m);
334		335
		336	/* fake forced command */
		337	if (forced_command) {
		338	xfree(forced_command);
		339	forced_command = NULL;
		340	}
		341	have_forced = buffer_get_int(&m);
		342	forced_command = have_forced ? xstrdup("true") : NULL;
		343
335	/* Send potential debug messages */	344	/* Send potential debug messages */
336	mm_send_debug(&m);	345	mm_send_debug(&m);
337		346
Lines 834-840 Link Here
834	Key *key;	843	Key *key;
835	u_char *blob;	844	u_char *blob;
836	u_int blen;	845	u_int blen;
837	int allowed = 0;	846	int allowed = 0, have_forced = 0;
838		847
839	debug3("%s entering", __func__);	848	debug3("%s entering", __func__);
840		849
Lines 846-851 Link Here
846		855
847	allowed = buffer_get_int(&m);	856	allowed = buffer_get_int(&m);
848		857
		858	/* fake forced command */
		859	if (forced_command) {
		860	xfree(forced_command);
		861	forced_command = NULL;
		862	}
		863	have_forced = buffer_get_int(&m);
		864	forced_command = have_forced ? xstrdup("true") : NULL;
		865
849	if (allowed && rkey != NULL) {	866	if (allowed && rkey != NULL) {
850	blob = buffer_get_string(&m, &blen);	867	blob = buffer_get_string(&m, &blen);
851	if ((key = key_from_blob(blob, blen)) == NULL)	868	if ((key = key_from_blob(blob, blen)) == NULL)