From owner-svn-src-vendor@FreeBSD.ORG  Sat Sep  7 19:27:59 2013
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 22017F5;
 Sat,  7 Sep 2013 19:27:59 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FBDA2103;
 Sat,  7 Sep 2013 19:27:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r87JRwtX022424;
 Sat, 7 Sep 2013 19:27:58 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r87JRwqN022423;
 Sat, 7 Sep 2013 19:27:58 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309071927.r87JRwqN022423@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sat, 7 Sep 2013 19:27:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r255375 - vendor/openpam/dist/lib/libpam
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Sep 2013 19:27:59 -0000

Author: des
Date: Sat Sep  7 19:27:58 2013
New Revision: 255375
URL: http://svnweb.freebsd.org/changeset/base/255375

Log:
  Merge upstream r743: caught_signal should be static.

Modified:
  vendor/openpam/dist/lib/libpam/openpam_ttyconv.c

Modified: vendor/openpam/dist/lib/libpam/openpam_ttyconv.c
==============================================================================
--- vendor/openpam/dist/lib/libpam/openpam_ttyconv.c	Sat Sep  7 19:16:02 2013	(r255374)
+++ vendor/openpam/dist/lib/libpam/openpam_ttyconv.c	Sat Sep  7 19:27:58 2013	(r255375)
@@ -58,7 +58,7 @@
 
 int openpam_ttyconv_timeout = 0;
 
-volatile sig_atomic_t caught_signal;
+static volatile sig_atomic_t caught_signal;
 
 /*
  * Handle incoming signals during tty conversation