summaryrefslogtreecommitdiff
path: root/libexec/ld.so/library_subr.c
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2012-03-21 04:28:46 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2012-03-21 04:28:46 +0000
commitfb44f6e2a6eef242e86c5b9ef8587ebbf7bcd71c (patch)
treef3f232a366316025b8abee5f5028cbc543bb9266 /libexec/ld.so/library_subr.c
parentc09f28795f27fd0d377dd9a77a45691c6860df93 (diff)
Switch ld.so's _dl_opendir functions to use a locally defined
_dl_dirdesc struct (containing just the fields ld.so's implementation actually needs) instead of reusing libc's _dirdesc struct. Also, switch ldconfig to use futimens() instead of futimes(). ok deraadt@
Diffstat (limited to 'libexec/ld.so/library_subr.c')
-rw-r--r--libexec/ld.so/library_subr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/ld.so/library_subr.c b/libexec/ld.so/library_subr.c
index 23243868803..62beabcedd0 100644
--- a/libexec/ld.so/library_subr.c
+++ b/libexec/ld.so/library_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: library_subr.c,v 1.35 2011/11/28 20:59:03 guenther Exp $ */
+/* $OpenBSD: library_subr.c,v 1.36 2012/03/21 04:28:45 matthew Exp $ */
/*
* Copyright (c) 2002 Dale Rahn
@@ -131,7 +131,7 @@ _dl_find_shlib(struct sod *sodp, const char *searchpath, int nohints)
struct dirent *dp;
const char *pp;
int match, len;
- DIR *dd;
+ _dl_DIR *dd;
struct sod tsod, bsod; /* transient and best sod */
/* if we are to search default directories, and hints