diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-10-10 16:33:52 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-10-10 16:33:52 +0000 |
| commit | b7b56e44d205a5b3350a6647f2da66dcd4897a89 (patch) | |
| tree | 247ee53bb3a6c8586bb7e607998b15b343d877ee /libexec/ld.so/loader.c | |
| parent | 4d7328af0d8545d1c5e98867adc169655e14f971 (diff) | |
set _dl_loading_object to NULL upon entering and exiting _dl_boot and
dlopen and cleanup of related redundant code. looks fine drahn@
Diffstat (limited to 'libexec/ld.so/loader.c')
| -rw-r--r-- | libexec/ld.so/loader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index 37c90362b6a..68342bf3851 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.95 2005/10/09 04:29:13 kurt Exp $ */ +/* $OpenBSD: loader.c,v 1.96 2005/10/10 16:33:51 kurt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -295,6 +295,7 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) TAILQ_INIT(&_dlopened_child_list); exe_obj = NULL; + _dl_loading_object = NULL; /* * Examine the user application and set up object information. */ @@ -311,9 +312,6 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) phdp++; } exe_obj->obj_flags = RTLD_GLOBAL; - exe_obj->load_object = exe_obj; - TAILQ_INIT(&exe_obj->grpsym_list); - TAILQ_INIT(&exe_obj->grpref_list); n = _dl_malloc(sizeof *n); if (n == NULL) @@ -446,6 +444,8 @@ _dl_boot(const char **argv, char **envp, const long loff, long *dl_data) if (_dl_traceld) _dl_exit(0); + _dl_loading_object = NULL; + _dl_fixup_user_env(); /* |