From owner-svn-src-stable-8@FreeBSD.ORG  Wed Nov 24 22:44:10 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63A7C106566B;
	Wed, 24 Nov 2010 22:44:10 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 517908FC15;
	Wed, 24 Nov 2010 22:44:10 +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 oAOMiA7L085681;
	Wed, 24 Nov 2010 22:44:10 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAOMiAUT085679;
	Wed, 24 Nov 2010 22:44:10 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201011242244.oAOMiAUT085679@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 24 Nov 2010 22:44:10 +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: r215809 - stable/8/usr.bin/ldd
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Nov 2010 22:44:10 -0000

Author: obrien
Date: Wed Nov 24 22:44:10 2010
New Revision: 215809
URL: http://svn.freebsd.org/changeset/base/215809

Log:
  MFC: r215705: hdr.elf.e_ident[EI_OSABI] is not a bitmask

Modified:
  stable/8/usr.bin/ldd/ldd.c
Directory Properties:
  stable/8/usr.bin/ldd/   (props changed)

Modified: stable/8/usr.bin/ldd/ldd.c
==============================================================================
--- stable/8/usr.bin/ldd/ldd.c	Wed Nov 24 22:24:07 2010	(r215808)
+++ stable/8/usr.bin/ldd/ldd.c	Wed Nov 24 22:44:10 2010	(r215809)
@@ -331,7 +331,7 @@ is_executable(const char *fname, int fd,
 			return (0);
 		}
 		if (hdr.elf32.e_type == ET_DYN) {
-			if (hdr.elf32.e_ident[EI_OSABI] & ELFOSABI_FREEBSD) {
+			if (hdr.elf32.e_ident[EI_OSABI] == ELFOSABI_FREEBSD) {
 				*is_shlib = 1;
 				return (1);
 			}
@@ -373,7 +373,7 @@ is_executable(const char *fname, int fd,
 			return (0);
 		}
 		if (hdr.elf.e_type == ET_DYN) {
-			if (hdr.elf.e_ident[EI_OSABI] & ELFOSABI_FREEBSD) {
+			if (hdr.elf.e_ident[EI_OSABI] == ELFOSABI_FREEBSD) {
 				*is_shlib = 1;
 				return (1);
 			}