dropbear: cli-runopts.c comparison

merge up to date

comparison

equal deleted inserted replaced

-:84cf9062718d
+:506f7681d0f8
 		total += written;
 	}
 	if (opts.recv_window != DEFAULT_RECV_WINDOW)
 	{
-		int written = snprintf(ret+total, len-total, "-W %d ", opts.recv_window);
+		int written = snprintf(ret+total, len-total, "-W %u ", opts.recv_window);
 		total += written;
 	}
 #ifdef ENABLE_CLI_PUBKEY_AUTH
 	for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
 	dropbear_exit("Bad TCP port in '%s'", origstr);
 }
 #endif
 static int match_extendedopt(const char** strptr, const char *optname) {
+	int seen_eq = 0;
 	int optlen = strlen(optname);
 	const char *str = *strptr;
+	while (isspace(*str)) {
+		++str;
+	}
 	if (strncasecmp(str, optname, optlen) != 0) {
 		return DROPBEAR_FAILURE;
 	}
 	str += optlen;
-	if (*str == '=') {
+	while (isspace(*str) || (!seen_eq && *str == '=')) {
-		*strptr = str+1;
+		if (*str == '=') {
-		return DROPBEAR_SUCCESS;
+			seen_eq = 1;
-	} else {
+		}
+		++str;
+	}
+	if (str-*strptr == optlen) {
+		/* matched just a prefix of optname */
 		return DROPBEAR_FAILURE;
 	}
+	*strptr = str;
+	return DROPBEAR_SUCCESS;
 }
 static int parse_flag_value(const char *value) {
 	if (strcmp(value, "yes") == 0 || strcmp(value, "true") == 0) {
 		return 1;

Mercurial > dropbear