diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-10-12 20:36:17 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-10-12 20:36:17 +0000 |
| commit | cccc2cd2cda6caa1134e0a28330a80676873779a (patch) | |
| tree | 378cbc744b1142098b8491e61379b5647f9d9e58 /libexec/ld.so/library.c | |
| parent | d85e2244b5db594ad7228c8ecf69d3807d39e4a3 (diff) | |
Split grpsym_list creation away from child_list creation and change
grpsym_list order to match Sun's docs. Also corrects bugs where
grpsym_list was either not created or partially created.
Diffstat (limited to 'libexec/ld.so/library.c')
| -rw-r--r-- | libexec/ld.so/library.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c index 753f0b53617..c6afa737c6b 100644 --- a/libexec/ld.so/library.c +++ b/libexec/ld.so/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.49 2005/10/09 04:29:13 kurt Exp $ */ +/* $OpenBSD: library.c,v 1.50 2005/10/12 20:36:16 kurt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -91,7 +91,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags) object = _dl_lookup_object(libname); if (object) { - object->load_object->obj_flags |= flags & RTLD_GLOBAL; + object->obj_flags |= flags & RTLD_GLOBAL; if (_dl_loading_object == NULL) _dl_loading_object = object; if (object->load_object != _dl_objects && @@ -115,7 +115,7 @@ _dl_tryload_shlib(const char *libname, int type, int flags) for (object = _dl_objects; object != NULL; object = object->next) { if (object->dev == sb.st_dev && object->inode == sb.st_ino) { - object->load_object->obj_flags |= flags & RTLD_GLOBAL; + object->obj_flags |= flags & RTLD_GLOBAL; _dl_close(libfile); if (_dl_loading_object == NULL) _dl_loading_object = object; |