Make sure bootlogd findpty() returns an error value when it fails to

find a usable pty.  Patch from Rob Leslie via Debian.

git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@22 456724a4-4300-0410-8514-c89748c515a2

diff --git a/doc/Changelog b/doc/Changelog
index fc507c346bf77b2f8b224b0ed2ce0a2f569165cf..9a9c63caf762f8aef1e3976ff2c109e98085fd51 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -22,6 +22,8 @@ sysvinit (2.88dsf) UNRELEASED; urgency=low
   * Rewrite findtty() in bootlogd to recursively search /dev/ for the
     correct device, to handle terminal devices for example in /dev/pty/.
     Patch from Debian.
+  * Make sure bootlogd findpty() returns an error value when it fails to
+    find a usable pty.  Patch from Rob Leslie via Debian.
 
  -- Petter Reinholdtsen <pere@hungry.com>  Sun, 12 Jul 2009 19:58:10 +0200
 

diff --git a/src/bootlogd.c b/src/bootlogd.c
index 924f50292669f5ac43f9a157e94cf2d9c7ea2a10..e2eb4d8a68faf635e1f9e7329b8d290834a05928 100644 (file)
--- a/src/bootlogd.c
+++ b/src/bootlogd.c
@@ -198,7 +198,7 @@ int findpty(int *master, int *slave, char *name)
                }
                if (found) break;
        }
-       if (found < 0) return -1;
+       if (!found) return -1;
 
        if (name) strcpy(name, tty);