Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Nov 2010 22:44:10 +0000 (UTC)
From:      "David E. O'Brien" <obrien@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r215809 - stable/8/usr.bin/ldd
Message-ID:  <201011242244.oAOMiAUT085679@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 			}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011242244.oAOMiAUT085679>