From owner-svn-src-all@FreeBSD.ORG  Wed Oct 12 21:06:54 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 698B1106566B;
	Wed, 12 Oct 2011 21:06:54 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 582AE8FC08;
	Wed, 12 Oct 2011 21:06:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9CL6skU084274;
	Wed, 12 Oct 2011 21:06:54 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9CL6s6w084271;
	Wed, 12 Oct 2011 21:06:54 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201110122106.p9CL6s6w084271@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 12 Oct 2011 21:06:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226327 - in stable/8/contrib/openpam: doc/man
	include/security
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 21:06:54 -0000

Author: des
Date: Wed Oct 12 21:06:54 2011
New Revision: 226327
URL: http://svn.freebsd.org/changeset/base/226327

Log:
  MFH r197899: grammar nit in pam.conf(5)
  MFH r205441: remove OPENPAM_NONNULL from pam_end()

Modified:
  stable/8/contrib/openpam/doc/man/pam.conf.5
  stable/8/contrib/openpam/include/security/pam_appl.h
Directory Properties:
  stable/8/contrib/openpam/   (props changed)

Modified: stable/8/contrib/openpam/doc/man/pam.conf.5
==============================================================================
--- stable/8/contrib/openpam/doc/man/pam.conf.5	Wed Oct 12 21:02:58 2011	(r226326)
+++ stable/8/contrib/openpam/doc/man/pam.conf.5	Wed Oct 12 21:06:54 2011	(r226327)
@@ -109,7 +109,7 @@ will be failure regardless of the succes
 .It Cm requisite
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
-If it module fails, the chain is broken and the result is failure.
+If the module fails, the chain is broken and the result is failure.
 .It Cm sufficient
 If this module succeeds, the chain is broken and the result is
 success.

Modified: stable/8/contrib/openpam/include/security/pam_appl.h
==============================================================================
--- stable/8/contrib/openpam/include/security/pam_appl.h	Wed Oct 12 21:02:58 2011	(r226326)
+++ stable/8/contrib/openpam/include/security/pam_appl.h	Wed Oct 12 21:06:54 2011	(r226327)
@@ -72,8 +72,7 @@ pam_close_session(pam_handle_t *_pamh,
 
 int
 pam_end(pam_handle_t *_pamh,
-	int _status)
-	OPENPAM_NONNULL((1));
+	int _status);
 
 int
 pam_get_data(const pam_handle_t *_pamh,