From owner-svn-src-all@FreeBSD.ORG  Fri Jun 11 15:26:16 2010
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 1D5011065674;
	Fri, 11 Jun 2010 15:26:16 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BC1E8FC17;
	Fri, 11 Jun 2010 15:26:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5BFQFLj014015;
	Fri, 11 Jun 2010 15:26:15 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5BFQFN8014013;
	Fri, 11 Jun 2010 15:26:15 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201006111526.o5BFQFN8014013@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 11 Jun 2010 15:26:15 +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: r209047 - stable/8/lib/libc/posix1e
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: Fri, 11 Jun 2010 15:26:16 -0000

Author: trasz
Date: Fri Jun 11 15:26:15 2010
New Revision: 209047
URL: http://svn.freebsd.org/changeset/base/209047

Log:
  MFC r208811:
  
  Don't use pointer to 64 bit value (id_t) to point to 32 bit value (uid_t).
  
  Found with:	Coverity Prevent
  CID:		7466, 7467
  Approved by:	re (kib)

Modified:
  stable/8/lib/libc/posix1e/acl_to_text_nfs4.c
Directory Properties:
  stable/8/lib/libc/   (props changed)
  stable/8/lib/libc/stdtime/   (props changed)

Modified: stable/8/lib/libc/posix1e/acl_to_text_nfs4.c
==============================================================================
--- stable/8/lib/libc/posix1e/acl_to_text_nfs4.c	Fri Jun 11 15:21:12 2010	(r209046)
+++ stable/8/lib/libc/posix1e/acl_to_text_nfs4.c	Fri Jun 11 15:26:15 2010	(r209047)
@@ -50,7 +50,7 @@ format_who(char *str, size_t size, const
 	acl_tag_t tag;
 	struct passwd *pwd;
 	struct group *grp;
-	id_t *id;
+	uid_t *id;
 
 	error = acl_get_tag_type(entry, &tag);
 	if (error)
@@ -62,7 +62,7 @@ format_who(char *str, size_t size, const
 		break;
 
 	case ACL_USER:
-		id = (id_t *)acl_get_qualifier(entry);
+		id = (uid_t *)acl_get_qualifier(entry);
 		if (id == NULL)
 			return (-1);
 		/* XXX: Thread-unsafe. */
@@ -81,7 +81,7 @@ format_who(char *str, size_t size, const
 		break;
 
 	case ACL_GROUP:
-		id = (id_t *)acl_get_qualifier(entry);
+		id = (uid_t *)acl_get_qualifier(entry);
 		if (id == NULL)
 			return (-1);
 		/* XXX: Thread-unsafe. */
@@ -141,7 +141,7 @@ format_additional_id(char *str, size_t s
 {
 	int error;
 	acl_tag_t tag;
-	id_t *id;
+	uid_t *id;
 
 	error = acl_get_tag_type(entry, &tag);
 	if (error)
@@ -155,7 +155,7 @@ format_additional_id(char *str, size_t s
 		break;
 
 	default:
-		id = (id_t *)acl_get_qualifier(entry);
+		id = (uid_t *)acl_get_qualifier(entry);
 		if (id == NULL)
 			return (-1);
 		snprintf(str, size, ":%d", (unsigned int)*id);