From cec94710e3355bd0531e38a7f6b1a8631f1014b8 Mon Sep 17 00:00:00 2001 From: pk Date: Thu, 17 Dec 1998 11:47:20 +0000 Subject: [PATCH] ldconfig(8) now lives in `src/sbin/ldconfig' --- gnu/usr.bin/ld/ldconfig/Makefile | 19 - gnu/usr.bin/ld/ldconfig/ldconfig.8 | 151 -------- gnu/usr.bin/ld/ldconfig/ldconfig.c | 569 ----------------------------- 3 files changed, 739 deletions(-) delete mode 100644 gnu/usr.bin/ld/ldconfig/Makefile delete mode 100644 gnu/usr.bin/ld/ldconfig/ldconfig.8 delete mode 100644 gnu/usr.bin/ld/ldconfig/ldconfig.c diff --git a/gnu/usr.bin/ld/ldconfig/Makefile b/gnu/usr.bin/ld/ldconfig/Makefile deleted file mode 100644 index d0807766fe29..000000000000 --- a/gnu/usr.bin/ld/ldconfig/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: Makefile,v 1.13 1998/03/02 19:46:44 cgd Exp $ - -.include - -.if (${MACHINE_ARCH} == "i386") || \ - (${MACHINE_ARCH} == "m68k") || \ - (${MACHINE_ARCH} == "ns32k") || \ - (${MACHINE_ARCH} == "sparc") || \ - (${MACHINE_ARCH} == "vax") || \ - (${MACHINE_ARCH} == "arm32") -PROG= ldconfig -SRCS= ldconfig.c shlib.c etc.c -LDSTATIC?=-static -BINDIR= /sbin -.endif - -MAN= ldconfig.8 - -.include diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.8 b/gnu/usr.bin/ld/ldconfig/ldconfig.8 deleted file mode 100644 index 3d5009a3456a..000000000000 --- a/gnu/usr.bin/ld/ldconfig/ldconfig.8 +++ /dev/null @@ -1,151 +0,0 @@ -.\" $NetBSD: ldconfig.8,v 1.9 1998/09/05 13:08:40 pk Exp $ -.\" -.\" Copyright (c) 1998 The NetBSD Foundation, Inc. -.\" All rights reserved. -.\" -.\" This code is derived from software contributed to The NetBSD Foundation -.\" by Paul Kranenburg. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the NetBSD -.\" Foundation, Inc. and its contributors. -.\" 4. Neither the name of The NetBSD Foundation nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -.\" POSSIBILITY OF SUCH DAMAGE. -.\" -.Dd August 24, 1997 -.Dt LDCONFIG 8 -.Os NetBSD -.Sh NAME -.Nm ldconfig -.Nd configure the shared library cache -.Sh SYNOPSIS -.Nm ldconfig -.Op Fl cmrsSv -.Op Ar directory Ar ... -.Sh DESCRIPTION -.Nm -is used to prepare a set of -.Dq hints -for use by the run-time linker -.Nm ld.so -to facilitate quick lookup of shared libraries available in multiple -directories. By default, it scans a set of built-in system directories, -directories listed in -.Pa /etc/ld.so.conf , -and any -.Ar directories -specified on the command line (in the given order) looking for shared -libraries and stores the results in the file -.Pa /var/run/ld.so.hints -to forestall the overhead that would otherwise result from the -directory search operations -.Nm ld.so -would have to perform to load required shared libraries. -.Pp -The shared libraries so found will be automatically available for loading -if needed by the program being prepared for execution. This obviates the need -for storing search paths within the executable. -.Pp -The -.Ev LD_LIBRARY_PATH -environment variable can be used to override the use of -directories (or the order thereof) from the cache or to specify additional -directories where shared libraries might be found. -.Ev LD_LIBRARY_PATH -is a -.Sq \: -separated list of directory paths that are searched by -.Nm ld.so -when it needs to load a shared library. It can be viewed as the run-time -equivalent of the -.Fl L -switch of -.Nm ld . -.Pp -.Nm -is typically run as part of the boot sequence. -.Pp -The following options are recognized by -.Nm ldconfig : -.Bl -tag -width indent -.It Fl c -Do not scan directories listed in -.Pa /etc/ld.so.conf -for shared libraries. -.It Fl m -Merge the result of the scan of the directories given as arguments into -the existing hints file. The default action is to build the hints file afresh. -.It Fl r -Lists the current contents of -.Pa ld.so.hints -on the standard output. The hints file will not be modified. -.It Fl s -Do not scan the built-in system directory -.Pq Dq /usr/lib , -nor any directories listed in -.Pa /etc/ld.so.conf -for shared libraries. -.It Fl S -Do not scan the built-in system directory -.Pq Dq /usr/lib , -for shared libraries. (Directories listed in -.Pa /etc/ld.so.conf -are still scanned.) -.It Fl v -Switch on verbose mode. -.Sh Security -Special care must be taken when loading shared libraries into the address -space of -.Ev set-user-ID -programs. Whenever such a program is run, -.Nm ld.so -will only load shared libraries from the -.Pa ld.so.hints -file. In particular, the -.Ev LD_LIBRARY_PATH -is not used to search for libraries. Thus, the role of ldconfig is dual. In -addition to building a set of hints for quick lookup, it also serves to -specify the trusted collection of directories from which shared objects can -be safely loaded. It is presumed that the set of directories specified to -.Nm -is under control of the system's administrator. -.Nm ld.so -further assists set-user-ID programs by erasing the -.Ev LD_LIBRARY_PATH -from the environment. - -.Sh FILES -.Pa /var/run/ld.so.hints , -.Pa /etc/ld.so.conf -.Sh SEE ALSO -.Xr ld 1 , -.Xr ld.so 1 , -.Xr ld.so.conf 5 , -.Xr link 5 -.Sh HISTORY -A -.Nm -utility first appeared in SunOS 4.0, it appeared in its current form -in NetBSD 0.9a. diff --git a/gnu/usr.bin/ld/ldconfig/ldconfig.c b/gnu/usr.bin/ld/ldconfig/ldconfig.c deleted file mode 100644 index 1bdf807d7546..000000000000 --- a/gnu/usr.bin/ld/ldconfig/ldconfig.c +++ /dev/null @@ -1,569 +0,0 @@ -/* $NetBSD: ldconfig.c,v 1.21 1998/12/15 22:27:14 pk Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Paul Kranenburg. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ld.h" - -#define _PATH_LD_SO_CONF "/etc/ld.so.conf" - -#undef major -#undef minor - -extern char *__progname; - -static int verbose; -static int nostd; -static int noconf; -static int justread; -static int merge; - -struct shlib_list { - /* Internal list of shared libraries found */ - char *name; - char *path; - int dewey[MAXDEWEY]; - int ndewey; -#define major dewey[0] -#define minor dewey[1] - struct shlib_list *next; -}; - -static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; -static char *dir_list; - -static void enter __P((char *, char *, char *, int *, int)); -static int dodir __P((char *, int, int)); -static int do_conf __P((void)); -static int buildhints __P((void)); -static int readhints __P((void)); -static void listhints __P((void)); -static int hinthash __P((char *, int, int)); -int main __P((int, char *[])); - -int -main(argc, argv) - int argc; - char *argv[]; -{ - int i, c; - int rval = 0; - - while ((c = getopt(argc, argv, "cmrsSv")) != -1) { - switch (c) { - case 'c': - noconf = 1; - break; - case 'm': - merge = 1; - break; - case 'r': - justread = 1; - break; - case 's': - nostd = 1; - noconf = 1; - break; - case 'S': - nostd = 1; - break; - case 'v': - verbose = 1; - break; - default: - errx(1, "Usage: %s [-c][-m][-r][-s][-S][-v][dir ...]", - __progname); - break; - } - } - - dir_list = xmalloc(1); - *dir_list = '\0'; - - if (justread || merge) { - if ((rval = readhints()) != 0) - return (rval); - if (justread) { - listhints(); - return (rval); - } - } - - if (!nostd && !merge) - std_search_path(); - - for (i = 0; i < n_search_dirs; i++) - rval |= dodir(search_dirs[i], 1, 0); - - if (!noconf && !merge) - rval |= do_conf(); - - for (i = optind; i < argc; i++) { - rval |= dodir(argv[i], 0, 1); - } - - rval |= buildhints(); - - return (rval); -} - -int -do_conf () -{ - FILE *conf; - char *line, *c; - char *cline = NULL; - size_t len; - int rval = 0; - - if ((conf = fopen(_PATH_LD_SO_CONF, "r")) == NULL) - return (-1); - - while ((line = fgetln(conf, &len)) != NULL) { - if (*line == '#' || *line == '\n') - continue; - - if (line[len-1] == '\n') { - line[--len] = '\0'; - } else { - cline = xmalloc(len+1); - bcopy(line, cline, len); - line = cline; - line[len] = '\0'; - } - - while (isblank(*line)) { line++; len--; } - if ((c = strchr(line, '#')) == NULL) - c = line + len; - while (--c >= line && isblank(*c)) continue; - if (c >= line) { - *++c = '\0'; - rval |= dodir(line, 0, 1); - } - - if (cline) { - free(cline); - cline = NULL; - } - } - - return (rval); -} - -int -dodir(dir, silent, update_dir_list) - char *dir; - int silent; - int update_dir_list; -{ - DIR *dd; - struct dirent *dp; - char name[MAXPATHLEN]; - int dewey[MAXDEWEY], ndewey; - - if ((dd = opendir(dir)) == NULL) { - if (!silent || errno != ENOENT) - warn("%s", dir); - return (-1); - } - - if (update_dir_list) { - /* Check for duplicates? */ - char *cp = concat(dir_list, *dir_list?":":"", dir); - free(dir_list); - dir_list = cp; - } - - while ((dp = readdir(dd)) != NULL) { - int n; - char *cp; - - /* Check for `lib' prefix */ - if (dp->d_name[0] != 'l' || - dp->d_name[1] != 'i' || - dp->d_name[2] != 'b') - continue; - - /* Copy the entry minus prefix */ - (void)strcpy(name, dp->d_name + 3); - n = strlen(name); - if (n < 4) - continue; - - /* Find ".so." in name */ - for (cp = name + n - 4; cp > name; --cp) { - if (cp[0] == '.' && - cp[1] == 's' && - cp[2] == 'o' && - cp[3] == '.') - break; - } - if (cp <= name) - continue; - - *cp = '\0'; - if (!isdigit(*(cp+4))) - continue; - - bzero((caddr_t)dewey, sizeof(dewey)); - ndewey = getdewey(dewey, cp + 4); - enter(dir, dp->d_name, name, dewey, ndewey); - } - - return (0); -} - -static void -enter(dir, file, name, dewey, ndewey) - char *dir, *file, *name; - int dewey[], ndewey; -{ - struct shlib_list *shp; - - for (shp = shlib_head; shp; shp = shp->next) { - if (strcmp(name, shp->name) != 0 || major != shp->major) - continue; - - /* Name matches existing entry */ - if (cmpndewey(dewey, ndewey, shp->dewey, shp->ndewey) > 0) { - - /* Update this entry with higher versioned lib */ - if (verbose) - printf("Updating lib%s.%d.%d to %s/%s\n", - shp->name, shp->major, shp->minor, - dir, file); - - free(shp->name); - shp->name = strdup(name); - free(shp->path); - shp->path = concat(dir, "/", file); - bcopy(dewey, shp->dewey, sizeof(shp->dewey)); - shp->ndewey = ndewey; - } - break; - } - - if (shp) - /* Name exists: older version or just updated */ - return; - - /* Allocate new list element */ - if (verbose) - printf("Adding %s/%s\n", dir, file); - - shp = (struct shlib_list *)xmalloc(sizeof *shp); - shp->name = strdup(name); - shp->path = concat(dir, "/", file); - bcopy(dewey, shp->dewey, MAXDEWEY); - shp->ndewey = ndewey; - shp->next = NULL; - - *shlib_tail = shp; - shlib_tail = &shp->next; -} - - -#if DEBUG -/* test */ -#undef _PATH_LD_HINTS -#define _PATH_LD_HINTS "./ld.so.hints" -#endif - -/* XXX - should be a common function with rtld.c */ -int -hinthash(cp, vmajor, vminor) - char *cp; - int vmajor, vminor; -{ - int k = 0; - - while (*cp) - k = (((k << 1) + (k >> 14)) ^ (*cp++)) & 0x3fff; - - k = (((k << 1) + (k >> 14)) ^ (vmajor*257)) & 0x3fff; -#if 0 - k = (((k << 1) + (k >> 14)) ^ (vminor*167)) & 0x3fff; -#endif - - return (k); -} - -int -buildhints() -{ - struct hints_header hdr; - struct hints_bucket *blist; - struct shlib_list *shp; - char *strtab; - int i, n, str_index = 0; - int strtab_sz = 0; /* Total length of strings */ - int nhints = 0; /* Total number of hints */ - int fd; - char *tmpfile; - - for (shp = shlib_head; shp; shp = shp->next) { - strtab_sz += 1 + strlen(shp->name); - strtab_sz += 1 + strlen(shp->path); - nhints++; - } - - /* Fill hints file header */ - hdr.hh_magic = HH_MAGIC; - hdr.hh_version = LD_HINTS_VERSION_2; - hdr.hh_nbucket = 1 * nhints; - n = hdr.hh_nbucket * sizeof(struct hints_bucket); - hdr.hh_hashtab = sizeof(struct hints_header); - hdr.hh_strtab = hdr.hh_hashtab + n; - hdr.hh_dirlist = strtab_sz; - strtab_sz += 1 + strlen(dir_list); - hdr.hh_strtab_sz = strtab_sz; - hdr.hh_ehints = hdr.hh_strtab + hdr.hh_strtab_sz; - - if (verbose) - printf("Totals: entries %d, buckets %ld, string size %d\n", - nhints, hdr.hh_nbucket, strtab_sz); - - /* Allocate buckets and string table */ - blist = (struct hints_bucket *)xmalloc(n); - bzero((char *)blist, n); - for (i = 0; i < hdr.hh_nbucket; i++) - /* Empty all buckets */ - blist[i].hi_next = -1; - - strtab = (char *)xmalloc(strtab_sz); - - /* Enter all */ - for (shp = shlib_head; shp; shp = shp->next) { - struct hints_bucket *bp; - - bp = blist + - (hinthash(shp->name, shp->major, shp->minor) % hdr.hh_nbucket); - - if (bp->hi_pathx) { - int i; - - for (i = 0; i < hdr.hh_nbucket; i++) { - if (blist[i].hi_pathx == 0) - break; - } - if (i == hdr.hh_nbucket) { - warnx("Bummer!"); - return (-1); - } - while (bp->hi_next != -1) - bp = &blist[bp->hi_next]; - bp->hi_next = i; - bp = blist + i; - } - - /* Insert strings in string table */ - bp->hi_namex = str_index; - strcpy(strtab + str_index, shp->name); - str_index += 1 + strlen(shp->name); - - bp->hi_pathx = str_index; - strcpy(strtab + str_index, shp->path); - str_index += 1 + strlen(shp->path); - - /* Copy versions */ - bcopy(shp->dewey, bp->hi_dewey, sizeof(bp->hi_dewey)); - bp->hi_ndewey = shp->ndewey; - } - - /* Copy search directories */ - strcpy(strtab + str_index, dir_list); - str_index += 1 + strlen(dir_list); - - /* Sanity check */ - if (str_index != strtab_sz) { - errx(1, "str_index(%d) != strtab_sz(%d)", str_index, strtab_sz); - } - - tmpfile = concat(_PATH_LD_HINTS, ".XXXXXX", ""); - if ((fd = mkstemp(tmpfile)) == -1) { - warn("%s", tmpfile); - return (-1); - } - - if (write(fd, &hdr, sizeof(struct hints_header)) != - sizeof(struct hints_header)) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - if (write(fd, blist, hdr.hh_nbucket * sizeof(struct hints_bucket)) != - hdr.hh_nbucket * sizeof(struct hints_bucket)) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - if (write(fd, strtab, strtab_sz) != strtab_sz) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - if (fchmod(fd, 0444) == -1) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - if (close(fd) != 0) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - - /* Install it */ - if (unlink(_PATH_LD_HINTS) != 0 && errno != ENOENT) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - - if (rename(tmpfile, _PATH_LD_HINTS) != 0) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - - return (0); -} - -static int -readhints() -{ - int fd; - caddr_t addr; - long msize; - struct hints_header *hdr; - struct hints_bucket *blist; - char *strtab; - struct shlib_list *shp; - int i; - - if ((fd = open(_PATH_LD_HINTS, O_RDONLY, 0)) == -1) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - - msize = getpagesize(); - addr = mmap(0, msize, PROT_READ, MAP_FILE|MAP_COPY, fd, 0); - - if (addr == (caddr_t)-1) { - warn("%s", _PATH_LD_HINTS); - return (-1); - } - - hdr = (struct hints_header *)addr; - if (HH_BADMAG(*hdr)) { - warnx("%s: Bad magic: %lo", - _PATH_LD_HINTS, hdr->hh_magic); - return (-1); - } - - if (hdr->hh_version != LD_HINTS_VERSION_2) { - warnx("Unsupported version: %ld", hdr->hh_version); - return (-1); - } - - if (hdr->hh_ehints > msize) { - if (mmap(addr+msize, hdr->hh_ehints - msize, - PROT_READ, MAP_FILE|MAP_COPY|MAP_FIXED, - fd, msize) != (caddr_t)(addr+msize)) { - - warn("%s", _PATH_LD_HINTS); - return (-1); - } - } - close(fd); - - blist = (struct hints_bucket *)(addr + hdr->hh_hashtab); - strtab = (char *)(addr + hdr->hh_strtab); - - for (i = 0; i < hdr->hh_nbucket; i++) { - struct hints_bucket *bp = &blist[i]; - - /* Sanity check */ - if (bp->hi_namex >= hdr->hh_strtab_sz) { - warnx("Bad name index: %#x", bp->hi_namex); - return (-1); - } - if (bp->hi_pathx >= hdr->hh_strtab_sz) { - warnx("Bad path index: %#x", bp->hi_pathx); - return (-1); - } - - /* Allocate new list element */ - shp = (struct shlib_list *)xmalloc(sizeof *shp); - shp->name = strdup(strtab + bp->hi_namex); - shp->path = strdup(strtab + bp->hi_pathx); - bcopy(bp->hi_dewey, shp->dewey, sizeof(shp->dewey)); - shp->ndewey = bp->hi_ndewey; - shp->next = NULL; - - *shlib_tail = shp; - shlib_tail = &shp->next; - } - dir_list = strdup(strtab + hdr->hh_dirlist); - - return (0); -} - -static void -listhints() -{ - struct shlib_list *shp; - int i; - - printf("%s:\n", _PATH_LD_HINTS); - printf("\tsearch directories: %s\n", dir_list); - - for (i = 0, shp = shlib_head; shp; i++, shp = shp->next) - printf("\t%d:-l%s.%d.%d => %s\n", - i, shp->name, shp->major, shp->minor, shp->path); - - return; -}