|
Lines 234-239
Link Here
|
| 234 |
extern char *optarg; |
234 |
extern char *optarg; |
| 235 |
struct servent *sp; |
235 |
struct servent *sp; |
| 236 |
Forward fwd; |
236 |
Forward fwd; |
|
|
237 |
char iptos_str[sizeof "ff"]; |
| 237 |
|
238 |
|
| 238 |
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
239 |
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
| 239 |
sanitise_stdfd(); |
240 |
sanitise_stdfd(); |
|
Lines 745-754
Link Here
|
| 745 |
cp = tilde_expand_filename(options.control_path, |
746 |
cp = tilde_expand_filename(options.control_path, |
| 746 |
original_real_uid); |
747 |
original_real_uid); |
| 747 |
xfree(options.control_path); |
748 |
xfree(options.control_path); |
|
|
749 |
if (tty_flag || (options.forward_x11 |
| 750 |
&& (getenv("DISPLAY") != NULL))) |
| 751 |
snprintf(iptos_str, sizeof iptos_str, "%02x", |
| 752 |
options.ip_qos_interactive); |
| 753 |
else |
| 754 |
snprintf(iptos_str, sizeof iptos_str, "%02x", |
| 755 |
options.ip_qos_bulk); |
| 748 |
options.control_path = percent_expand(cp, "h", host, |
756 |
options.control_path = percent_expand(cp, "h", host, |
| 749 |
"l", thishost, "n", host_arg, "r", options.user, |
757 |
"l", thishost, "n", host_arg, "r", options.user, |
| 750 |
"p", portstr, "u", pw->pw_name, "L", shorthost, |
758 |
"p", portstr, "u", pw->pw_name, "L", shorthost, |
| 751 |
(char *)NULL); |
759 |
"q", iptos_str, (char *)NULL); |
| 752 |
xfree(cp); |
760 |
xfree(cp); |
| 753 |
} |
761 |
} |
| 754 |
if (muxclient_command != 0 && options.control_path == NULL) |
762 |
if (muxclient_command != 0 && options.control_path == NULL) |