diff options
| author | peter <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-09-17 01:49:00 +0000 |
| commit | a51c9b66271f0551fb83b90a7db6c464eac2318b (patch) | |
| tree | 7d8147c99f6bfb34b7cb47ad46e24a4f7dc93102 /usr.sbin/keyserv | |
| parent | 2a4cb24fb4a35753b66a2503614b874481e35535 (diff) | |
| download | FreeBSD-src-a51c9b66271f0551fb83b90a7db6c464eac2318b.zip FreeBSD-src-a51c9b66271f0551fb83b90a7db6c464eac2318b.tar.gz | |
Initiate deorbit burn for the i386-only a.out related support. Moves are
under way to move the remnants of the a.out toolchain to ports. As the
comment in src/Makefile said, this stuff is deprecated and one should not
expect this to remain beyond 4.0-REL. It has already lasted WAY beyond
that.
Notable exceptions:
gcc - I have not touched the a.out generation stuff there.
ldd/ldconfig - still have some code to interface with a.out rtld.
old as/ld/etc - I have not removed these yet, pending their move to ports.
some includes - necessary for ldd/ldconfig for now.
Tested on: i386 (extensively), alpha
Diffstat (limited to 'usr.sbin/keyserv')
| -rw-r--r-- | usr.sbin/keyserv/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/keyserv/crypt_server.c | 29 |
2 files changed, 0 insertions, 32 deletions
diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index 170fa64..54075da 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -5,9 +5,6 @@ MAN= keyserv.8 SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. -.if $(OBJFORMAT) == elf -CFLAGS+= -DOBJFORMAT_ELF -.endif DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} LDADD= -lmp -lcrypto -lrpcsvc diff --git a/usr.sbin/keyserv/crypt_server.c b/usr.sbin/keyserv/crypt_server.c index edbdbc6..45f6f6e 100644 --- a/usr.sbin/keyserv/crypt_server.c +++ b/usr.sbin/keyserv/crypt_server.c @@ -171,11 +171,7 @@ static void *dlhandle; #endif #ifndef LIBCRYPTO -#ifdef OBJFORMAT_ELF #define LIBCRYPTO "libcrypto.so.2" -#else -#define LIBCRYPTO "libcrypto.so.2." -#endif /* OBJFORMAT_ELF */ #endif void load_des(warn, libpath) @@ -185,37 +181,12 @@ void load_des(warn, libpath) char dlpath[MAXPATHLEN]; if (libpath == NULL) { -#ifdef OBJFORMAT_ELF snprintf(dlpath, sizeof(dlpath), "%s/%s", _PATH_USRLIB, LIBCRYPTO); -#else - len = strlen(LIBCRYPTO); - if ((dird = opendir(_PATH_USRLIB)) == NULL) - err(1, "opendir(/usr/lib) failed"); - - while ((dirp = readdir(dird)) != NULL) { - /* must have a minor number */ - if (strlen(dirp->d_name) <= len) - continue; - if (!strncmp(dirp->d_name, LIBCRYPTO, len)) { - if (atoi((dirp->d_name + len + 1)) > minor) { - minor = atoi((dirp->d_name + len + 1)); - snprintf(dlpath,sizeof(dlpath),"%s/%s", - _PATH_USRLIB, dirp->d_name); - } - } - } - - closedir(dird); -#endif /* OBJFORMAT_ELF */ } else snprintf(dlpath, sizeof(dlpath), "%s", libpath); if (dlpath != NULL && (dlhandle = dlopen(dlpath, 0444)) != NULL) -#ifdef OBJFORMAT_ELF _my_crypt = (int (*)())dlsym(dlhandle, "_des_crypt"); -#else - _my_crypt = (int (*)())dlsym(dlhandle, "__des_crypt"); -#endif /* OBJFORMAT_ELF */ if (_my_crypt == NULL) { if (dlhandle != NULL) |
