pool/openssh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 198435 from network

Browse Source 
- fix the logic in openssh-nodaemon-nopid.patch which is broken
  and pid_file therefore still being created. (forwarded request 198380 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/198435
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=88
This commit is contained in:
Stephan Kulow 2013-09-11 10:58:04 +00:00 committed by Git OBS Bridge
commit 946960ceb5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh-nodaemon-nopid.patch
View File

@ -1,11 +1,11 @@
--- sshd.c.orig --- sshd.c.orig
+++ sshd.c +++ sshd.c
@@ -1812,7 +1812,7 @@ main(int ac, char **av) @@ -1840,7 +1840,7 @@ main(int ac, char **av)
* Write out the pid file after the sigterm handler * Write out the pid file after the sigterm handler
* is setup and the listen sockets are bound * is setup and the listen sockets are bound
*/ */
- if (!debug_flag) { - if (!debug_flag) {
+ if (!debug_flag || !no_daemon_flag) { + if (!(debug_flag || no_daemon_flag)) {
FILE *f = fopen(options.pid_file, "w"); FILE *f = fopen(options.pid_file, "w");
if (f == NULL) { if (f == NULL) {

6
openssh.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 10 21:15:59 UTC 2013 - crrodriguez@opensuse.org
- fix the logic in openssh-nodaemon-nopid.patch which is broken
and pid_file therefore still being created.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 3 17:57:06 UTC 2013 - crrodriguez@opensuse.org Sat Aug 3 17:57:06 UTC 2013 - crrodriguez@opensuse.org