From owner-p4-projects@FreeBSD.ORG  Mon Jul 21 12:53:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E126337B408; Mon, 21 Jul 2003 12:53:35 -0700 (PDT)
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 785DE37B401
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 12:53:35 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DE57C43F85
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 12:53:34 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h6LJrY0U060822
	for <perforce@freebsd.org>; Mon, 21 Jul 2003 12:53:34 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h6LJrYIg060819
	for perforce@freebsd.org; Mon, 21 Jul 2003 12:53:34 -0700 (PDT)
Date: Mon, 21 Jul 2003 12:53:34 -0700 (PDT)
Message-Id: <200307211953.h6LJrYIg060819@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 34785 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: Mon, 21 Jul 2003 19:53:36 -0000

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

Change 34785 by des@des.at.des.thinksec.com on 2003/07/21 12:52:56

	Revert the previous commit.  It seemed like a good idea at the time,
	but it breaks at least one module in -CURRENT.

Affected files ...

.. //depot/projects/openpam/include/security/pam_types.h#13 edit

Differences ...

==== //depot/projects/openpam/include/security/pam_types.h#13 (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/include/security/pam_types.h#12 $
+ * $P4: //depot/projects/openpam/include/security/pam_types.h#13 $
  */
 
 #ifndef _PAM_TYPES_H_INCLUDED
@@ -47,22 +47,22 @@
  * XSSO 5.1.1
  */
 struct pam_message {
-	int		 msg_style;
-	const char	*msg;
+	int	 msg_style;
+	char	*msg;
 };
 
 struct pam_response {
-	char		*resp;
-	int		 resp_retcode;
+	char	*resp;
+	int	 resp_retcode;
 };
 
 /*
  * XSSO 5.1.2
  */
 struct pam_conv {
-	int		(*conv)(int, const struct pam_message **,
-			    struct pam_response **, void *);
-	void		*appdata_ptr;
+	int	(*conv)(int, const struct pam_message **,
+	    struct pam_response **, void *);
+	void	*appdata_ptr;
 };
 
 /*
@@ -75,9 +75,9 @@
  * Solaris 9
  */
 typedef struct pam_repository {
-	char		*type;
-	void		*scope;
-	size_t		 scope_len;
+	char	*type;
+	void	*scope;
+	size_t	scope_len;
 } pam_repository_t;
 
 #ifdef __cplusplus