diff --git a/openssh-nodaemon-nopid.patch b/openssh-nodaemon-nopid.patch index 14ba7d9..7d341e6 100644 --- a/openssh-nodaemon-nopid.patch +++ b/openssh-nodaemon-nopid.patch @@ -1,11 +1,11 @@ --- sshd.c.orig +++ 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 * is setup and the listen sockets are bound */ - if (!debug_flag) { -+ if (!debug_flag || !no_daemon_flag) { ++ if (!(debug_flag || no_daemon_flag)) { FILE *f = fopen(options.pid_file, "w"); if (f == NULL) { diff --git a/openssh.changes b/openssh.changes index b9053a5..699164d 100644 --- a/openssh.changes +++ b/openssh.changes @@ -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