rip out bundled dbm, we've always used our dbm

From: Daniel Ouellet <daniel@presscom.net>

14 files changed, 1 insertions, 2202 deletions

diff --git a/usr.sbin/httpd/INSTALL.SSL b/usr.sbin/httpd/INSTALL.SSL
index 34d5c8fd85e..1b25cd23312 100644
--- a/usr.sbin/httpd/INSTALL.SSL
+++ b/usr.sbin/httpd/INSTALL.SSL
@@ -204,7 +204,6 @@
               --prefix=/path/to/apache \                                   ALL
              [--enable-shared=ssl] \                                  OPTIONAL
              [--disable-rule=SSL_COMPAT] \                            OPTIONAL
-             [--enable-rule=SSL_SDBM] \                               OPTIONAL
              [--enable-rule=SSL_EXPERIMENTAL] \                       OPTIONAL
              [--enable-rule=SSL_VENDOR] \                             OPTIONAL
              [...more APACI options...]                               OPTIONAL
@@ -239,13 +238,6 @@
               SSL compatibility code for older mod_ssl versions and other
               Apache SSL solutions like Apache-SSL, Sioux, Stronghold, etc.
 
-        NOTE: The --enable-rule=SSL_SDBM option enabled the use of the
-              built-in SDBM library instead of a custom defined or vendor
-              supplied DBM library. This can be useful when the vendor DBM
-              library is buggy or restricts the data size too dramatically
-              (for SSL sessions to be cacheable the DBM library should allow
-              more than 1KB of data to be stored under a particular key).
-
         NOTE: The --enable-rule=SSL_EXPERIMENTAL and --enable-rule=SSL_VENDOR
               options enable various experimental and vendor extension code.
               Please read the src/Configuration.tmpl file inside the Apache
@@ -284,7 +276,6 @@
               --prefix=/path/to/apache \                                   ALL
              [--enable-shared=ssl] \                                  OPTIONAL
              [--disable-rule=SSL_COMPAT] \                            OPTIONAL
-             [--enable-rule=SSL_SDBM] \                               OPTIONAL
              [--enable-rule=SSL_EXPERIMENTAL] \                       OPTIONAL
              [--enable-rule=SSL_VENDOR] \                             OPTIONAL
              [...more APACI options...]                               OPTIONAL
@@ -317,13 +308,6 @@
               SSL compatibility code for older mod_ssl versions and other
               Apache SSL solutions like Apache-SSL, Sioux, Stronghold, etc.
 
-        NOTE: The --enable-rule=SSL_SDBM option enabled the use of the
-              built-in SDBM library instead of a custom defined or vendor
-              supplied DBM library. This can be useful when the vendor DBM
-              library is buggy or restricts the data size too dramatically
-              (for SSL sessions to be cacheable the DBM library should allow
-              more than 1KB of data to be stored under a particular key).
-
         NOTE: The --enable-rule=SSL_EXPERIMENTAL and --enable-rule=SSL_VENDOR
               options enable various experimental and vendor extension code.
               Please read the src/Configuration.tmpl file inside the Apache
diff --git a/usr.sbin/httpd/Makefile.bsd-wrapper b/usr.sbin/httpd/Makefile.bsd-wrapper
index d1426766405..0442f501b99 100644
--- a/usr.sbin/httpd/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/Makefile.bsd-wrapper
@@ -1,5 +1,5 @@
 # Build wrapper for Apache 
-# $OpenBSD: Makefile.bsd-wrapper,v 1.57 2005/09/27 16:27:22 deraadt Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.58 2006/04/04 08:51:28 henning Exp $
 
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
@@ -204,7 +204,6 @@ INCFILES= \
 	src/os/unix/os.h \
 	src/modules/ssl/mod_ssl.h \
 	src/modules/ssl/ssl_expr.h \
