712ccf3395
- Update of the underlying OpenSSH to 6.4p1
- Update to 6.4p1
Features since 6.2p2:
* ssh-agent(1) support in sshd(8); allows encrypted hostkeys, or
hostkeys on smartcards.
* ssh(1)/sshd(8): allow optional time-based rekeying via a
second argument to the existing RekeyLimit option. RekeyLimit
is now supported in sshd_config as well as on the client.
* sshd(8): standardise logging of information during user
authentication.
* The presented key/cert and the remote username (if available)
is now logged in the authentication success/failure message on
the same log line as the local username, remote host/port and
protocol in use. Certificates contents and the key
fingerprint of the signing CA are logged too.
* ssh(1) ability to query what cryptographic algorithms are
supported in the binary.
* ssh(1): ProxyCommand=- for cases where stdin and stdout
already point to the proxy.
* ssh(1): allow IdentityFile=none
* ssh(1)/sshd(8): -E option to append debugging logs to a
specified file instead of stderr or syslog.
* sftp(1): support resuming partial downloads with the "reget"
command and on the sftp commandline or on the "get"
commandline with the "-a" (append) option.
* ssh(1): "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives.
* sshd(8): support for submethods to be appended to required
authentication methods listed via AuthenticationMethods.
OBS-URL: https://build.opensuse.org/request/show/220466
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=58
25 lines
772 B
Diff
25 lines
772 B
Diff
# Do not write a PID file when not daemonizing (e.g. when running from systemd)
|
|
|
|
diff --git a/openssh-6.4p1/sshd.c b/openssh-6.4p1/sshd.c
|
|
--- a/openssh-6.4p1/sshd.c
|
|
+++ b/openssh-6.4p1/sshd.c
|
|
@@ -1959,17 +1959,17 @@ main(int ac, char **av)
|
|
signal(SIGCHLD, main_sigchld_handler);
|
|
signal(SIGTERM, sigterm_handler);
|
|
signal(SIGQUIT, sigterm_handler);
|
|
|
|
/*
|
|
* Write out the pid file after the sigterm handler
|
|
* is setup and the listen sockets are bound
|
|
*/
|
|
- if (!debug_flag) {
|
|
+ if (!(debug_flag || no_daemon_flag)) {
|
|
FILE *f = fopen(options.pid_file, "w");
|
|
|
|
if (f == NULL) {
|
|
error("Couldn't create pid file \"%s\": %s",
|
|
options.pid_file, strerror(errno));
|
|
} else {
|
|
fprintf(f, "%ld\n", (long) getpid());
|
|
fclose(f);
|