Attachment 2143 Details for Bug 1997 – Patch implementing %q QoS ControlPath escape

[patch] Patch implementing %q QoS ControlPath escape

qos-escape.patch (text/plain), 993 bytes, created by Peter Lebbing on 2012-04-09 21:00:19 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Lebbing

Created: 2012-04-09 21:00:19 AEST

Size: 993 bytes

patch

obsolete

>--- ssh.c.orig	2011-08-03 01:15:03.000000000 +0200
>+++ ssh.c	2012-04-09 12:56:38.000000000 +0200
>@@ -234,6 +234,7 @@
> 	extern char *optarg;
> 	struct servent *sp;
> 	Forward fwd;
>+	char iptos_str[sizeof "ff"];
> 
> 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
> 	sanitise_stdfd();
>@@ -745,10 +746,17 @@
> 		cp = tilde_expand_filename(options.control_path,
> 		    original_real_uid);
> 		xfree(options.control_path);
>+		if (tty_flag || (options.forward_x11
>+				 && (getenv("DISPLAY") != NULL)))
>+			snprintf(iptos_str, sizeof iptos_str, "%02x",
>+			    options.ip_qos_interactive);
>+		else
>+			snprintf(iptos_str, sizeof iptos_str, "%02x",
>+			    options.ip_qos_bulk);
> 		options.control_path = percent_expand(cp, "h", host,
> 		    "l", thishost, "n", host_arg, "r", options.user,
> 		    "p", portstr, "u", pw->pw_name, "L", shorthost,
>-		    (char *)NULL);
>+		    "q", iptos_str, (char *)NULL);
> 		xfree(cp);
> 	}
> 	if (muxclient_command != 0 && options.control_path == NULL)

Actions: View | Diff

Attachments on bug 1997: 2143