|
Lines 534-545
main(int ac, char **av)
Link Here
|
| 534 |
#endif |
534 |
#endif |
| 535 |
|
535 |
|
| 536 |
/* |
536 |
/* |
| 537 |
* Discard other fds that are hanging around. These can cause problem |
|
|
| 538 |
* with backgrounded ssh processes started by ControlPersist. |
| 539 |
*/ |
| 540 |
closefrom(STDERR_FILENO + 1); |
| 541 |
|
| 542 |
/* |
| 543 |
* Save the original real uid. It will be needed later (uid-swapping |
537 |
* Save the original real uid. It will be needed later (uid-swapping |
| 544 |
* may clobber the real uid). |
538 |
* may clobber the real uid). |
| 545 |
*/ |
539 |
*/ |
|
Lines 981-987
main(int ac, char **av)
Link Here
|
| 981 |
fatal("Can't specify both -y and -E"); |
975 |
fatal("Can't specify both -y and -E"); |
| 982 |
if (logfile != NULL) { |
976 |
if (logfile != NULL) { |
| 983 |
log_redirect_stderr_to(logfile); |
977 |
log_redirect_stderr_to(logfile); |
| 984 |
free(logfile); |
|
|
| 985 |
} |
978 |
} |
| 986 |
log_init(argv0, |
979 |
log_init(argv0, |
| 987 |
options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, |
980 |
options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, |
|
Lines 999-1004
main(int ac, char **av)
Link Here
|
| 999 |
/* Parse the configuration files */ |
992 |
/* Parse the configuration files */ |
| 1000 |
process_config_files(host_arg, pw, 0); |
993 |
process_config_files(host_arg, pw, 0); |
| 1001 |
|
994 |
|
|
|
995 |
/* |
| 996 |
* Discard other fds that are hanging around. These can cause problem |
| 997 |
* with backgrounded ssh processes started by ControlPersist. |
| 998 |
*/ |
| 999 |
if (options.control_persist) |
| 1000 |
closefrom(STDERR_FILENO + 1); |
| 1001 |
|
| 1002 |
/* ... and reopen log file if it is required */ |
| 1003 |
if (logfile != NULL) { |
| 1004 |
log_redirect_stderr_to(logfile); |
| 1005 |
free(logfile); |
| 1006 |
} |
| 1007 |
|
| 1002 |
/* Hostname canonicalisation needs a few options filled. */ |
1008 |
/* Hostname canonicalisation needs a few options filled. */ |
| 1003 |
fill_default_options_for_canonicalization(&options); |
1009 |
fill_default_options_for_canonicalization(&options); |
| 1004 |
|
1010 |
|