From owner-p4-projects@FreeBSD.ORG  Tue Feb  1 11:00:44 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B596416A4DE; Tue,  1 Feb 2005 11:00:43 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 899D516A4D9
	for <perforce@freebsd.org>; Tue,  1 Feb 2005 11:00:43 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 49A1343D1D
	for <perforce@freebsd.org>; Tue,  1 Feb 2005 11:00:32 +0000 (GMT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j11B0WQS040292
	for <perforce@freebsd.org>; Tue, 1 Feb 2005 11:00:32 GMT
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j11B0VIt040289
	for perforce@freebsd.org; Tue, 1 Feb 2005 11:00:31 GMT
	(envelope-from des@freebsd.org)
Date: Tue, 1 Feb 2005 11:00:31 GMT
Message-Id: <200502011100.j11B0VIt040289@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 70082 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Feb 2005 11:00:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=70082

Change 70082 by des@des.at.des.thinksec.com on 2005/02/01 11:00:02

	Leave alarm() alone if openpam_ttyconv_timeout is zero or negative.
	Also bobbit an unused variable.
	
	Obtained from:	NetBSD

Affected files ...

.. //depot/projects/openpam/lib/openpam_ttyconv.c#26 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_ttyconv.c#26 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#25 $
+ * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#26 $
  */
 
 #include <sys/types.h>
@@ -66,7 +66,7 @@
 	struct sigaction action, saved_action;
 	sigset_t saved_sigset, sigset;
 	unsigned int saved_alarm;
-	int eof, error, fd, timed_out;
+	int eof, error, fd;
 	size_t len;
 	char *retval;
 	char ch;
@@ -86,9 +86,9 @@
 #endif
 	fd = fileno(stdin);
 	buf[0] = '\0';
-	timed_out = 0;
-	eof = error = timed_out = 0;
-	saved_alarm = alarm(openpam_ttyconv_timeout);
+	eof = error = 0;
+	if (openpam_ttyconv_timeout >= 0)
+		saved_alarm = alarm(openpam_ttyconv_timeout);
 	ch = '\0';
 	for (len = 0; ch != '\n' && !eof && !error; ++len) {
 		switch (read(fd, &ch, 1)) {
@@ -106,10 +106,12 @@
 			break;
 		}
 	}
-	alarm(0);
+	if (openpam_ttyconv_timeout >= 0)
+		alarm(0);
 	sigaction(SIGALRM, &saved_action, NULL);
 	sigprocmask(SIG_SETMASK, &saved_sigset, NULL);
-	alarm(saved_alarm);
+	if (openpam_ttyconv_timeout >= 0)
+		alarm(saved_alarm);
 	if (error == EINTR)
 		fputs(" timeout!", stderr);
 	if (error || eof) {