Attachment 2622 Details for Bug 2394 – possible solution

[patch] possible solution

file_2394.txt (text/plain), 1.29 KB, created by Jakub Jelen on 2015-05-18 21:35:49 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2015-05-18 21:35:49 AEST

Size: 1.29 KB

patch

obsolete

>diff --git a/ssh.c b/ssh.c
>index 3fd5a94..9796c6f 100644
>--- a/ssh.c
>+++ b/ssh.c
>@@ -534,12 +534,6 @@ main(int ac, char **av)
> #endif
> 
> 	/*
>-	 * Discard other fds that are hanging around. These can cause problem
>-	 * with backgrounded ssh processes started by ControlPersist.
>-	 */
>-	closefrom(STDERR_FILENO + 1);
>-
>-	/*
> 	 * Save the original real uid.  It will be needed later (uid-swapping
> 	 * may clobber the real uid).
> 	 */
>@@ -981,7 +975,6 @@ main(int ac, char **av)
> 		fatal("Can't specify both -y and -E");
> 	if (logfile != NULL) {
> 		log_redirect_stderr_to(logfile);
>-		free(logfile);
> 	}
> 	log_init(argv0,
> 	    options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
>@@ -999,6 +992,19 @@ main(int ac, char **av)
> 	/* Parse the configuration files */
> 	process_config_files(host_arg, pw, 0);
> 
>+	/*
>+	 * Discard other fds that are hanging around. These can cause problem
>+	 * with backgrounded ssh processes started by ControlPersist.
>+	 */
>+	if (options.control_persist)
>+		closefrom(STDERR_FILENO + 1);
>+
>+	/* ... and reopen log file if it is required */
>+	if (logfile != NULL) {
>+		log_redirect_stderr_to(logfile);
>+		free(logfile);
>+	}
>+
> 	/* Hostname canonicalisation needs a few options filled. */
> 	fill_default_options_for_canonicalization(&options);
>

Actions: View | Diff

Attachments on bug 2394: 2616 | 2622