From: Steve Langasek <vorlon@debian.org>
Date: Wed, 29 Aug 2007 10:30:11 +0000 (+0000)
Subject: Relevant BUGIDs: Debian bug #440019
X-Git-Tag: Linux-PAM-0_99_9_0~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4663ceaeb052c28354afc212da8f25dbc53e969;p=linux-pam

Relevant BUGIDs: Debian bug #440019

Purpose of commit: bugfix

Commit summary:
---------------
2007-08-29  Steve Langasek <vorlon@debian.org>

        * modules/pam_rhosts/pam_rhosts_auth.c: getline returns -1 at
        EOF, not 0.  Check accordingly to fix an infinite loop.  Thanks
        to Stephan Springl <springl-rhosts@bfw-online.de> for catching
        this.
---

diff --git a/ChangeLog b/ChangeLog
index edf1c827..b3a00aed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-29  Steve Langasek <vorlon@debian.org>
+
+	* modules/pam_rhosts/pam_rhosts_auth.c: getline returns -1 at
+	EOF, not 0.  Check accordingly to fix an infinite loop.  Thanks
+	to Stephan Springl <springl-rhosts@bfw-online.de> for catching
+	this.
+
 2007-08-28  Steve Langasek <vorlon@debian.org>
 
 	* configure.in: call AC_CHECK_HEADERS instead of AC_CHECK_HEADER
diff --git a/modules/pam_rhosts/pam_rhosts_auth.c b/modules/pam_rhosts/pam_rhosts_auth.c
index d50ed478..a798c1f0 100644
--- a/modules/pam_rhosts/pam_rhosts_auth.c
+++ b/modules/pam_rhosts/pam_rhosts_auth.c
@@ -352,7 +352,7 @@ __ivaliduser (pam_handle_t *pamh, struct _options *opts,
     char *buf=NULL;
     int buflen=0;
 
-    while (getline(&buf,&buflen,hostf)) {
+    while (getline(&buf,&buflen,hostf) > 0) {
 #else
     char buf[MAXHOSTNAMELEN + 128];                       /* host + login */