-	src/modules/ssl/ssl_util_sdbm.h \
 	src/modules/ssl/ssl_util_ssl.h \
 	src/modules/ssl/ssl_util_table.h
 
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm.c b/usr.sbin/httpd/src/lib/sdbm/sdbm.c
deleted file mode 100644
index 4071e3240de..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * core routines
- */
-
-#include "sdbm.h"
-#include "sdbm_tune.h"
-#include "sdbm_pair.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>	/* for lseek() */
-
-
-/*
- * forward
- */
-static int getdbit proto((DBM *, long));
-static int setdbit proto((DBM *, long));
-static int getpage proto((DBM *, long));
-static datum getnext proto((DBM *));
-static int makroom proto((DBM *, long, int));
-
-/*
- * useful macros
- */
-#define bad(x)		((x).dptr == NULL || (x).dsize <= 0)
-#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
-#define ioerr(db)	((db)->flags |= DBM_IOERR)
-
-#define OFF_PAG(off)	(long) (off) * PBLKSIZ
-#define OFF_DIR(off)	(long) (off) * DBLKSIZ
-
-static long masks[] = {
-	000000000000, 000000000001, 000000000003, 000000000007,
-	000000000017, 000000000037, 000000000077, 000000000177,
-	000000000377, 000000000777, 000000001777, 000000003777,
-	000000007777, 000000017777, 000000037777, 000000077777,
-	000000177777, 000000377777, 000000777777, 000001777777,
-	000003777777, 000007777777, 000017777777, 000037777777,
-	000077777777, 000177777777, 000377777777, 000777777777,
-	001777777777, 003777777777, 007777777777, 017777777777
-};
-
-datum nullitem = {NULL, 0};
-
-DBM *
-sdbm_open(file, flags, mode)
-register char *file;
-register int flags;
-register int mode;
-{
-	register DBM *db;
-	register char *dirname;
-	register char *pagname;
-	register int n;
-
-	if (file == NULL || !*file)
-		return errno = EINVAL, (DBM *) NULL;
-/*
- * build the file names
- */
-	if (asprintf(&dirname, "%s%s", file, DIRFEXT) == -1)
-		return (DBM *) NULL;
-
-	if (asprintf(&pagname, "%s%s", file, PAGFEXT) == -1) {
-		free(dirname);
-		return (DBM *) NULL;
-	}
-
-
-	db = sdbm_prep(dirname, pagname, flags, mode);
-	free((char *) dirname);
-	free((char *) pagname);
-	return db;
-}
-
-DBM *
-sdbm_prep(dirname, pagname, flags, mode)
-char *dirname;
-char *pagname;
-int flags;
-int mode;
-{
-	register DBM *db;
-	struct stat dstat;
-
-	if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
-		return errno = ENOMEM, (DBM *) NULL;
-
-        db->flags = 0;
-        db->hmask = 0;
-        db->blkptr = 0;
-        db->keyptr = 0;
-/*
- * adjust user flags so that WRONLY becomes RDWR, 
- * as required by this package. Also set our internal
- * flag for RDONLY if needed.
- */
-	if (flags & O_WRONLY)
-		flags = (flags & ~O_WRONLY) | O_RDWR;
-
-	else if ((flags & 03) == O_RDONLY)
-		db->flags = DBM_RDONLY;
-/*
- * open the files in sequence, and stat the dirfile.
- * If we fail anywhere, undo everything, return NULL.
- */
-	if ((db->pagf = open(pagname, flags, mode)) > -1) {
-	    if ( sdbm_fd_lock(db->pagf, sdbm_rdonly(db)) > -1 ) {
-		if ((db->dirf = open(dirname, flags, mode)) > -1) {
-/*
- * need the dirfile size to establish max bit number.
- */
-			if (fstat(db->dirf, &dstat) == 0) {
-/*
- * zero size: either a fresh database, or one with a single,
- * unsplit data page: dirpage is all zeros.
- */
-				db->dirbno = (!dstat.st_size) ? 0 : -1;
-				db->pagbno = -1;
-				db->maxbno = dstat.st_size * BYTESIZ;
-
-				(void) memset(db->pagbuf, 0, PBLKSIZ);
-				(void) memset(db->dirbuf, 0, DBLKSIZ);
-			/*
-			 * success
-			 */
-				return db;
-			}
-			(void) close(db->dirf);
-		}
-		(void) sdbm_fd_unlock(db->pagf);
-	    }
-	    (void) close(db->pagf);
-	}
-	free((char *) db);
-	return (DBM *) NULL;
-}
-
-void
-sdbm_close(db)
-register DBM *db;
-{
-	if (db == NULL)
-		errno = EINVAL;
-	else {
-		(void) close(db->dirf);
-		(void) sdbm_fd_unlock(db->pagf);
-		(void) close(db->pagf);
-		free((char *) db);
-	}
-}
-
-datum
-sdbm_fetch(db, key)
-register DBM *db;
-datum key;
-{
-	if (db == NULL || bad(key))
-		return errno = EINVAL, nullitem;
-
-	if (getpage(db, exhash(key)))
-		return getpair(db->pagbuf, key);
-
-	return ioerr(db), nullitem;
-}
-
-int
-sdbm_delete(db, key)
-register DBM *db;
-datum key;
-{
-	if (db == NULL || bad(key))
-		return errno = EINVAL, -1;
-	if (sdbm_rdonly(db))
-		return errno = EPERM, -1;
-
-	if (getpage(db, exhash(key))) {
-		if (!delpair(db->pagbuf, key))
-			return -1;
-/*
- * update the page file
- */
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return ioerr(db), -1;
-
-		return 0;
-	}
-
-	return ioerr(db), -1;
-}
-
-int
-sdbm_store(db, key, val, flags)
-register DBM *db;
-datum key;
-datum val;
-int flags;
-{
-	int need;
-	register long hash;
-
-	if (db == NULL || bad(key))
-		return errno = EINVAL, -1;
-	if (sdbm_rdonly(db))
-		return errno = EPERM, -1;
-
-	need = key.dsize + val.dsize;
-/*
- * is the pair too big (or too small) for this database ??
- */
-	if (need < 0 || need > PAIRMAX)
-		return errno = EINVAL, -1;
-
-	if (getpage(db, (hash = exhash(key)))) {
-/*
- * if we need to replace, delete the key/data pair
- * first. If it is not there, ignore.
- */
-		if (flags == DBM_REPLACE)
-			(void) delpair(db->pagbuf, key);
-#ifdef SEEDUPS
-		else if (duppair(db->pagbuf, key))
-			return 1;
-#endif
-/*
- * if we do not have enough room, we have to split.
- */
-		if (!fitpair(db->pagbuf, need))
-			if (!makroom(db, hash, need))
-				return ioerr(db), -1;
-/*
- * we have enough room or split is successful. insert the key,
- * and update the page file.
- */
-		(void) putpair(db->pagbuf, key, val);
-
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return ioerr(db), -1;
-	/*
-	 * success
-	 */
-		return 0;
-	}
-
-	return ioerr(db), -1;
-}
-
-/*
- * makroom - make room by splitting the overfull page
- * this routine will attempt to make room for SPLTMAX times before
- * giving up.
- */
-static int
-makroom(db, hash, need)
-register DBM *db;
-long hash;
-int need;
-{
-	long newp;
-	char twin[PBLKSIZ];
-	char *pag = db->pagbuf;
-	char *new = twin;
-	register int smax = SPLTMAX;
-
-	do {
-/*
- * split the current page
- */
-		(void) splpage(pag, new, db->hmask + 1);
-/*
- * address of the new page
- */
-		newp = (hash & db->hmask) | (db->hmask + 1);
-
-/*
- * write delay, read avoidence/cache shuffle:
- * select the page for incoming pair: if key is to go to the new page,
- * write out the previous one, and copy the new one over, thus making
- * it the current page. If not, simply write the new page, and we are
- * still looking at the page of interest. current page is not updated
- * here, as sdbm_store will do so, after it inserts the incoming pair.
- */
-		if (hash & (db->hmask + 1)) {
-			if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-			    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-				return 0;
-			db->pagbno = newp;
-			(void) memcpy(pag, new, PBLKSIZ);
-		}
-		else if (lseek(db->pagf, OFF_PAG(newp), SEEK_SET) < 0
-			 || write(db->pagf, new, PBLKSIZ) < 0)
-			return 0;
-
-		if (!setdbit(db, db->curbit))
-			return 0;
-/*
- * see if we have enough room now
- */
-		if (fitpair(pag, need))
-			return 1;
-/*
- * try again... update curbit and hmask as getpage would have
- * done. because of our update of the current page, we do not
- * need to read in anything. BUT we have to write the current
- * [deferred] page out, as the window of failure is too great.
- */
-		db->curbit = 2 * db->curbit +
-			((hash & (db->hmask + 1)) ? 2 : 1);
-		db->hmask |= db->hmask + 1;
-
-		if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-		    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return 0;
-
-	} while (--smax);
-/*
- * if we are here, this is real bad news. After SPLTMAX splits,
- * we still cannot fit the key. say goodnight.
- */
-#ifdef BADMESS
-	(void) write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44);
-#endif
-	return 0;
-
-}
-
-/*
- * the following two routines will break if
- * deletions aren't taken into account. (ndbm bug)
- */
-datum
-sdbm_firstkey(db)
-register DBM *db;
-{
-	if (db == NULL)
-		return errno = EINVAL, nullitem;
-/*
- * start at page 0
- */
-	if (lseek(db->pagf, OFF_PAG(0), SEEK_SET) < 0
-	    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-		return ioerr(db), nullitem;
-	db->pagbno = 0;
-	db->blkptr = 0;
-	db->keyptr = 0;
-
-	return getnext(db);
-}
-
-datum
-sdbm_nextkey(db)
-register DBM *db;
-{
-	if (db == NULL)
-		return errno = EINVAL, nullitem;
-	return getnext(db);
-}
-
-/*
- * all important binary trie traversal
- */
-static int
-getpage(db, hash)
-register DBM *db;
-register long hash;
-{
-	register int hbit;
-	register long dbit;
-	register long pagb;
-
-	dbit = 0;
-	hbit = 0;
-	while (dbit < db->maxbno && getdbit(db, dbit))
-		dbit = 2 * dbit + ((hash & (1 << hbit++)) ? 2 : 1);
-
-	debug(("dbit: %d...", dbit));
-
-	db->curbit = dbit;
-	db->hmask = masks[hbit];
-
-	pagb = hash & db->hmask;
-/*
- * see if the block we need is already in memory.
- * note: this lookaside cache has about 10% hit rate.
- */
-	if (pagb != db->pagbno) { 
-/*
- * note: here, we assume a "hole" is read as 0s.
- * if not, must zero pagbuf first.
- */
-		if (lseek(db->pagf, OFF_PAG(pagb), SEEK_SET) < 0
-		    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-			return 0;
-		if (!chkpage(db->pagbuf))
-			return 0;
-		db->pagbno = pagb;
-
-		debug(("pag read: %d\n", pagb));
-	}
-	return 1;
-}
-
-static int
-getdbit(db, dbit)
-register DBM *db;
-register long dbit;
-{
-	register long c;
-	register long dirb;
-
-	c = dbit / BYTESIZ;
-	dirb = c / DBLKSIZ;
-
-	if (dirb != db->dirbno) {
-		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-			return 0;
-		db->dirbno = dirb;
-
-		debug(("dir read: %d\n", dirb));
-	}
-
-	return db->dirbuf[c % DBLKSIZ] & (1 << dbit % BYTESIZ);
-}
-
-static int
-setdbit(db, dbit)
-register DBM *db;
-register long dbit;
-{
-	register long c;
-	register long dirb;
-
-	c = dbit / BYTESIZ;
-	dirb = c / DBLKSIZ;
-
-	if (dirb != db->dirbno) {
-		if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-		    || read(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-			return 0;
-		db->dirbno = dirb;
-
-		debug(("dir read: %d\n", dirb));
-	}
-
-	db->dirbuf[c % DBLKSIZ] |= (1 << dbit % BYTESIZ);
-
-	if (dbit >= db->maxbno)
-		db->maxbno += DBLKSIZ * BYTESIZ;
-
-	if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-	    || write(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-		return 0;
-
-	return 1;
-}
-
-/*
- * getnext - get the next key in the page, and if done with
- * the page, try the next page in sequence
- */
-static datum
-getnext(db)
-register DBM *db;
-{
-	datum key;
-
-	for (;;) {
-		db->keyptr++;
-		key = getnkey(db->pagbuf, db->keyptr);
-		if (key.dptr != NULL)
-			return key;
-/*
- * we either run out, or there is nothing on this page..
- * try the next one... If we lost our position on the
- * file, we will have to seek.
- */
-		db->keyptr = 0;
-		if (db->pagbno != db->blkptr++)
-			if (lseek(db->pagf, OFF_PAG(db->blkptr), SEEK_SET) < 0)
-				break;
-		db->pagbno = db->blkptr;
-		if (read(db->pagf, db->pagbuf, PBLKSIZ) <= 0)
-			break;
-		if (!chkpage(db->pagbuf))
-			break;
-	}
-
-	return ioerr(db), nullitem;
-}
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm.h b/usr.sbin/httpd/src/lib/sdbm/sdbm.h
deleted file mode 100644
index 603ffec601b..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Ake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain. 
- */
-
-/* These settings are -incompatible- with mod_dav [www.webdav.org/mod_dav/]
- * but are required for compatibility with mod_auth_dbm.  Do not link this 
- * build of sdbm into mod_dav and expect success, dav requires big records.
- */
-#define DBLKSIZ 4096
-#define PBLKSIZ 1024
-#define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
-#define SPLTMAX	10			/* maximum allowed splits */
-					/* for a single insertion */
-#define DIRFEXT	".dir"
-#define PAGFEXT	".pag"
-
-typedef struct {
-	int dirf;		       /* directory file descriptor */
-	int pagf;		       /* page file descriptor */
-	int flags;		       /* status/error flags, see below */
-	long maxbno;		       /* size of dirfile in bits */
-	long curbit;		       /* current bit number */
-	long hmask;		       /* current hash mask */
-	long blkptr;		       /* current block for nextkey */
-	int keyptr;		       /* current key for nextkey */
-	long blkno;		       /* current page to read/write */
-	long pagbno;		       /* current page in pagbuf */
-	char pagbuf[PBLKSIZ];	       /* page file block buffer */
-	long dirbno;		       /* current block in dirbuf */
-	char dirbuf[DBLKSIZ];	       /* directory file block buffer */
-} DBM;
-
-#define DBM_RDONLY	0x1	       /* data base open read-only */
-#define DBM_IOERR	0x2	       /* data base I/O error */
-
-/*
- * utility macros
- */
-#define sdbm_rdonly(db)		((db)->flags & DBM_RDONLY)
-#define sdbm_error(db)		((db)->flags & DBM_IOERR)
-
-#define sdbm_clearerr(db)	((db)->flags &= ~DBM_IOERR)  /* ouch */
-
-#define sdbm_dirfno(db)	((db)->dirf)
-#define sdbm_pagfno(db)	((db)->pagf)
-
-typedef struct {
-	char *dptr;
-	int dsize;
-} datum;
-
-extern datum nullitem;
-
-#ifdef __STDC__
-#define proto(p) p
-#else
-#define proto(p) ()
-#endif
-
-/*
- * flags to sdbm_store
- */
-#define DBM_INSERT	0
-#define DBM_REPLACE	1
-
-/*
- * ndbm interface
- */
-extern DBM *sdbm_open proto((char *, int, int));
-extern void sdbm_close proto((DBM *));
-extern datum sdbm_fetch proto((DBM *, datum));
-extern int sdbm_delete proto((DBM *, datum));
-extern int sdbm_store proto((DBM *, datum, datum, int));
-extern datum sdbm_firstkey proto((DBM *));
-extern datum sdbm_nextkey proto((DBM *));
-
-/*
- * other
- */
-extern DBM *sdbm_prep proto((char *, char *, int, int));
-extern long sdbm_hash proto((char *, int));
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm_hash.c b/usr.sbin/httpd/src/lib/sdbm/sdbm_hash.c
deleted file mode 100644
index 4b04add367b..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm_hash.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain. keep it that way.
- *
- * hashing routine
- */
-
-#include "sdbm.h"
-/*
- * polynomial conversion ignoring overflows
- * [this seems to work remarkably well, in fact better
- * then the ndbm hash function. Replace at your own risk]
- * use: 65599	nice.
- *      65587   even better. 
- */
-long
-sdbm_hash(str, len)
-register char *str;
-register int len;
-{
-	register unsigned long n = 0;
-
-#define DUFF	/* go ahead and use the loop-unrolled version */
-#ifdef DUFF
-
-#define HASHC	n = *str++ + 65599 * n
-
-	if (len > 0) {
-		register int loop = (len + 8 - 1) >> 3;
-
-		switch(len & (8 - 1)) {
-		case 0:	do {
-			HASHC;	case 7:	HASHC;
-		case 6:	HASHC;	case 5:	HASHC;
-		case 4:	HASHC;	case 3:	HASHC;
-		case 2:	HASHC;	case 1:	HASHC;
-			} while (--loop);
-		}
-
-	}
-#else
-	while (len--)
-		n = *str++ + 65599 * n;
-#endif
-	return n;
-}
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm_lock.c b/usr.sbin/httpd/src/lib/sdbm/sdbm_lock.c
deleted file mode 100644
index da4d7033cdd..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm_lock.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-** File locking
-**
-** Snarfed from mod_rewrite.c. Munged up for our use.
-*/
-
-#include "ap_config.h"
-#include "sdbm_tune.h"   /* include the prototypes */
-
-    /* The locking support:
-     * Try to determine whether we should use fcntl() or flock().
-     * Would be better ap_config.h could provide this... :-(
-     * Small monkey business to ensure that fcntl is preferred,
-     * unless we specified USE_FLOCK_SERIALIZED_ACCEPT during compile.
-     */
-#define USE_FLOCK 1
-#include <sys/file.h>
-
-/* NOTE: this function blocks until it acquires the lock */
-int sdbm_fd_lock(int fd, int readonly)
-{
-    int rc;
-
-    while (   ((rc = flock(fd, readonly ? LOCK_SH : LOCK_EX)) < 0)
-              && (errno == EINTR)               ) {
-        continue;
-    }
-#ifdef USE_LOCKING
-    /* ### this doesn't allow simultaneous reads! */
-    /* ### this doesn't block forever */
-    /* Lock the first byte */
-    lseek(fd, 0, SEEK_SET);
-    rc = _locking(fd, _LK_LOCK, 1);
-#endif
-#ifdef USE_SEM_LOCKING
-	if ((locking_sem != 0) && (TimedWaitOnLocalSemaphore (locking_sem, 10000) != 0))
-		rc = -1;
-	else
-		rc = 1;
-#endif
-
-    return rc;
-}
-
-int sdbm_fd_unlock(int fd)
-{
-    int rc;
-
-    rc = flock(fd, LOCK_UN);
-#ifdef USE_LOCKING
-    lseek(fd, 0, SEEK_SET);
-    rc = _locking(fd, _LK_UNLCK, 1);
-#endif
-#ifdef USE_SEM_LOCKING
-	if (locking_sem)
-		SignalLocalSemaphore (locking_sem);
-	rc = 1;
-#endif
-
-    return rc;
-}
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.c b/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.c
deleted file mode 100644
index f581bc96360..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * page-level routines
- */
-
-#include "sdbm.h"
-#include "sdbm_tune.h"
-#include "sdbm_pair.h"
-
-#include <string.h>	/* for memset() */
-
-
-#define exhash(item)	sdbm_hash((item).dptr, (item).dsize)
-
-/* 
- * forward 
- */
-static int seepair proto((char *, int, char *, int));
-
-/*
- * page format:
- *	+------------------------------+
- * ino	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | - - - ---->	       |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data          |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * calculating the offsets for free area:  if the number
- * of entries (ino[0]) is zero, the offset to the END of
- * the free area is the block size. Otherwise, it is the
- * nth (ino[ino[0]]) entry's offset.
- */
-
-int
-fitpair(pag, need)
-char *pag;
-int need;
-{
-	register int n;
-	register int off;
-	register int avail;
-	register short *ino = (short *) pag;
-
-	off = ((n = ino[0]) > 0) ? ino[n] : PBLKSIZ;
-	avail = off - (n + 1) * sizeof(short);
-	need += 2 * sizeof(short);
-
-	debug(("avail %d need %d\n", avail, need));
-
-	return need <= avail;
-}
-
-void
-putpair(pag, key, val)
-char *pag;
-datum key;
-datum val;
-{
-	register int n;
-	register int off;
-	register short *ino = (short *) pag;
-
-	off = ((n = ino[0]) > 0) ? ino[n] : PBLKSIZ;
-/*
- * enter the key first
- */
-	off -= key.dsize;
-	(void) memcpy(pag + off, key.dptr, key.dsize);
-	ino[n + 1] = off;
-/*
- * now the data
- */
-	off -= val.dsize;
-	(void) memcpy(pag + off, val.dptr, val.dsize);
-	ino[n + 2] = off;
-/*
- * adjust item count
- */
-	ino[0] += 2;
-}
-
-datum
-getpair(pag, key)
-char *pag;
-datum key;
-{
-	register int i;
-	register int n;
-	datum val;
-	register short *ino = (short *) pag;
-
-	if ((n = ino[0]) == 0)
-		return nullitem;
-
-	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-		return nullitem;
-
-	val.dptr = pag + ino[i + 1];
-	val.dsize = ino[i] - ino[i + 1];
-	return val;
-}
-
-#ifdef SEEDUPS
-int
-duppair(pag, key)
-char *pag;
-datum key;
-{
-	register short *ino = (short *) pag;
-	return ino[0] > 0 && seepair(pag, ino[0], key.dptr, key.dsize) > 0;
-}
-#endif
-
-datum
-getnkey(pag, num)
-char *pag;
-int num;
-{
-	datum key;
-	register int off;
-	register short *ino = (short *) pag;
-
-	num = num * 2 - 1;
-	if (ino[0] == 0 || num > ino[0])
-		return nullitem;
-
-	off = (num > 1) ? ino[num - 1] : PBLKSIZ;
-
-	key.dptr = pag + ino[num];
-	key.dsize = off - ino[num];
-
-	return key;
-}
-
-int
-delpair(pag, key)
-char *pag;
-datum key;
-{
-	register int n;
-	register int i;
-	register short *ino = (short *) pag;
-
-	if ((n = ino[0]) == 0)
-		return 0;
-
-	if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-		return 0;
-/*
- * found the key. if it is the last entry
- * [i.e. i == n - 1] we just adjust the entry count.
- * hard case: move all data down onto the deleted pair,
- * shift offsets onto deleted offsets, and adjust them.
- * [note: 0 < i < n]
- */
-	if (i < n - 1) {
-		register int m;
-		register char *dst = pag + (i == 1 ? PBLKSIZ : ino[i - 1]);
-		register char *src = pag + ino[i + 1];
-		register int   zoo = dst - src;
-
-		debug(("free-up %d ", zoo));
-/*
- * shift data/keys down
- */
-		m = ino[i + 1] - ino[n];
-
-#undef DUFF	/* just use memmove. it should be plenty fast. */
-#ifdef DUFF
-#define MOVB 	*--dst = *--src
-
-		if (m > 0) {
-			register int loop = (m + 8 - 1) >> 3;
-
-			switch (m & (8 - 1)) {
-			case 0:	do {
-				MOVB;	case 7:	MOVB;
-			case 6:	MOVB;	case 5:	MOVB;
-			case 4:	MOVB;	case 3:	MOVB;
-			case 2:	MOVB;	case 1:	MOVB;
-				} while (--loop);
-			}
-		}
-#else
-		dst -= m;
-		src -= m;
-		memmove(dst, src, m);
-#endif
-
-/*
- * adjust offset index up
- */
-		while (i < n - 1) {
-			ino[i] = ino[i + 2] + zoo;
-			i++;
-		}
-	}
-	ino[0] -= 2;
-	return 1;
-}
-
-/*
- * search for the key in the page.
- * return offset index in the range 0 < i < n.
- * return 0 if not found.
- */
-static int
-seepair(pag, n, key, siz)
-char *pag;
-register int n;
-register char *key;
-register int siz;
-{
-	register int i;
-	register int off = PBLKSIZ;
-	register short *ino = (short *) pag;
-
-	for (i = 1; i < n; i += 2) {
-		if (siz == off - ino[i] &&
-		    memcmp(key, pag + ino[i], siz) == 0)
-			return i;
-		off = ino[i + 1];
-	}
-	return 0;
-}
-
-void
-splpage(pag, new, sbit)
-char *pag;
-char *new;
-long sbit;
-{
-	datum key;
-	datum val;
-
-	register int n;
-	register int off = PBLKSIZ;
-	char cur[PBLKSIZ];
-	register short *ino = (short *) cur;
-
-	(void) memcpy(cur, pag, PBLKSIZ);
-	(void) memset(pag, 0, PBLKSIZ);
-	(void) memset(new, 0, PBLKSIZ);
-
-	n = ino[0];
-	for (ino++; n > 0; ino += 2) {
-		key.dptr = cur + ino[0]; 
-		key.dsize = off - ino[0];
-		val.dptr = cur + ino[1];
-		val.dsize = ino[0] - ino[1];
-/*
- * select the page pointer (by looking at sbit) and insert
- */
-		(void) putpair((exhash(key) & sbit) ? new : pag, key, val);
-
-		off = ino[1];
-		n -= 2;
-	}
-
-	debug(("%d split %d/%d\n", ((short *) cur)[0] / 2, 
-	       ((short *) new)[0] / 2,
-	       ((short *) pag)[0] / 2));
-}
-
-/*
- * check page sanity: 
- * number of entries should be something
- * reasonable, and all offsets in the index should be in order.
- * this could be made more rigorous.
- */
-int
-chkpage(pag)
-char *pag;
-{
-	register int n;
-	register int off;
-	register short *ino = (short *) pag;
-
-	if ((n = ino[0]) < 0 || n > PBLKSIZ / sizeof(short))
-		return 0;
-
-	if (n > 0) {
-		off = PBLKSIZ;
-		for (ino++; n > 0; ino += 2) {
-			if (ino[0] > off || ino[1] > off ||
-			    ino[1] > ino[0])
-				return 0;
-			off = ino[1];
-			n -= 2;
-		}
-	}
-	return 1;
-}
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.h b/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.h
deleted file mode 100644
index 8a675b90659..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm_pair.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Mini EMBED (pair.c) */
-#define chkpage sdbm__chkpage
-#define delpair sdbm__delpair
-#define duppair sdbm__duppair
-#define fitpair sdbm__fitpair
-#define getnkey sdbm__getnkey
-#define getpair sdbm__getpair
-#define putpair sdbm__putpair
-#define splpage sdbm__splpage
-
-extern int fitpair proto((char *, int));
-extern void  putpair proto((char *, datum, datum));
-extern datum	getpair proto((char *, datum));
-extern int  delpair proto((char *, datum));
-extern int  chkpage proto((char *));
-extern datum getnkey proto((char *, int));
-extern void splpage proto((char *, char *, long));
-#ifdef SEEDUPS
-extern int duppair proto((char *, datum));
-#endif
diff --git a/usr.sbin/httpd/src/lib/sdbm/sdbm_tune.h b/usr.sbin/httpd/src/lib/sdbm/sdbm_tune.h
deleted file mode 100644
index 7ed7dda9b4d..00000000000
--- a/usr.sbin/httpd/src/lib/sdbm/sdbm_tune.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * sdbm - ndbm work-alike hashed database library
- * tuning and portability constructs [not nearly enough]
- * author: oz@nexus.yorku.ca
- */
-
-#define BYTESIZ		8
-
-/*
- * important tuning parms (hah)
- */
-
-#define SEEDUPS			/* always detect duplicates */
-#define BADMESS			/* generate a message for worst case:
-				   cannot make room after SPLTMAX splits */
-/*
- * misc
- */
-#ifdef DEBUG
-#define debug(x)	printf x
-#else
-#define debug(x)
-#endif
-
-int sdbm_fd_lock(int fd, int readonly);
-int sdbm_fd_unlock(int fd);
diff --git a/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl b/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
index 0ee5efe798a..6a04f2066ec 100644
--- a/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
+++ b/usr.sbin/httpd/src/modules/ssl/Makefile.tmpl
@@ -91,7 +91,6 @@ OBJS=\
  ssl_expr_eval.o\
  ssl_util.o\
  ssl_util_ssl.o\
- ssl_util_sdbm.o\
  ssl_util_table.o\
  $(SSL_VENDOR_OBJS)
 
@@ -120,7 +119,6 @@ OBJS_PIC=\
  ssl_expr_eval.lo\
  ssl_util.lo\
  ssl_util_ssl.lo\
- ssl_util_sdbm.lo\
  ssl_util_table.lo\
  $(SSL_VENDOR_OBJS_PIC)
 
@@ -502,18 +500,6 @@ ssl_util.o ssl_util.lo: ssl_util.c mod_ssl.h $(INCDIR)/ap_config.h \
  $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
  $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
  $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
-ssl_util_sdbm.o ssl_util_sdbm.lo: ssl_util_sdbm.c mod_ssl.h $(INCDIR)/ap_config.h \
- $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
- $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
- $(INCDIR)/httpd.h $(INCDIR)/ap_mm.h $(INCDIR)/ap_alloc.h \
- $(INCDIR)/ap_hook.h $(INCDIR)/ap_ctx.h $(INCDIR)/buff.h \
- $(INCDIR)/ap.h $(INCDIR)/util_uri.h \
- $(INCDIR)/http_config.h $(INCDIR)/http_conf_globals.h \
- $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_main.h $(INCDIR)/http_core.h \
- $(INCDIR)/http_log.h $(INCDIR)/scoreboard.h \
- $(INCDIR)/util_md5.h $(INCDIR)/ap_md5.h \
- $(INCDIR)/fnmatch.h ssl_expr.h ssl_util_ssl.h ssl_util_table.h
 ssl_util_ssl.o ssl_util_ssl.lo: ssl_util_ssl.c mod_ssl.h $(INCDIR)/ap_config.h \
  $(INCDIR)/ap_mmn.h $(INCDIR)/ap_config_auto.h \
  $(OSDIR)/os.h $(OSDIR)/os-inline.c $(INCDIR)/ap_ctype.h \
diff --git a/usr.sbin/httpd/src/modules/ssl/mod_ssl.h b/usr.sbin/httpd/src/modules/ssl/mod_ssl.h
index 5ad632230dc..505104d50b6 100644
--- a/usr.sbin/httpd/src/modules/ssl/mod_ssl.h
+++ b/usr.sbin/httpd/src/modules/ssl/mod_ssl.h
@@ -283,18 +283,6 @@ union ssl_ipc_semun {
  */
 #define SSL_DBM_FILE_MODE ( S_IRUSR|S_IWUSR )
 
-#ifdef SSL_USE_SDBM
-#include "ssl_util_sdbm.h"
-#define ssl_dbm_open     sdbm_open
-#define ssl_dbm_close    sdbm_close
-#define ssl_dbm_store    sdbm_store
-#define ssl_dbm_fetch    sdbm_fetch
-#define ssl_dbm_delete   sdbm_delete
-#define ssl_dbm_firstkey sdbm_firstkey
-#define ssl_dbm_nextkey  sdbm_nextkey
-#define SSL_DBM_FILE_SUFFIX_DIR ".dir"
-#define SSL_DBM_FILE_SUFFIX_PAG ".pag"
-#else /* !SSL_USE_SDBM */
 #include <ndbm.h>
 #define ssl_dbm_open     dbm_open
 #define ssl_dbm_close    dbm_close
@@ -315,7 +303,6 @@ union ssl_ipc_semun {
 #define SSL_DBM_FILE_SUFFIX_PAG ".pag"
 #endif
 #endif
-#endif /* !SSL_USE_SDBM */
 
 /*
  * Check for OpenSSL version 
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_scache_dbm.c b/usr.sbin/httpd/src/modules/ssl/ssl_scache_dbm.c
index 00c55ffe5f4..808208cab47 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_scache_dbm.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_scache_dbm.c
@@ -148,13 +148,8 @@ BOOL ssl_scache_dbm_store(server_rec *s, UCHAR *id, int idlen, time_t expiry, SS
     i2d_SSL_SESSION(sess, &ucp);
 
     /* be careful: do not try to store too much bytes in a DBM file! */
-#ifdef SSL_USE_SDBM
-    if ((idlen + nData) >= PAIRMAX)
-        return FALSE;
-#else
     if ((idlen + nData) >= 950 /* at least less than approx. 1KB */)
         return FALSE;
-#endif
 
     /* create DBM key */
     dbmkey.dptr  = (char *)id;
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c b/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c
deleted file mode 100644
index 16ba9bc13a4..00000000000
--- a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.c
+++ /dev/null
@@ -1,917 +0,0 @@
-/*                      _             _
-**  _ __ ___   ___   __| |    ___ ___| |  mod_ssl
-** | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
-** | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
-** |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
-**                      |_____|
-**  ssl_util_sdbm.c
-**  Built-in Simple DBM
-*/
-
-/* ====================================================================
- * Copyright (c) 1998-2003 Ralf S. Engelschall. All rights reserved.
- *
- * 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 acknowledgment:
- *    "This product includes software developed by
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
- *
- * 4. The names "mod_ssl" must not be used to endorse or promote
- *    products derived from this software without prior written
- *    permission. For written permission, please contact
- *    rse@engelschall.com.
- *
- * 5. Products derived from this software may not be called "mod_ssl"
- *    nor may "mod_ssl" appear in their names without prior
- *    written permission of Ralf S. Engelschall.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
- * EXPRESSED 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 RALF S. ENGELSCHALL OR
- * HIS 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.
- * ====================================================================
- */
-
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * core routines
- */
-
-#include "mod_ssl.h"
-
-#ifdef SSL_USE_SDBM
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#ifdef __STDC__
-#include <stddef.h>
-#endif
-
-#ifndef NULL
-#define NULL (void *)0
-#endif
-
-/*
- * forward
- */
-static int getdbit proto((DBM *, long));
-static int setdbit proto((DBM *, long));
-static int getpage proto((DBM *, long));
-static datum getnext proto((DBM *));
-static int makroom proto((DBM *, long, int));
-
-/*
- * useful macros
- */
-#define bad(x)          ((x).dptr == NULL || (x).dsize <= 0)
-#define exhash(item)    sdbm_hash((item).dptr, (item).dsize)
-#define ioerr(db)       ((db)->flags |= DBM_IOERR)
-
-#define OFF_PAG(off)    (long) (off) * PBLKSIZ
-#define OFF_DIR(off)    (long) (off) * DBLKSIZ
-
-static long masks[] = {
-        000000000000, 000000000001, 000000000003, 000000000007,
-        000000000017, 000000000037, 000000000077, 000000000177,
-        000000000377, 000000000777, 000000001777, 000000003777,
-        000000007777, 000000017777, 000000037777, 000000077777,
-        000000177777, 000000377777, 000000777777, 000001777777,
-        000003777777, 000007777777, 000017777777, 000037777777,
-        000077777777, 000177777777, 000377777777, 000777777777,
-        001777777777, 003777777777, 007777777777, 017777777777
-};
-
-datum nullitem = {NULL, 0};
-
-DBM *
-sdbm_open(file, flags, mode)
-register char *file;
-register int flags;
-register int mode;
-{
-        register DBM *db;
-        register char *dirname;
-        register char *pagname;
-        register int n;
-
-        if (file == NULL || !*file)
-                return errno = EINVAL, (DBM *) NULL;
-/*
- * need space for two seperate filenames
- */
-        n = strlen(file) * 2 + strlen(DIRFEXT) + strlen(PAGFEXT) + 2;
-
-        if ((dirname = malloc((unsigned) n)) == NULL)
-                return errno = ENOMEM, (DBM *) NULL;
-/*
- * build the file names
- */
-        dirname = strcat(strcpy(dirname, file), DIRFEXT);
-        pagname = strcpy(dirname + strlen(dirname) + 1, file);
-        pagname = strcat(pagname, PAGFEXT);
-
-        db = sdbm_prep(dirname, pagname, flags, mode);
-        free((char *) dirname);
-        return db;
-}
-
-DBM *
-sdbm_prep(dirname, pagname, flags, mode)
-char *dirname;
-char *pagname;
-int flags;
-int mode;
-{
-        register DBM *db;
-        struct stat dstat;
-
-        if ((db = (DBM *) malloc(sizeof(DBM))) == NULL)
-                return errno = ENOMEM, (DBM *) NULL;
-
-        db->flags = 0;
-        db->hmask = 0;
-        db->blkptr = 0;
-        db->keyptr = 0;
-/*
- * adjust user flags so that WRONLY becomes RDWR,
- * as required by this package. Also set our internal
- * flag for RDONLY if needed.
- */
-        if (flags & O_WRONLY)
-                flags = (flags & ~O_WRONLY) | O_RDWR;
-        else if ((flags & 03) == O_RDONLY)
-                db->flags = DBM_RDONLY;
-
-/*
- * open the files in sequence, and stat the dirfile.
- * If we fail anywhere, undo everything, return NULL.
- */
-        if ((db->pagf = open(pagname, flags, mode)) > -1) {
-                if ((db->dirf = open(dirname, flags, mode)) > -1) {
-/*
- * need the dirfile size to establish max bit number.
- */
-                        if (fstat(db->dirf, &dstat) == 0) {
-/*
- * zero size: either a fresh database, or one with a single,
- * unsplit data page: dirpage is all zeros.
- */
-                                db->dirbno = (!dstat.st_size) ? 0 : -1;
-                                db->pagbno = -1;
-                                db->maxbno = dstat.st_size * BYTESIZ;
-
-                                (void) memset(db->pagbuf, 0, PBLKSIZ);
-                                (void) memset(db->dirbuf, 0, DBLKSIZ);
-                        /*
-                         * success
-                         */
-                                return db;
-                        }
-                        (void) close(db->dirf);
-                }
-                (void) close(db->pagf);
-        }
-        free((char *) db);
-        return (DBM *) NULL;
-}
-
-void
-sdbm_close(db)
-register DBM *db;
-{
-        if (db == NULL)
-                errno = EINVAL;
-        else {
-                (void) close(db->dirf);
-                (void) close(db->pagf);
-                free((char *) db);
-        }
-}
-
-datum
-sdbm_fetch(db, key)
-register DBM *db;
-datum key;
-{
-        if (db == NULL || bad(key))
-                return errno = EINVAL, nullitem;
-
-        if (getpage(db, exhash(key)))
-                return getpair(db->pagbuf, key);
-
-        return ioerr(db), nullitem;
-}
-
-int
-sdbm_delete(db, key)
-register DBM *db;
-datum key;
-{
-        if (db == NULL || bad(key))
-                return errno = EINVAL, -1;
-        if (sdbm_rdonly(db))
-                return errno = EPERM, -1;
-
-        if (getpage(db, exhash(key))) {
-                if (!delpair(db->pagbuf, key))
-                        return -1;
-/*
- * update the page file
- */
-                if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-                    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                        return ioerr(db), -1;
-
-                return 0;
-        }
-
-        return ioerr(db), -1;
-}
-
-int
-sdbm_store(db, key, val, flags)
-register DBM *db;
-datum key;
-datum val;
-int flags;
-{
-        int need;
-        register long hash;
-
-        if (db == NULL || bad(key))
-                return errno = EINVAL, -1;
-        if (sdbm_rdonly(db))
-                return errno = EPERM, -1;
-
-        need = key.dsize + val.dsize;
-/*
- * is the pair too big (or too small) for this database ??
- */
-        if (need < 0 || need > PAIRMAX)
-                return errno = EINVAL, -1;
-
-        if (getpage(db, (hash = exhash(key)))) {
-/*
- * if we need to replace, delete the key/data pair
- * first. If it is not there, ignore.
- */
-                if (flags == DBM_REPLACE)
-                        (void) delpair(db->pagbuf, key);
-#ifdef SEEDUPS
-                else if (duppair(db->pagbuf, key))
-                        return 1;
-#endif
-/*
- * if we do not have enough room, we have to split.
- */
-                if (!fitpair(db->pagbuf, need))
-                        if (!makroom(db, hash, need))
-                                return ioerr(db), -1;
-/*
- * we have enough room or split is successful. insert the key,
- * and update the page file.
- */
-                (void) putpair(db->pagbuf, key, val);
-
-                if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-                    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                        return ioerr(db), -1;
-        /*
-         * success
-         */
-                return 0;
-        }
-
-        return ioerr(db), -1;
-}
-
-/*
- * makroom - make room by splitting the overfull page
- * this routine will attempt to make room for SPLTMAX times before
- * giving up.
- */
-static int
-makroom(db, hash, need)
-register DBM *db;
-long hash;
-int need;
-{
-        long newp;
-        char twin[PBLKSIZ];
-        char *pag = db->pagbuf;
-        char *new = twin;
-        register int smax = SPLTMAX;
-
-        do {
-/*
- * split the current page
- */
-                (void) splpage(pag, new, db->hmask + 1);
-/*
- * address of the new page
- */
-                newp = (hash & db->hmask) | (db->hmask + 1);
-
-/*
- * write delay, read avoidence/cache shuffle:
- * select the page for incoming pair: if key is to go to the new page,
- * write out the previous one, and copy the new one over, thus making
- * it the current page. If not, simply write the new page, and we are
- * still looking at the page of interest. current page is not updated
- * here, as sdbm_store will do so, after it inserts the incoming pair.
- */
-                if (hash & (db->hmask + 1)) {
-                        if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-                            || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                                return 0;
-                        db->pagbno = newp;
-                        (void) memcpy(pag, new, PBLKSIZ);
-                }
-                else if (lseek(db->pagf, OFF_PAG(newp), SEEK_SET) < 0
-                         || write(db->pagf, new, PBLKSIZ) < 0)
-                        return 0;
-
-                if (!setdbit(db, db->curbit))
-                        return 0;
-/*
- * see if we have enough room now
- */
-                if (fitpair(pag, need))
-                        return 1;
-/*
- * try again... update curbit and hmask as getpage would have
- * done. because of our update of the current page, we do not
- * need to read in anything. BUT we have to write the current
- * [deferred] page out, as the window of failure is too great.
- */
-                db->curbit = 2 * db->curbit +
-                        ((hash & (db->hmask + 1)) ? 2 : 1);
-                db->hmask |= db->hmask + 1;
-
-                if (lseek(db->pagf, OFF_PAG(db->pagbno), SEEK_SET) < 0
-                    || write(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                        return 0;
-
-        } while (--smax);
-/*
- * if we are here, this is real bad news. After SPLTMAX splits,
- * we still cannot fit the key. say goodnight.
- */
-#ifdef BADMESS
-        (void) write(2, "sdbm: cannot insert after SPLTMAX attempts.\n", 44);
-#endif
-        return 0;
-
-}
-
-/*
- * the following two routines will break if
- * deletions aren't taken into account. (ndbm bug)
- */
-datum
-sdbm_firstkey(db)
-register DBM *db;
-{
-        if (db == NULL)
-                return errno = EINVAL, nullitem;
-/*
- * start at page 0
- */
-        if (lseek(db->pagf, OFF_PAG(0), SEEK_SET) < 0
-            || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                return ioerr(db), nullitem;
-        db->pagbno = 0;
-        db->blkptr = 0;
-        db->keyptr = 0;
-
-        return getnext(db);
-}
-
-datum
-sdbm_nextkey(db)
-register DBM *db;
-{
-        if (db == NULL)
-                return errno = EINVAL, nullitem;
-        return getnext(db);
-}
-
-/*
- * all important binary trie traversal
- */
-static int
-getpage(db, hash)
-register DBM *db;
-register long hash;
-{
-        register int hbit;
-        register long dbit;
-        register long pagb;
-
-        dbit = 0;
-        hbit = 0;
-        while (dbit < db->maxbno && getdbit(db, dbit))
-                dbit = 2 * dbit + ((hash & (1 << hbit++)) ? 2 : 1);
-
-        debug(("dbit: %d...", dbit));
-
-        db->curbit = dbit;
-        db->hmask = masks[hbit];
-
-        pagb = hash & db->hmask;
-/*
- * see if the block we need is already in memory.
- * note: this lookaside cache has about 10% hit rate.
- */
-        if (pagb != db->pagbno) {
-/*
- * note: here, we assume a "hole" is read as 0s.
- * if not, must zero pagbuf first.
- */
-                if (lseek(db->pagf, OFF_PAG(pagb), SEEK_SET) < 0
-                    || read(db->pagf, db->pagbuf, PBLKSIZ) < 0)
-                        return 0;
-                if (!chkpage(db->pagbuf))
-                        return 0;
-                db->pagbno = pagb;
-
-                debug(("pag read: %d\n", pagb));
-        }
-        return 1;
-}
-
-static int
-getdbit(db, dbit)
-register DBM *db;
-register long dbit;
-{
-        register long c;
-        register long dirb;
-        int got;
-
-        c = dbit / BYTESIZ;
-        dirb = c / DBLKSIZ;
-
-        if (dirb != db->dirbno) {
-                if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-                    || (got = read(db->dirf, db->dirbuf, DBLKSIZ)) < 0)
-                        return 0;
-                if (got == 0) 
-                        memset(db->dirbuf, 0, DBLKSIZ);
-                db->dirbno = dirb;
-
-                debug(("dir read: %d\n", dirb));
-        }
-
-        return db->dirbuf[c % DBLKSIZ] & (1 << dbit % BYTESIZ);
-}
-
-static int
-setdbit(db, dbit)
-register DBM *db;
-register long dbit;
-{
-        register long c;
-        register long dirb;
-        int got;
-
-        c = dbit / BYTESIZ;
-        dirb = c / DBLKSIZ;
-
-        if (dirb != db->dirbno) {
-                if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-                    || (got = read(db->dirf, db->dirbuf, DBLKSIZ)) < 0)
-                        return 0;
-                if (got == 0) 
-                        memset(db->dirbuf, 0, DBLKSIZ);
-                db->dirbno = dirb;
-
-                debug(("dir read: %d\n", dirb));
-        }
-
-        db->dirbuf[c % DBLKSIZ] |= (1 << dbit % BYTESIZ);
-
-        if (OFF_DIR((dirb+1))*BYTESIZ > db->maxbno) 
-                db->maxbno = OFF_DIR((dirb+1)) * BYTESIZ;
-
-        if (lseek(db->dirf, OFF_DIR(dirb), SEEK_SET) < 0
-            || write(db->dirf, db->dirbuf, DBLKSIZ) < 0)
-                return 0;
-
-        return 1;
-}
-
-/*
- * getnext - get the next key in the page, and if done with
- * the page, try the next page in sequence
- */
-static datum
-getnext(db)
-register DBM *db;
-{
-        datum key;
-
-        for (;;) {
-                db->keyptr++;
-                key = getnkey(db->pagbuf, db->keyptr);
-                if (key.dptr != NULL)
-                        return key;
-/*
- * we either run out, or there is nothing on this page..
- * try the next one... If we lost our position on the
- * file, we will have to seek.
- */
-                db->keyptr = 0;
-                if (db->pagbno != db->blkptr++)
-                        if (lseek(db->pagf, OFF_PAG(db->blkptr), SEEK_SET) < 0)
-                                break;
-                db->pagbno = db->blkptr;
-                if (read(db->pagf, db->pagbuf, PBLKSIZ) <= 0)
-                        break;
-                if (!chkpage(db->pagbuf))
-                        break;
-        }
-
-        return ioerr(db), nullitem;
-}
-
-/* ************************* */
-
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain. keep it that way.
- *
- * hashing routine
- */
-
-/*
- * polynomial conversion ignoring overflows
- * [this seems to work remarkably well, in fact better
- * then the ndbm hash function. Replace at your own risk]
- * use: 65599   nice.
- *      65587   even better.
- */
-long
-sdbm_hash(str, len)
-register char *str;
-register int len;
-{
-        register unsigned long n = 0;
-
-#ifdef DUFF
-#define HASHC   n = *str++ + 65599 * n
-        if (len > 0) {
-                register int loop = (len + 8 - 1) >> 3;
-
-                switch(len & (8 - 1)) {
-                case 0: do {
-                        HASHC;  case 7: HASHC;
-                case 6: HASHC;  case 5: HASHC;
-                case 4: HASHC;  case 3: HASHC;
-                case 2: HASHC;  case 1: HASHC;
-                        } while (--loop);
-                }
-
-        }
-#else
-        while (len--)
-                n = *str++ + 65599 * n;
-#endif
-        return n;
-}
-
-/* ************************* */
-
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Aake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- *
- * page-level routines
- */
-
-#define exhash(item)    sdbm_hash((item).dptr, (item).dsize)
-
-/*
- * forward
- */
-static int seepair proto((char *, int, char *, int));
-
-/*
- * page format:
- *      +------------------------------+
- * ino  | n | keyoff | datoff | keyoff |
- *      +------------+--------+--------+
- *      | datoff | - - - ---->         |
- *      +--------+---------------------+
- *      |        F R E E A R E A       |
- *      +--------------+---------------+
- *      |  <---- - - - | data          |
- *      +--------+-----+----+----------+
- *      |  key   | data     | key      |
- *      +--------+----------+----------+
- *
- * calculating the offsets for free area:  if the number
- * of entries (ino[0]) is zero, the offset to the END of
- * the free area is the block size. Otherwise, it is the
- * nth (ino[ino[0]]) entry's offset.
- */
-
-int
-fitpair(pag, need)
-char *pag;
-int need;
-{
-        register int n;
-        register int off;
-        register int avail;
-        register short *ino = (short *) pag;
-
-        off = ((n = ino[0]) > 0) ? ino[n] : PBLKSIZ;
-        avail = off - (n + 1) * sizeof(short);
-        need += 2 * sizeof(short);
-
-        debug(("free %d need %d\n", avail, need));
-
-        return need <= avail;
-}
-
-void
-putpair(pag, key, val)
-char *pag;
-datum key;
-datum val;
-{
-        register int n;
-        register int off;
-        register short *ino = (short *) pag;
-
-        off = ((n = ino[0]) > 0) ? ino[n] : PBLKSIZ;
-/*
- * enter the key first
- */
-        off -= key.dsize;
-        (void) memcpy(pag + off, key.dptr, key.dsize);
-        ino[n + 1] = off;
-/*
- * now the data
- */
-        off -= val.dsize;
-        (void) memcpy(pag + off, val.dptr, val.dsize);
-        ino[n + 2] = off;
-/*
- * adjust item count
- */
-        ino[0] += 2;
-}
-
-datum
-getpair(pag, key)
-char *pag;
-datum key;
-{
-        register int i;
-        register int n;
-        datum val;
-        register short *ino = (short *) pag;
-
-        if ((n = ino[0]) == 0)
-                return nullitem;
-
-        if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-                return nullitem;
-
-        val.dptr = pag + ino[i + 1];
-        val.dsize = ino[i] - ino[i + 1];
-        return val;
-}
-
-#ifdef SEEDUPS
-int
-duppair(pag, key)
-char *pag;
-datum key;
-{
-        register short *ino = (short *) pag;
-        return ino[0] > 0 && seepair(pag, ino[0], key.dptr, key.dsize) > 0;
-}
-#endif
-
-datum
-getnkey(pag, num)
-char *pag;
-int num;
-{
-        datum key;
-        register int off;
-        register short *ino = (short *) pag;
-
-        num = num * 2 - 1;
-        if (ino[0] == 0 || num > ino[0])
-                return nullitem;
-
-        off = (num > 1) ? ino[num - 1] : PBLKSIZ;
-
-        key.dptr = pag + ino[num];
-        key.dsize = off - ino[num];
-
-        return key;
-}
-
-int
-delpair(pag, key)
-char *pag;
-datum key;
-{
-        register int n;
-        register int i;
-        register short *ino = (short *) pag;
-
-        if ((n = ino[0]) == 0)
-                return 0;
-
-        if ((i = seepair(pag, n, key.dptr, key.dsize)) == 0)
-                return 0;
-/*
- * found the key. if it is the last entry
- * [i.e. i == n - 1] we just adjust the entry count.
- * hard case: move all data down onto the deleted pair,
- * shift offsets onto deleted offsets, and adjust them.
- * [note: 0 < i < n]
- */
-        if (i < n - 1) {
-                register int m;
-                register char *dst = pag + (i == 1 ? PBLKSIZ : ino[i - 1]);
-                register char *src = pag + ino[i + 1];
-                register int   zoo = dst - src;
-
-                debug(("free-up %d ", zoo));
-/*
- * shift data/keys down
- */
-                m = ino[i + 1] - ino[n];
-#ifdef DUFF
-#define MOVB    *--dst = *--src
-                if (m > 0) {
-                        register int loop = (m + 8 - 1) >> 3;
-
-                        switch (m & (8 - 1)) {
-                        case 0: do {
-                                MOVB;   case 7: MOVB;
-                        case 6: MOVB;   case 5: MOVB;
-                        case 4: MOVB;   case 3: MOVB;
-                        case 2: MOVB;   case 1: MOVB;
-                                } while (--loop);
-                        }
-                }
-#else
-                dst -= m;
-                src -= m;
-                memmove(dst, src, m);
-#endif
-/*
- * adjust offset index up
- */
-                while (i < n - 1) {
-                        ino[i] = ino[i + 2] + zoo;
-                        i++;
-                }
-        }
-        ino[0] -= 2;
-        return 1;
-}
-
-/*
- * search for the key in the page.
- * return offset index in the range 0 < i < n.
- * return 0 if not found.
- */
-static int
-seepair(pag, n, key, siz)
-char *pag;
-register int n;
-register char *key;
-register int siz;
-{
-        register int i;
-        register int off = PBLKSIZ;
-        register short *ino = (short *) pag;
-
-        for (i = 1; i < n; i += 2) {
-                if (siz == off - ino[i] &&
-                    memcmp(key, pag + ino[i], siz) == 0)
-                        return i;
-                off = ino[i + 1];
-        }
-        return 0;
-}
-
-void
-splpage(pag, new, sbit)
-char *pag;
-char *new;
-long sbit;
-{
-        datum key;
-        datum val;
-
-        register int n;
-        register int off = PBLKSIZ;
-        char cur[PBLKSIZ];
-        register short *ino = (short *) cur;
-
-        (void) memcpy(cur, pag, PBLKSIZ);
-        (void) memset(pag, 0, PBLKSIZ);
-        (void) memset(new, 0, PBLKSIZ);
-
-        n = ino[0];
-        for (ino++; n > 0; ino += 2) {
-                key.dptr = cur + ino[0];
-                key.dsize = off - ino[0];
-                val.dptr = cur + ino[1];
-                val.dsize = ino[0] - ino[1];
-/*
- * select the page pointer (by looking at sbit) and insert
- */
-                (void) putpair((exhash(key) & sbit) ? new : pag, key, val);
-
-                off = ino[1];
-                n -= 2;
-        }
-
-        debug(("%d split %d/%d\n", ((short *) cur)[0] / 2,
-               ((short *) new)[0] / 2,
-               ((short *) pag)[0] / 2));
-}
-
-/*
- * check page sanity:
- * number of entries should be something
- * reasonable, and all offsets in the index should be in order.
- * this could be made more rigorous.
- */
-int
-chkpage(pag)
-char *pag;
-{
-        register int n;
-        register int off;
-        register short *ino = (short *) pag;
-
-        if ((n = ino[0]) < 0 || n > PBLKSIZ / sizeof(short))
-                return 0;
-
-        if (n > 0) {
-                off = PBLKSIZ;
-                for (ino++; n > 0; ino += 2) {
-                        if (ino[0] > off || ino[1] > off ||
-                            ino[1] > ino[0])
-                                return 0;
-                        off = ino[1];
-                        n -= 2;
-                }
-        }
-        return 1;
-}
-
-#endif /* SSL_USE_SDBM */
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.h b/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.h
deleted file mode 100644
index 213a3f2ec29..00000000000
--- a/usr.sbin/httpd/src/modules/ssl/ssl_util_sdbm.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*                      _             _
-**  _ __ ___   ___   __| |    ___ ___| |  mod_ssl
-** | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
-** | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
-** |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
-**                      |_____|
-**  ssl_util_sdbm.c
-**  Built-in Simple DBM (Header)
-*/
-
-/* ====================================================================
- * Copyright (c) 1998-2003 Ralf S. Engelschall. All rights reserved.
- *
- * 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 acknowledgment:
- *    "This product includes software developed by
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
- *
- * 4. The names "mod_ssl" must not be used to endorse or promote
- *    products derived from this software without prior written
- *    permission. For written permission, please contact
- *    rse@engelschall.com.
- *
- * 5. Products derived from this software may not be called "mod_ssl"
- *    nor may "mod_ssl" appear in their names without prior
- *    written permission of Ralf S. Engelschall.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by
- *     Ralf S. Engelschall <rse@engelschall.com> for use in the
- *     mod_ssl project (http://www.modssl.org/)."
- *
- * THIS SOFTWARE IS PROVIDED BY RALF S. ENGELSCHALL ``AS IS'' AND ANY
- * EXPRESSED 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 RALF S. ENGELSCHALL OR
- * HIS 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.
- * ====================================================================
- */
-
-/*
- * sdbm - ndbm work-alike hashed database library
- * based on Per-Ake Larson's Dynamic Hashing algorithms. BIT 18 (1978).
- * author: oz@nexus.yorku.ca
- * status: public domain.
- */
-
-#ifndef SSL_UTIL_SDBM_H
-#define SSL_UTIL_SDBM_H
-
-#define DUFF    /* go ahead and use the loop-unrolled version */
-
-#include <stdio.h>
-
-#ifdef MOD_SSL
-#define DBLKSIZ 16384                   /* SSL cert chains require more */
-#define PBLKSIZ 8192                    /* SSL cert chains require more */
-#define PAIRMAX 8008                    /* arbitrary on PBLKSIZ-N */
-#else
-#define DBLKSIZ 4096
-#define PBLKSIZ 1024
-#define PAIRMAX 1008                    /* arbitrary on PBLKSIZ-N */
-#endif
-#define SPLTMAX 10                      /* maximum allowed splits */
-                                        /* for a single insertion */
-#define DIRFEXT ".dir"
-#define PAGFEXT ".pag"
-
-typedef struct {
-        int dirf;                      /* directory file descriptor */
-        int pagf;                      /* page file descriptor */
-        int flags;                     /* status/error flags, see below */
-        long maxbno;                   /* size of dirfile in bits */
-        long curbit;                   /* current bit number */
-        long hmask;                    /* current hash mask */
-        long blkptr;                   /* current block for nextkey */
-        int keyptr;                    /* current key for nextkey */
-        long blkno;                    /* current page to read/write */
-        long pagbno;                   /* current page in pagbuf */
-        char pagbuf[PBLKSIZ];          /* page file block buffer */
-        long dirbno;                   /* current block in dirbuf */
-        char dirbuf[DBLKSIZ];          /* directory file block buffer */
-} DBM;
-
-#define DBM_RDONLY      0x1            /* data base open read-only */
-#define DBM_IOERR       0x2            /* data base I/O error */
-
-/*
- * utility macros
- */
-#define sdbm_rdonly(db)         ((db)->flags & DBM_RDONLY)
-#define sdbm_error(db)          ((db)->flags & DBM_IOERR)
-
-#define sdbm_clearerr(db)       ((db)->flags &= ~DBM_IOERR)  /* ouch */
-
-#define sdbm_dirfno(db) ((db)->dirf)
-#define sdbm_pagfno(db) ((db)->pagf)
-
-typedef struct {
-        char *dptr;
-        int dsize;
-} datum;
-
-extern datum nullitem;
-
-#ifdef __STDC__
-#define proto(p) p
-#else
-#define proto(p) ()
-#endif
-
-/*
- * flags to sdbm_store
- */
-#define DBM_INSERT      0
-#define DBM_REPLACE     1
-
-/*
- * ndbm interface
- */
-extern DBM *sdbm_open proto((char *, int, int));
-extern void sdbm_close proto((DBM *));
-extern datum sdbm_fetch proto((DBM *, datum));
-extern int sdbm_delete proto((DBM *, datum));
-extern int sdbm_store proto((DBM *, datum, datum, int));
-extern datum sdbm_firstkey proto((DBM *));
-extern datum sdbm_nextkey proto((DBM *));
-
-/*
- * other
- */
-extern DBM *sdbm_prep proto((char *, char *, int, int));
-extern long sdbm_hash proto((char *, int));
-
-/* pair.h */
-extern int fitpair proto((char *, int));
-extern void  putpair proto((char *, datum, datum));
-extern datum    getpair proto((char *, datum));
-extern int  delpair proto((char *, datum));
-extern int  chkpage proto((char *));
-extern datum getnkey proto((char *, int));
-extern void splpage proto((char *, char *, long));
-extern int duppair proto((char *, datum));
-
-/* tune.h */
-/*
- * sdbm - ndbm work-alike hashed database library
- * tuning and portability constructs [not nearly enough]
- * author: oz@nexus.yorku.ca
- */
-
-#define BYTESIZ         8
-
-/*
- * important tuning parms (hah)
- */
-
-#define SEEDUPS                 /* always detect duplicates */
-#define BADMESS                 /* generate a message for worst case:
-                                   cannot make room after SPLTMAX splits */
-/*
- * misc
- */
-#ifdef DEBUG
-#define debug(x)        printf x
-#else
-#define debug(x)
-#endif
-
-#endif /* SSL_UTIL_SDBM_H */