summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2011-07-03 21:37:40 +0000
committerkrw <krw@openbsd.org>2011-07-03 21:37:40 +0000
commit56d63e2b9b0eff5f629b2a0a41648aaecc37c576 (patch)
tree229d9240f1aaa5d7d9ebc78cb8a62b322048a4ce
parentman page for nvt(4) (diff)
downloadwireguard-openbsd-56d63e2b9b0eff5f629b2a0a41648aaecc37c576.tar.xz
wireguard-openbsd-56d63e2b9b0eff5f629b2a0a41648aaecc37c576.zip
Bring in millert@ thinko fix for '_' handling from r1.47 of
libc/gen/nlist.c.
-rw-r--r--sys/arch/amd64/stand/installboot/nlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/stand/installboot/nlist.c b/sys/arch/amd64/stand/installboot/nlist.c
index b0c22dd3ddc..2dbdce9babb 100644
--- a/sys/arch/amd64/stand/installboot/nlist.c
+++ b/sys/arch/amd64/stand/installboot/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.9 2011/07/03 21:02:10 krw Exp $ */
+/* $OpenBSD: nlist.c,v 1.10 2011/07/03 21:37:40 krw Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -424,7 +424,7 @@ __elf_fdnlist(int fd, struct nlist *list)
*/
sym = p->n_un.n_name;
if (strcmp(&strtab[soff], sym) != 0 &&
- ((sym[0] == '_') &&
+ (sym[0] != '_' ||
strcmp(&strtab[soff], sym + 1) != 0))
continue;