svn commit: r215809 - stable/8/usr.bin/ldd

David E. O'Brien obrien at FreeBSD.org
Wed Nov 24 22:44:10 UTC 2010


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);
 			}


More information about the svn-src-all mailing list