View | Details | Raw Unified | Return to bug 2396
Collapse All | Expand All

(-)a/readconf.c (-5 / +5 lines)
Lines 1224-1236 parse_int: Link Here
1224
		arg = strdelim(&s);
1224
		arg = strdelim(&s);
1225
		if (!arg || *arg == '\0')
1225
		if (!arg || *arg == '\0')
1226
			fatal("%.200s line %d: Missing argument.", filename, linenum);
1226
			fatal("%.200s line %d: Missing argument.", filename, linenum);
1227
		if (arg[0] == '^' && arg[2] == 0 &&
1227
		if (strcmp(arg, "none") == 0)
1228
			value = SSH_ESCAPECHAR_NONE;
1229
		else if (arg[1] == '\0')
1230
			value = (u_char) arg[0];
1231
		else if (arg[0] == '^' && arg[2] == 0 &&
1228
		    (u_char) arg[1] >= 64 && (u_char) arg[1] < 128)
1232
		    (u_char) arg[1] >= 64 && (u_char) arg[1] < 128)
1229
			value = (u_char) arg[1] & 31;
1233
			value = (u_char) arg[1] & 31;
1230
		else if (strlen(arg) == 1)
1231
			value = (u_char) arg[0];
1232
		else if (strcmp(arg, "none") == 0)
1233
			value = SSH_ESCAPECHAR_NONE;
1234
		else {
1234
		else {
1235
			fatal("%.200s line %d: Bad escape character.",
1235
			fatal("%.200s line %d: Bad escape character.",
1236
			    filename, linenum);
1236
			    filename, linenum);

Return to bug 2396