From 2d14fa5b39694a347c2ac97f16fc2c68a2f741a4 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mysql.com>
Date: Mon, 11 Nov 2002 00:08:42 +0100
Subject: disable chmod in bdb scripts - bk doesn't like somebody messing with
 permissions delete auto-generated files remove in-place editing

BitKeeper/deleted/.del-ex_apprec_auto.c~6e4c8882b1f0fe9d:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_auto.c
BitKeeper/deleted/.del-ex_apprec_auto.h~d01f1e472bf1b59f:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_auto.h
BitKeeper/deleted/.del-ex_apprec_template~4157a705d73c1209:
  Delete: bdb/examples_c/ex_apprec/ex_apprec_template
bdb/rpc_server/c/db_server_proc.c.in:
  Rename: bdb/rpc_server/c/db_server_proc.c -> bdb/rpc_server/c/db_server_proc.c.in
BitKeeper/deleted/.del-rpc_defs.in~bfc9820a618d5926:
  Delete: bdb/dbinc_auto/rpc_defs.in
BitKeeper/deleted/.del-db_server.h~1c77cc0d19f3ecf:
  Delete: bdb/dbinc_auto/db_server.h
BitKeeper/deleted/.del-db_server_proc.sed~94a351b3e31c0ad0:
  Delete: bdb/rpc_server/c/db_server_proc.sed
BitKeeper/deleted/.del-db_server_svc.c~66ae3c56737e07ab:
  Delete: bdb/rpc_server/c/db_server_svc.c
BitKeeper/deleted/.del-db_server_xdr.c~518231ed78b9cdcf:
  Delete: bdb/rpc_server/c/db_server_xdr.c
BitKeeper/deleted/.del-gen_db_server.c~51935e227c7c23ac:
  Delete: bdb/rpc_server/c/gen_db_server.c
bdb/dist/RELEASE:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_crypto:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_perm:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_recover:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_rpc:
  NEVER modify files in-place!!!
bdb/dist/s_symlink:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
bdb/dist/s_tags:
  disable chmod in bdb scripts - bk doesn't like somebody messing with permissions
---
 bdb/dbinc_auto/db_server.h                  | 1006 -----------
 bdb/dbinc_auto/rpc_defs.in                  |    4 -
 bdb/dist/RELEASE                            |    9 +
 bdb/dist/s_crypto                           |    2 +
 bdb/dist/s_perm                             |    2 +
 bdb/dist/s_recover                          |    2 +
 bdb/dist/s_rpc                              |    6 +-
 bdb/dist/s_symlink                          |    1 +
 bdb/dist/s_tags                             |    2 +
 bdb/examples_c/ex_apprec/ex_apprec_auto.c   |  188 --
 bdb/examples_c/ex_apprec/ex_apprec_auto.h   |   13 -
 bdb/examples_c/ex_apprec/ex_apprec_template |   75 -
 bdb/rpc_server/c/db_server_proc.c           | 2500 ---------------------------
 bdb/rpc_server/c/db_server_proc.c.in        | 2500 +++++++++++++++++++++++++++
 bdb/rpc_server/c/db_server_proc.sed         |  772 ---------
 bdb/rpc_server/c/db_server_svc.c            |  435 -----
 bdb/rpc_server/c/db_server_xdr.c            | 1512 ----------------
 bdb/rpc_server/c/gen_db_server.c            | 1169 -------------
 18 files changed, 2519 insertions(+), 7679 deletions(-)
 delete mode 100644 bdb/dbinc_auto/db_server.h
 delete mode 100644 bdb/dbinc_auto/rpc_defs.in
 delete mode 100644 bdb/examples_c/ex_apprec/ex_apprec_auto.c
 delete mode 100644 bdb/examples_c/ex_apprec/ex_apprec_auto.h
 delete mode 100644 bdb/examples_c/ex_apprec/ex_apprec_template
 delete mode 100644 bdb/rpc_server/c/db_server_proc.c
 create mode 100644 bdb/rpc_server/c/db_server_proc.c.in
 delete mode 100644 bdb/rpc_server/c/db_server_proc.sed
 delete mode 100644 bdb/rpc_server/c/db_server_svc.c
 delete mode 100644 bdb/rpc_server/c/db_server_xdr.c
 delete mode 100644 bdb/rpc_server/c/gen_db_server.c

diff --git a/bdb/dbinc_auto/db_server.h b/bdb/dbinc_auto/db_server.h
deleted file mode 100644
index 3409eed1a9f..00000000000
--- a/bdb/dbinc_auto/db_server.h
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _DB_SERVER_H_RPCGEN
-#define	_DB_SERVER_H_RPCGEN
-
-
-struct __env_cachesize_msg {
-	u_int dbenvcl_id;
-	u_int gbytes;
-	u_int bytes;
-	u_int ncache;
-};
-typedef struct __env_cachesize_msg __env_cachesize_msg;
-
-struct __env_cachesize_reply {
-	int status;
-};
-typedef struct __env_cachesize_reply __env_cachesize_reply;
-
-struct __env_close_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-};
-typedef struct __env_close_msg __env_close_msg;
-
-struct __env_close_reply {
-	int status;
-};
-typedef struct __env_close_reply __env_close_reply;
-
-struct __env_create_msg {
-	u_int timeout;
-};
-typedef struct __env_create_msg __env_create_msg;
-
-struct __env_create_reply {
-	int status;
-	u_int envcl_id;
-};
-typedef struct __env_create_reply __env_create_reply;
-
-struct __env_dbremove_msg {
-	u_int dbenvcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int flags;
-};
-typedef struct __env_dbremove_msg __env_dbremove_msg;
-
-struct __env_dbremove_reply {
-	int status;
-};
-typedef struct __env_dbremove_reply __env_dbremove_reply;
-
-struct __env_dbrename_msg {
-	u_int dbenvcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int flags;
-};
-typedef struct __env_dbrename_msg __env_dbrename_msg;
-
-struct __env_dbrename_reply {
-	int status;
-};
-typedef struct __env_dbrename_reply __env_dbrename_reply;
-
-struct __env_encrypt_msg {
-	u_int dbenvcl_id;
-	char *passwd;
-	u_int flags;
-};
-typedef struct __env_encrypt_msg __env_encrypt_msg;
-
-struct __env_encrypt_reply {
-	int status;
-};
-typedef struct __env_encrypt_reply __env_encrypt_reply;
-
-struct __env_flags_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-	u_int onoff;
-};
-typedef struct __env_flags_msg __env_flags_msg;
-
-struct __env_flags_reply {
-	int status;
-};
-typedef struct __env_flags_reply __env_flags_reply;
-
-struct __env_open_msg {
-	u_int dbenvcl_id;
-	char *home;
-	u_int flags;
-	u_int mode;
-};
-typedef struct __env_open_msg __env_open_msg;
-
-struct __env_open_reply {
-	int status;
-	u_int envcl_id;
-};
-typedef struct __env_open_reply __env_open_reply;
-
-struct __env_remove_msg {
-	u_int dbenvcl_id;
-	char *home;
-	u_int flags;
-};
-typedef struct __env_remove_msg __env_remove_msg;
-
-struct __env_remove_reply {
-	int status;
-};
-typedef struct __env_remove_reply __env_remove_reply;
-
-struct __txn_abort_msg {
-	u_int txnpcl_id;
-};
-typedef struct __txn_abort_msg __txn_abort_msg;
-
-struct __txn_abort_reply {
-	int status;
-};
-typedef struct __txn_abort_reply __txn_abort_reply;
-
-struct __txn_begin_msg {
-	u_int dbenvcl_id;
-	u_int parentcl_id;
-	u_int flags;
-};
-typedef struct __txn_begin_msg __txn_begin_msg;
-
-struct __txn_begin_reply {
-	int status;
-	u_int txnidcl_id;
-};
-typedef struct __txn_begin_reply __txn_begin_reply;
-
-struct __txn_commit_msg {
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __txn_commit_msg __txn_commit_msg;
-
-struct __txn_commit_reply {
-	int status;
-};
-typedef struct __txn_commit_reply __txn_commit_reply;
-
-struct __txn_discard_msg {
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __txn_discard_msg __txn_discard_msg;
-
-struct __txn_discard_reply {
-	int status;
-};
-typedef struct __txn_discard_reply __txn_discard_reply;
-
-struct __txn_prepare_msg {
-	u_int txnpcl_id;
-	char gid[128];
-};
-typedef struct __txn_prepare_msg __txn_prepare_msg;
-
-struct __txn_prepare_reply {
-	int status;
-};
-typedef struct __txn_prepare_reply __txn_prepare_reply;
-
-struct __txn_recover_msg {
-	u_int dbenvcl_id;
-	u_int count;
-	u_int flags;
-};
-typedef struct __txn_recover_msg __txn_recover_msg;
-
-struct __txn_recover_reply {
-	int status;
-	struct {
-		u_int txn_len;
-		u_int *txn_val;
-	} txn;
-	struct {
-		u_int gid_len;
-		char *gid_val;
-	} gid;
-	u_int retcount;
-};
-typedef struct __txn_recover_reply __txn_recover_reply;
-
-struct __db_associate_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int sdbpcl_id;
-	u_int flags;
-};
-typedef struct __db_associate_msg __db_associate_msg;
-
-struct __db_associate_reply {
-	int status;
-};
-typedef struct __db_associate_reply __db_associate_reply;
-
-struct __db_bt_maxkey_msg {
-	u_int dbpcl_id;
-	u_int maxkey;
-};
-typedef struct __db_bt_maxkey_msg __db_bt_maxkey_msg;
-
-struct __db_bt_maxkey_reply {
-	int status;
-};
-typedef struct __db_bt_maxkey_reply __db_bt_maxkey_reply;
-
-struct __db_bt_minkey_msg {
-	u_int dbpcl_id;
-	u_int minkey;
-};
-typedef struct __db_bt_minkey_msg __db_bt_minkey_msg;
-
-struct __db_bt_minkey_reply {
-	int status;
-};
-typedef struct __db_bt_minkey_reply __db_bt_minkey_reply;
-
-struct __db_close_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_close_msg __db_close_msg;
-
-struct __db_close_reply {
-	int status;
-};
-typedef struct __db_close_reply __db_close_reply;
-
-struct __db_create_msg {
-	u_int dbenvcl_id;
-	u_int flags;
-};
-typedef struct __db_create_msg __db_create_msg;
-
-struct __db_create_reply {
-	int status;
-	u_int dbcl_id;
-};
-typedef struct __db_create_reply __db_create_reply;
-
-struct __db_del_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int flags;
-};
-typedef struct __db_del_msg __db_del_msg;
-
-struct __db_del_reply {
-	int status;
-};
-typedef struct __db_del_reply __db_del_reply;
-
-struct __db_encrypt_msg {
-	u_int dbpcl_id;
-	char *passwd;
-	u_int flags;
-};
-typedef struct __db_encrypt_msg __db_encrypt_msg;
-
-struct __db_encrypt_reply {
-	int status;
-};
-typedef struct __db_encrypt_reply __db_encrypt_reply;
-
-struct __db_extentsize_msg {
-	u_int dbpcl_id;
-	u_int extentsize;
-};
-typedef struct __db_extentsize_msg __db_extentsize_msg;
-
-struct __db_extentsize_reply {
-	int status;
-};
-typedef struct __db_extentsize_reply __db_extentsize_reply;
-
-struct __db_flags_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_flags_msg __db_flags_msg;
-
-struct __db_flags_reply {
-	int status;
-};
-typedef struct __db_flags_reply __db_flags_reply;
-
-struct __db_get_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_get_msg __db_get_msg;
-
-struct __db_get_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __db_get_reply __db_get_reply;
-
-struct __db_h_ffactor_msg {
-	u_int dbpcl_id;
-	u_int ffactor;
-};
-typedef struct __db_h_ffactor_msg __db_h_ffactor_msg;
-
-struct __db_h_ffactor_reply {
-	int status;
-};
-typedef struct __db_h_ffactor_reply __db_h_ffactor_reply;
-
-struct __db_h_nelem_msg {
-	u_int dbpcl_id;
-	u_int nelem;
-};
-typedef struct __db_h_nelem_msg __db_h_nelem_msg;
-
-struct __db_h_nelem_reply {
-	int status;
-};
-typedef struct __db_h_nelem_reply __db_h_nelem_reply;
-
-struct __db_key_range_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int flags;
-};
-typedef struct __db_key_range_msg __db_key_range_msg;
-
-struct __db_key_range_reply {
-	int status;
-	double less;
-	double equal;
-	double greater;
-};
-typedef struct __db_key_range_reply __db_key_range_reply;
-
-struct __db_lorder_msg {
-	u_int dbpcl_id;
-	u_int lorder;
-};
-typedef struct __db_lorder_msg __db_lorder_msg;
-
-struct __db_lorder_reply {
-	int status;
-};
-typedef struct __db_lorder_reply __db_lorder_reply;
-
-struct __db_open_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int type;
-	u_int flags;
-	u_int mode;
-};
-typedef struct __db_open_msg __db_open_msg;
-
-struct __db_open_reply {
-	int status;
-	u_int dbcl_id;
-	u_int type;
-	u_int dbflags;
-	u_int lorder;
-};
-typedef struct __db_open_reply __db_open_reply;
-
-struct __db_pagesize_msg {
-	u_int dbpcl_id;
-	u_int pagesize;
-};
-typedef struct __db_pagesize_msg __db_pagesize_msg;
-
-struct __db_pagesize_reply {
-	int status;
-};
-typedef struct __db_pagesize_reply __db_pagesize_reply;
-
-struct __db_pget_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int skeydlen;
-	u_int skeydoff;
-	u_int skeyulen;
-	u_int skeyflags;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	u_int pkeydlen;
-	u_int pkeydoff;
-	u_int pkeyulen;
-	u_int pkeyflags;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_pget_msg __db_pget_msg;
-
-struct __db_pget_reply {
-	int status;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __db_pget_reply __db_pget_reply;
-
-struct __db_put_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __db_put_msg __db_put_msg;
-
-struct __db_put_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-};
-typedef struct __db_put_reply __db_put_reply;
-
-struct __db_re_delim_msg {
-	u_int dbpcl_id;
-	u_int delim;
-};
-typedef struct __db_re_delim_msg __db_re_delim_msg;
-
-struct __db_re_delim_reply {
-	int status;
-};
-typedef struct __db_re_delim_reply __db_re_delim_reply;
-
-struct __db_re_len_msg {
-	u_int dbpcl_id;
-	u_int len;
-};
-typedef struct __db_re_len_msg __db_re_len_msg;
-
-struct __db_re_len_reply {
-	int status;
-};
-typedef struct __db_re_len_reply __db_re_len_reply;
-
-struct __db_re_pad_msg {
-	u_int dbpcl_id;
-	u_int pad;
-};
-typedef struct __db_re_pad_msg __db_re_pad_msg;
-
-struct __db_re_pad_reply {
-	int status;
-};
-typedef struct __db_re_pad_reply __db_re_pad_reply;
-
-struct __db_remove_msg {
-	u_int dbpcl_id;
-	char *name;
-	char *subdb;
-	u_int flags;
-};
-typedef struct __db_remove_msg __db_remove_msg;
-
-struct __db_remove_reply {
-	int status;
-};
-typedef struct __db_remove_reply __db_remove_reply;
-
-struct __db_rename_msg {
-	u_int dbpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int flags;
-};
-typedef struct __db_rename_msg __db_rename_msg;
-
-struct __db_rename_reply {
-	int status;
-};
-typedef struct __db_rename_reply __db_rename_reply;
-
-struct __db_stat_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_stat_msg __db_stat_msg;
-
-struct __db_stat_reply {
-	int status;
-	struct {
-		u_int stats_len;
-		u_int *stats_val;
-	} stats;
-};
-typedef struct __db_stat_reply __db_stat_reply;
-
-struct __db_sync_msg {
-	u_int dbpcl_id;
-	u_int flags;
-};
-typedef struct __db_sync_msg __db_sync_msg;
-
-struct __db_sync_reply {
-	int status;
-};
-typedef struct __db_sync_reply __db_sync_reply;
-
-struct __db_truncate_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __db_truncate_msg __db_truncate_msg;
-
-struct __db_truncate_reply {
-	int status;
-	u_int count;
-};
-typedef struct __db_truncate_reply __db_truncate_reply;
-
-struct __db_cursor_msg {
-	u_int dbpcl_id;
-	u_int txnpcl_id;
-	u_int flags;
-};
-typedef struct __db_cursor_msg __db_cursor_msg;
-
-struct __db_cursor_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __db_cursor_reply __db_cursor_reply;
-
-struct __db_join_msg {
-	u_int dbpcl_id;
-	struct {
-		u_int curs_len;
-		u_int *curs_val;
-	} curs;
-	u_int flags;
-};
-typedef struct __db_join_msg __db_join_msg;
-
-struct __db_join_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __db_join_reply __db_join_reply;
-
-struct __dbc_close_msg {
-	u_int dbccl_id;
-};
-typedef struct __dbc_close_msg __dbc_close_msg;
-
-struct __dbc_close_reply {
-	int status;
-};
-typedef struct __dbc_close_reply __dbc_close_reply;
-
-struct __dbc_count_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_count_msg __dbc_count_msg;
-
-struct __dbc_count_reply {
-	int status;
-	u_int dupcount;
-};
-typedef struct __dbc_count_reply __dbc_count_reply;
-
-struct __dbc_del_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_del_msg __dbc_del_msg;
-
-struct __dbc_del_reply {
-	int status;
-};
-typedef struct __dbc_del_reply __dbc_del_reply;
-
-struct __dbc_dup_msg {
-	u_int dbccl_id;
-	u_int flags;
-};
-typedef struct __dbc_dup_msg __dbc_dup_msg;
-
-struct __dbc_dup_reply {
-	int status;
-	u_int dbcidcl_id;
-};
-typedef struct __dbc_dup_reply __dbc_dup_reply;
-
-struct __dbc_get_msg {
-	u_int dbccl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_get_msg __dbc_get_msg;
-
-struct __dbc_get_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __dbc_get_reply __dbc_get_reply;
-
-struct __dbc_pget_msg {
-	u_int dbccl_id;
-	u_int skeydlen;
-	u_int skeydoff;
-	u_int skeyulen;
-	u_int skeyflags;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	u_int pkeydlen;
-	u_int pkeydoff;
-	u_int pkeyulen;
-	u_int pkeyflags;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_pget_msg __dbc_pget_msg;
-
-struct __dbc_pget_reply {
-	int status;
-	struct {
-		u_int skeydata_len;
-		char *skeydata_val;
-	} skeydata;
-	struct {
-		u_int pkeydata_len;
-		char *pkeydata_val;
-	} pkeydata;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-};
-typedef struct __dbc_pget_reply __dbc_pget_reply;
-
-struct __dbc_put_msg {
-	u_int dbccl_id;
-	u_int keydlen;
-	u_int keydoff;
-	u_int keyulen;
-	u_int keyflags;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-	u_int datadlen;
-	u_int datadoff;
-	u_int dataulen;
-	u_int dataflags;
-	struct {
-		u_int datadata_len;
-		char *datadata_val;
-	} datadata;
-	u_int flags;
-};
-typedef struct __dbc_put_msg __dbc_put_msg;
-
-struct __dbc_put_reply {
-	int status;
-	struct {
-		u_int keydata_len;
-		char *keydata_val;
-	} keydata;
-};
-typedef struct __dbc_put_reply __dbc_put_reply;
-
-#define	__DB_env_cachesize ((unsigned long)(1))
-extern  __env_cachesize_reply * __db_env_cachesize_4001();
-#define	__DB_env_close ((unsigned long)(2))
-extern  __env_close_reply * __db_env_close_4001();
-#define	__DB_env_create ((unsigned long)(3))
-extern  __env_create_reply * __db_env_create_4001();
-#define	__DB_env_dbremove ((unsigned long)(4))
-extern  __env_dbremove_reply * __db_env_dbremove_4001();
-#define	__DB_env_dbrename ((unsigned long)(5))
-extern  __env_dbrename_reply * __db_env_dbrename_4001();
-#define	__DB_env_encrypt ((unsigned long)(6))
-extern  __env_encrypt_reply * __db_env_encrypt_4001();
-#define	__DB_env_flags ((unsigned long)(7))
-extern  __env_flags_reply * __db_env_flags_4001();
-#define	__DB_env_open ((unsigned long)(8))
-extern  __env_open_reply * __db_env_open_4001();
-#define	__DB_env_remove ((unsigned long)(9))
-extern  __env_remove_reply * __db_env_remove_4001();
-#define	__DB_txn_abort ((unsigned long)(10))
-extern  __txn_abort_reply * __db_txn_abort_4001();
-#define	__DB_txn_begin ((unsigned long)(11))
-extern  __txn_begin_reply * __db_txn_begin_4001();
-#define	__DB_txn_commit ((unsigned long)(12))
-extern  __txn_commit_reply * __db_txn_commit_4001();
-#define	__DB_txn_discard ((unsigned long)(13))
-extern  __txn_discard_reply * __db_txn_discard_4001();
-#define	__DB_txn_prepare ((unsigned long)(14))
-extern  __txn_prepare_reply * __db_txn_prepare_4001();
-#define	__DB_txn_recover ((unsigned long)(15))
-extern  __txn_recover_reply * __db_txn_recover_4001();
-#define	__DB_db_associate ((unsigned long)(16))
-extern  __db_associate_reply * __db_db_associate_4001();
-#define	__DB_db_bt_maxkey ((unsigned long)(17))
-extern  __db_bt_maxkey_reply * __db_db_bt_maxkey_4001();
-#define	__DB_db_bt_minkey ((unsigned long)(18))
-extern  __db_bt_minkey_reply * __db_db_bt_minkey_4001();
-#define	__DB_db_close ((unsigned long)(19))
-extern  __db_close_reply * __db_db_close_4001();
-#define	__DB_db_create ((unsigned long)(20))
-extern  __db_create_reply * __db_db_create_4001();
-#define	__DB_db_del ((unsigned long)(21))
-extern  __db_del_reply * __db_db_del_4001();
-#define	__DB_db_encrypt ((unsigned long)(22))
-extern  __db_encrypt_reply * __db_db_encrypt_4001();
-#define	__DB_db_extentsize ((unsigned long)(23))
-extern  __db_extentsize_reply * __db_db_extentsize_4001();
-#define	__DB_db_flags ((unsigned long)(24))
-extern  __db_flags_reply * __db_db_flags_4001();
-#define	__DB_db_get ((unsigned long)(25))
-extern  __db_get_reply * __db_db_get_4001();
-#define	__DB_db_h_ffactor ((unsigned long)(26))
-extern  __db_h_ffactor_reply * __db_db_h_ffactor_4001();
-#define	__DB_db_h_nelem ((unsigned long)(27))
-extern  __db_h_nelem_reply * __db_db_h_nelem_4001();
-#define	__DB_db_key_range ((unsigned long)(28))
-extern  __db_key_range_reply * __db_db_key_range_4001();
-#define	__DB_db_lorder ((unsigned long)(29))
-extern  __db_lorder_reply * __db_db_lorder_4001();
-#define	__DB_db_open ((unsigned long)(30))
-extern  __db_open_reply * __db_db_open_4001();
-#define	__DB_db_pagesize ((unsigned long)(31))
-extern  __db_pagesize_reply * __db_db_pagesize_4001();
-#define	__DB_db_pget ((unsigned long)(32))
-extern  __db_pget_reply * __db_db_pget_4001();
-#define	__DB_db_put ((unsigned long)(33))
-extern  __db_put_reply * __db_db_put_4001();
-#define	__DB_db_re_delim ((unsigned long)(34))
-extern  __db_re_delim_reply * __db_db_re_delim_4001();
-#define	__DB_db_re_len ((unsigned long)(35))
-extern  __db_re_len_reply * __db_db_re_len_4001();
-#define	__DB_db_re_pad ((unsigned long)(36))
-extern  __db_re_pad_reply * __db_db_re_pad_4001();
-#define	__DB_db_remove ((unsigned long)(37))
-extern  __db_remove_reply * __db_db_remove_4001();
-#define	__DB_db_rename ((unsigned long)(38))
-extern  __db_rename_reply * __db_db_rename_4001();
-#define	__DB_db_stat ((unsigned long)(39))
-extern  __db_stat_reply * __db_db_stat_4001();
-#define	__DB_db_sync ((unsigned long)(40))
-extern  __db_sync_reply * __db_db_sync_4001();
-#define	__DB_db_truncate ((unsigned long)(41))
-extern  __db_truncate_reply * __db_db_truncate_4001();
-#define	__DB_db_cursor ((unsigned long)(42))
-extern  __db_cursor_reply * __db_db_cursor_4001();
-#define	__DB_db_join ((unsigned long)(43))
-extern  __db_join_reply * __db_db_join_4001();
-#define	__DB_dbc_close ((unsigned long)(44))
-extern  __dbc_close_reply * __db_dbc_close_4001();
-#define	__DB_dbc_count ((unsigned long)(45))
-extern  __dbc_count_reply * __db_dbc_count_4001();
-#define	__DB_dbc_del ((unsigned long)(46))
-extern  __dbc_del_reply * __db_dbc_del_4001();
-#define	__DB_dbc_dup ((unsigned long)(47))
-extern  __dbc_dup_reply * __db_dbc_dup_4001();
-#define	__DB_dbc_get ((unsigned long)(48))
-extern  __dbc_get_reply * __db_dbc_get_4001();
-#define	__DB_dbc_pget ((unsigned long)(49))
-extern  __dbc_pget_reply * __db_dbc_pget_4001();
-#define	__DB_dbc_put ((unsigned long)(50))
-extern  __dbc_put_reply * __db_dbc_put_4001();
-extern int db_rpc_serverprog_4001_freeresult();
-
-/* the xdr functions */
-extern bool_t xdr___env_cachesize_msg();
-extern bool_t xdr___env_cachesize_reply();
-extern bool_t xdr___env_close_msg();
-extern bool_t xdr___env_close_reply();
-extern bool_t xdr___env_create_msg();
-extern bool_t xdr___env_create_reply();
-extern bool_t xdr___env_dbremove_msg();
-extern bool_t xdr___env_dbremove_reply();
-extern bool_t xdr___env_dbrename_msg();
-extern bool_t xdr___env_dbrename_reply();
-extern bool_t xdr___env_encrypt_msg();
-extern bool_t xdr___env_encrypt_reply();
-extern bool_t xdr___env_flags_msg();
-extern bool_t xdr___env_flags_reply();
-extern bool_t xdr___env_open_msg();
-extern bool_t xdr___env_open_reply();
-extern bool_t xdr___env_remove_msg();
-extern bool_t xdr___env_remove_reply();
-extern bool_t xdr___txn_abort_msg();
-extern bool_t xdr___txn_abort_reply();
-extern bool_t xdr___txn_begin_msg();
-extern bool_t xdr___txn_begin_reply();
-extern bool_t xdr___txn_commit_msg();
-extern bool_t xdr___txn_commit_reply();
-extern bool_t xdr___txn_discard_msg();
-extern bool_t xdr___txn_discard_reply();
-extern bool_t xdr___txn_prepare_msg();
-extern bool_t xdr___txn_prepare_reply();
-extern bool_t xdr___txn_recover_msg();
-extern bool_t xdr___txn_recover_reply();
-extern bool_t xdr___db_associate_msg();
-extern bool_t xdr___db_associate_reply();
-extern bool_t xdr___db_bt_maxkey_msg();
-extern bool_t xdr___db_bt_maxkey_reply();
-extern bool_t xdr___db_bt_minkey_msg();
-extern bool_t xdr___db_bt_minkey_reply();
-extern bool_t xdr___db_close_msg();
-extern bool_t xdr___db_close_reply();
-extern bool_t xdr___db_create_msg();
-extern bool_t xdr___db_create_reply();
-extern bool_t xdr___db_del_msg();
-extern bool_t xdr___db_del_reply();
-extern bool_t xdr___db_encrypt_msg();
-extern bool_t xdr___db_encrypt_reply();
-extern bool_t xdr___db_extentsize_msg();
-extern bool_t xdr___db_extentsize_reply();
-extern bool_t xdr___db_flags_msg();
-extern bool_t xdr___db_flags_reply();
-extern bool_t xdr___db_get_msg();
-extern bool_t xdr___db_get_reply();
-extern bool_t xdr___db_h_ffactor_msg();
-extern bool_t xdr___db_h_ffactor_reply();
-extern bool_t xdr___db_h_nelem_msg();
-extern bool_t xdr___db_h_nelem_reply();
-extern bool_t xdr___db_key_range_msg();
-extern bool_t xdr___db_key_range_reply();
-extern bool_t xdr___db_lorder_msg();
-extern bool_t xdr___db_lorder_reply();
-extern bool_t xdr___db_open_msg();
-extern bool_t xdr___db_open_reply();
-extern bool_t xdr___db_pagesize_msg();
-extern bool_t xdr___db_pagesize_reply();
-extern bool_t xdr___db_pget_msg();
-extern bool_t xdr___db_pget_reply();
-extern bool_t xdr___db_put_msg();
-extern bool_t xdr___db_put_reply();
-extern bool_t xdr___db_re_delim_msg();
-extern bool_t xdr___db_re_delim_reply();
-extern bool_t xdr___db_re_len_msg();
-extern bool_t xdr___db_re_len_reply();
-extern bool_t xdr___db_re_pad_msg();
-extern bool_t xdr___db_re_pad_reply();
-extern bool_t xdr___db_remove_msg();
-extern bool_t xdr___db_remove_reply();
-extern bool_t xdr___db_rename_msg();
-extern bool_t xdr___db_rename_reply();
-extern bool_t xdr___db_stat_msg();
-extern bool_t xdr___db_stat_reply();
-extern bool_t xdr___db_sync_msg();
-extern bool_t xdr___db_sync_reply();
-extern bool_t xdr___db_truncate_msg();
-extern bool_t xdr___db_truncate_reply();
-extern bool_t xdr___db_cursor_msg();
-extern bool_t xdr___db_cursor_reply();
-extern bool_t xdr___db_join_msg();
-extern bool_t xdr___db_join_reply();
-extern bool_t xdr___dbc_close_msg();
-extern bool_t xdr___dbc_close_reply();
-extern bool_t xdr___dbc_count_msg();
-extern bool_t xdr___dbc_count_reply();
-extern bool_t xdr___dbc_del_msg();
-extern bool_t xdr___dbc_del_reply();
-extern bool_t xdr___dbc_dup_msg();
-extern bool_t xdr___dbc_dup_reply();
-extern bool_t xdr___dbc_get_msg();
-extern bool_t xdr___dbc_get_reply();
-extern bool_t xdr___dbc_pget_msg();
-extern bool_t xdr___dbc_pget_reply();
-extern bool_t xdr___dbc_put_msg();
-extern bool_t xdr___dbc_put_reply();
-
-#endif /* !_DB_SERVER_H_RPCGEN */
diff --git a/bdb/dbinc_auto/rpc_defs.in b/bdb/dbinc_auto/rpc_defs.in
deleted file mode 100644
index cae76f5606d..00000000000
--- a/bdb/dbinc_auto/rpc_defs.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_rpc. */
-#define	DB_RPC_SERVERPROG ((unsigned long)(351457))
-#define	DB_RPC_SERVERVERS ((unsigned long)(4001))
diff --git a/bdb/dist/RELEASE b/bdb/dist/RELEASE
index fe9b6667bbe..9054f122cb4 100644
--- a/bdb/dist/RELEASE
+++ b/bdb/dist/RELEASE
@@ -9,3 +9,12 @@ DB_VERSION_UNIQUE_NAME=`printf "_%d%03d" $DB_VERSION_MAJOR $DB_VERSION_MINOR`
 
 DB_RELEASE_DATE=`date "+%B %e, %Y"`
 DB_VERSION_STRING="Sleepycat Software: Berkeley DB $DB_VERSION: ($DB_RELEASE_DATE)"
+
+# this file is included by all s_* scripts, so it's the way to apply
+# hacks :)
+
+# bitkeeper doesn't like somebody to mess with permissions!
+chmod()
+{
+  #echo "chmod $1 $2"
+}
diff --git a/bdb/dist/s_crypto b/bdb/dist/s_crypto
index be7e5de0474..f7947cb3e10 100644
--- a/bdb/dist/s_crypto
+++ b/bdb/dist/s_crypto
@@ -3,6 +3,8 @@
 
 # Remove crypto from the DB source tree.
 
+. ./RELEASE
+
 d=..
 
 t=/tmp/__db_a
diff --git a/bdb/dist/s_perm b/bdb/dist/s_perm
index 03cc4a35a8a..c35278b8c83 100755
--- a/bdb/dist/s_perm
+++ b/bdb/dist/s_perm
@@ -4,6 +4,8 @@
 d=..
 echo 'Updating Berkeley DB source tree permissions...'
 
+. ./RELEASE
+
 run()
 {
 	echo "	$1 ($2)"
diff --git a/bdb/dist/s_recover b/bdb/dist/s_recover
index 331ae623d3f..869b5bfd363 100755
--- a/bdb/dist/s_recover
+++ b/bdb/dist/s_recover
@@ -3,6 +3,8 @@
 #
 # Build the automatically generated logging/recovery files.
 
+. ./RELEASE
+
 tmp=/tmp/__db_a
 loglist=/tmp/__db_b
 source=/tmp/__db_c
diff --git a/bdb/dist/s_rpc b/bdb/dist/s_rpc
index 302930068ca..7c478c2b5e1 100644
--- a/bdb/dist/s_rpc
+++ b/bdb/dist/s_rpc
@@ -25,9 +25,6 @@ server_file=../rpc_server/c/gen_db_server.c
 stmpl_file=./template/db_server_proc
 xdr_file=../rpc_server/db_server.x
 
-#
-# NOTE: We do NOT want to remove proc_file.  It is what we apply $sed_file
-# to, but we do not want to remove it, it does not get built in place.
 rm -f   $client_file \
 	$ctmpl_file \
 	$header_file \
@@ -92,8 +89,7 @@ ENDOFSEDTEXT
 sed -f $t $rpcsvc_file > ${rpcsvc_file}.new
 mv ${rpcsvc_file}.new $rpcsvc_file
 
-sed -f $sed_file $proc_file > ${proc_file}.new
-mv ${proc_file}.new $proc_file
+sed -f $sed_file ${proc_file}.in > ${proc_file}
 
 # Run rpcgen files through sed to add HAVE_RPC ifdef and appropriate
 # includes.
diff --git a/bdb/dist/s_symlink b/bdb/dist/s_symlink
index e69bb57dc46..ee80a220a83 100755
--- a/bdb/dist/s_symlink
+++ b/bdb/dist/s_symlink
@@ -2,6 +2,7 @@
 #	$Id: s_symlink,v 1.28 2002/08/18 21:15:45 bostic Exp $
 
 echo 'Creating Berkeley DB source tree symbolic links...'
+. ./RELEASE
 
 build()
 {
diff --git a/bdb/dist/s_tags b/bdb/dist/s_tags
index d5037896443..18b6025aa86 100755
--- a/bdb/dist/s_tags
+++ b/bdb/dist/s_tags
@@ -3,6 +3,8 @@
 #
 # Build tags files.
 
+. ./RELEASE
+
 files="../dbinc/*.h \
 	../dbinc/*.in \
 	../btree/*.[ch] \
diff --git a/bdb/examples_c/ex_apprec/ex_apprec_auto.c b/bdb/examples_c/ex_apprec/ex_apprec_auto.c
deleted file mode 100644
index d8c27e762c7..00000000000
--- a/bdb/examples_c/ex_apprec/ex_apprec_auto.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-
-#include "ex_apprec.h"
-/*
- * PUBLIC: int ex_apprec_mkdir_log __P((DB_ENV *, DB_TXN *, DB_LSN *,
- * PUBLIC:     u_int32_t, const DBT *));
- */
-int
-ex_apprec_mkdir_log(dbenv, txnid, ret_lsnp, flags,
-    dirname)
-	DB_ENV *dbenv;
-	DB_TXN *txnid;
-	DB_LSN *ret_lsnp;
-	u_int32_t flags;
-	const DBT *dirname;
-{
-	DBT logrec;
-	DB_LSN *lsnp, null_lsn;
-	u_int32_t zero;
-	u_int32_t npad, rectype, txn_num;
-	int ret;
-	u_int8_t *bp;
-
-	rectype = DB_ex_apprec_mkdir;
-	npad = 0;
-
-	if (txnid == NULL) {
-		txn_num = 0;
-		null_lsn.file = 0;
-		null_lsn.offset = 0;
-		lsnp = &null_lsn;
-	} else {
-		txn_num = txnid->txnid;
-		lsnp = &txnid->last_lsn;
-	}
-
-	logrec.size = sizeof(rectype) + sizeof(txn_num) + sizeof(DB_LSN)
-	    + sizeof(u_int32_t) + (dirname == NULL ? 0 : dirname->size);
-	if ((logrec.data = malloc(logrec.size)) == NULL)
-		return (ENOMEM);
-
-	if (npad > 0)
-		memset((u_int8_t *)logrec.data + logrec.size - npad, 0, npad);
-
-	bp = logrec.data;
-
-	memcpy(bp, &rectype, sizeof(rectype));
-	bp += sizeof(rectype);
-
-	memcpy(bp, &txn_num, sizeof(txn_num));
-	bp += sizeof(txn_num);
-
-	memcpy(bp, lsnp, sizeof(DB_LSN));
-	bp += sizeof(DB_LSN);
-
-	if (dirname == NULL) {
-		zero = 0;
-		memcpy(bp, &zero, sizeof(u_int32_t));
-		bp += sizeof(u_int32_t);
-	} else {
-		memcpy(bp, &dirname->size, sizeof(dirname->size));
-		bp += sizeof(dirname->size);
-		memcpy(bp, dirname->data, dirname->size);
-		bp += dirname->size;
-	}
-
-	ret = dbenv->log_put(dbenv,
-	   ret_lsnp, (DBT *)&logrec, flags);
-	if (txnid != NULL && ret == 0)
-		txnid->last_lsn = *ret_lsnp;
-#ifdef LOG_DIAGNOSTIC
-	if (ret != 0)
-		(void)ex_apprec_mkdir_print(dbenv,
-		    (DBT *)&logrec, ret_lsnp, NULL, NULL);
-#endif
-	free(logrec.data);
-	return (ret);
-}
-
-/*
- * PUBLIC: int ex_apprec_mkdir_print __P((DB_ENV *, DBT *, DB_LSN *,
- * PUBLIC:     db_recops, void *));
- */
-int
-ex_apprec_mkdir_print(dbenv, dbtp, lsnp, notused2, notused3)
-	DB_ENV *dbenv;
-	DBT *dbtp;
-	DB_LSN *lsnp;
-	db_recops notused2;
-	void *notused3;
-{
-	ex_apprec_mkdir_args *argp;
-	u_int32_t i;
-	int ch;
-	int ret;
-
-	notused2 = DB_TXN_ABORT;
-	notused3 = NULL;
-
-	if ((ret = ex_apprec_mkdir_read(dbenv, dbtp->data, &argp)) != 0)
-		return (ret);
-	(void)printf(
-	    "[%lu][%lu]ex_apprec_mkdir: rec: %lu txnid %lx prevlsn [%lu][%lu]\n",
-	    (u_long)lsnp->file,
-	    (u_long)lsnp->offset,
-	    (u_long)argp->type,
-	    (u_long)argp->txnid->txnid,
-	    (u_long)argp->prev_lsn.file,
-	    (u_long)argp->prev_lsn.offset);
-	(void)printf("\tdirname: ");
-	for (i = 0; i < argp->dirname.size; i++) {
-		ch = ((u_int8_t *)argp->dirname.data)[i];
-		printf(isprint(ch) || ch == 0x0a ? "%c" : "%#x ", ch);
-	}
-	(void)printf("\n");
-	(void)printf("\n");
-	free(argp);
-	return (0);
-}
-
-/*
- * PUBLIC: int ex_apprec_mkdir_read __P((DB_ENV *, void *,
- * PUBLIC:     ex_apprec_mkdir_args **));
- */
-int
-ex_apprec_mkdir_read(dbenv, recbuf, argpp)
-	DB_ENV *dbenv;
-	void *recbuf;
-	ex_apprec_mkdir_args **argpp;
-{
-	ex_apprec_mkdir_args *argp;
-	u_int8_t *bp;
-	/* Keep the compiler quiet. */
-
-	dbenv = NULL;
-	if ((argp = malloc(sizeof(ex_apprec_mkdir_args) + sizeof(DB_TXN))) == NULL)
-		return (ENOMEM);
-
-	argp->txnid = (DB_TXN *)&argp[1];
-
-	bp = recbuf;
-	memcpy(&argp->type, bp, sizeof(argp->type));
-	bp += sizeof(argp->type);
-
-	memcpy(&argp->txnid->txnid,  bp, sizeof(argp->txnid->txnid));
-	bp += sizeof(argp->txnid->txnid);
-
-	memcpy(&argp->prev_lsn, bp, sizeof(DB_LSN));
-	bp += sizeof(DB_LSN);
-
-	memset(&argp->dirname, 0, sizeof(argp->dirname));
-	memcpy(&argp->dirname.size, bp, sizeof(u_int32_t));
-	bp += sizeof(u_int32_t);
-	argp->dirname.data = bp;
-	bp += argp->dirname.size;
-
-	*argpp = argp;
-	return (0);
-}
-
-/*
- * PUBLIC: int ex_apprec_init_print __P((DB_ENV *, int (***)(DB_ENV *,
- * PUBLIC:     DBT *, DB_LSN *, db_recops, void *), size_t *));
- */
-int
-ex_apprec_init_print(dbenv, dtabp, dtabsizep)
-	DB_ENV *dbenv;
-	int (***dtabp)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-	size_t *dtabsizep;
-{
-	int __db_add_recovery __P((DB_ENV *,
-	    int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *),
-	    size_t *,
-	    int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
-	int ret;
-
-	if ((ret = __db_add_recovery(dbenv, dtabp, dtabsizep,
-	    ex_apprec_mkdir_print, DB_ex_apprec_mkdir)) != 0)
-		return (ret);
-	return (0);
-}
-
diff --git a/bdb/examples_c/ex_apprec/ex_apprec_auto.h b/bdb/examples_c/ex_apprec/ex_apprec_auto.h
deleted file mode 100644
index 358b1a9f091..00000000000
--- a/bdb/examples_c/ex_apprec/ex_apprec_auto.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Do not edit: automatically built by gen_rec.awk. */
-
-#ifndef	ex_apprec_AUTO_H
-#define	ex_apprec_AUTO_H
-#define	DB_ex_apprec_mkdir	10000
-typedef struct _ex_apprec_mkdir_args {
-	u_int32_t type;
-	DB_TXN *txnid;
-	DB_LSN prev_lsn;
-	DBT	dirname;
-} ex_apprec_mkdir_args;
-
-#endif
diff --git a/bdb/examples_c/ex_apprec/ex_apprec_template b/bdb/examples_c/ex_apprec/ex_apprec_template
deleted file mode 100644
index e67ccb6d8c3..00000000000
--- a/bdb/examples_c/ex_apprec/ex_apprec_template
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <string.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc/db_page.h"
-#include "dbinc/ex_apprec.h"
-#include "dbinc/log.h"
-
-/*
- * ex_apprec_mkdir_recover --
- *	Recovery function for mkdir.
- *
- * PUBLIC: int ex_apprec_mkdir_recover
- * PUBLIC:   __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
- */
-int
-ex_apprec_mkdir_recover(dbenv, dbtp, lsnp, op, info)
-	DB_ENV *dbenv;
-	DBT *dbtp;
-	DB_LSN *lsnp;
-	db_recops op;
-	void *info;
-{
-	ex_apprec_mkdir_args *argp;
-	DB *file_dbp;
-	DBC *dbc;
-	DB_MPOOLFILE *mpf;
-	PAGE *pagep;
-	int cmp_n, cmp_p, modified, ret;
-
-	REC_PRINT(ex_apprec_mkdir_print);
-	REC_INTRO(ex_apprec_mkdir_read, 1);
-
-	if ((ret = mpf->get(mpf, &argp->pgno, 0, &pagep)) != 0)
-		if (DB_REDO(op)) {
-			if ((ret = mpf->get(mpf,
-			    &argp->pgno, DB_MPOOL_CREATE, &pagep)) != 0)
-				goto out;
-		} else {
-			*lsnp = argp->prev_lsn;
-			ret = 0;
-			goto out;
-		}
-
-	modified = 0;
-	cmp_n = log_compare(lsnp, &LSN(pagep));
-
-	/*
-	 * Use this when there is something like "pagelsn" in the argp
-	 * structure.  Sometimes, you might need to compare meta-data
-	 * lsn's instead.
-	 *
-	 * cmp_p = log_compare(&LSN(pagep), argp->pagelsn);
-	 */
-	if (cmp_p == 0 && DB_REDO(op)) {
-		/* Need to redo update described. */
-		modified = 1;
-	} else if (cmp_n == 0 && !DB_REDO(op)) {
-		/* Need to undo update described. */
-		modified = 1;
-	}
-	if (ret = mpf->put(mpf, pagep, modified ? DB_MPOOL_DIRTY : 0))
-		goto out;
-
-	*lsnp = argp->prev_lsn;
-	ret = 0;
-
-out:	REC_CLOSE;
-}
-
diff --git a/bdb/rpc_server/c/db_server_proc.c b/bdb/rpc_server/c/db_server_proc.c
deleted file mode 100644
index d5d1f49508a..00000000000
--- a/bdb/rpc_server/c/db_server_proc.c
+++ /dev/null
@@ -1,2500 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 2000-2002
- *      Sleepycat Software.  All rights reserved.
- */
-
-#include "db_config.h"
-
-#ifdef HAVE_RPC
-#ifndef lint
-static const char revid[] = "$Id: db_server_proc.c,v 1.92 2002/07/29 15:21:20 sue Exp $";
-#endif /* not lint */
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <rpc/rpc.h>
-
-#include <string.h>
-#endif
-#include "dbinc_auto/db_server.h"
-
-#include "db_int.h"
-#include "dbinc/db_server_int.h"
-#include "dbinc_auto/rpc_server_ext.h"
-
-/* BEGIN __env_cachesize_proc */
-/*
- * PUBLIC: void __env_cachesize_proc __P((long, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, __env_cachesize_reply *));
- */
-void
-__env_cachesize_proc(dbenvcl_id, gbytes, bytes,
-		ncache, replyp)
-	long dbenvcl_id;
-	u_int32_t gbytes;
-	u_int32_t bytes;
-	u_int32_t ncache;
-	__env_cachesize_reply *replyp;
-/* END __env_cachesize_proc */
-{
-	DB_ENV *dbenv;
-	ct_entry *dbenv_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	ret = dbenv->set_cachesize(dbenv, gbytes, bytes, ncache);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_close_proc */
-/*
- * PUBLIC: void __env_close_proc __P((long, u_int32_t, __env_close_reply *));
- */
-void
-__env_close_proc(dbenvcl_id, flags, replyp)
-	long dbenvcl_id;
-	u_int32_t flags;
-	__env_close_reply *replyp;
-/* END __env_close_proc */
-{
-	ct_entry *dbenv_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	replyp->status = __dbenv_close_int(dbenvcl_id, flags, 0);
-	return;
-}
-
-/* BEGIN __env_create_proc */
-/*
- * PUBLIC: void __env_create_proc __P((u_int32_t, __env_create_reply *));
- */
-void
-__env_create_proc(timeout, replyp)
-	u_int32_t timeout;
-	__env_create_reply *replyp;
-/* END __env_create_proc */
-{
-	DB_ENV *dbenv;
-	ct_entry *ctp;
-	int ret;
-
-	ctp = new_ct_ent(&replyp->status);
-	if (ctp == NULL)
-		return;
-	if ((ret = db_env_create(&dbenv, 0)) == 0) {
-		ctp->ct_envp = dbenv;
-		ctp->ct_type = CT_ENV;
-		ctp->ct_parent = NULL;
-		ctp->ct_envparent = ctp;
-		__dbsrv_settimeout(ctp, timeout);
-		__dbsrv_active(ctp);
-		replyp->envcl_id = ctp->ct_id;
-	} else
-		__dbclear_ctp(ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_dbremove_proc */
-/*
- * PUBLIC: void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t,
- * PUBLIC:      __env_dbremove_reply *));
- */
-void
-__env_dbremove_proc(dbenvcl_id, txnpcl_id, name,
-		subdb, flags, replyp)
-	long dbenvcl_id;
-	long txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int32_t flags;
-	__env_dbremove_reply *replyp;
-/* END __env_dbremove_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	ret = dbenv->dbremove(dbenv, txnp, name, subdb, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_dbrename_proc */
-/*
- * PUBLIC: void __env_dbrename_proc __P((long, long, char *, char *, char *,
- * PUBLIC:      u_int32_t, __env_dbrename_reply *));
- */
-void
-__env_dbrename_proc(dbenvcl_id, txnpcl_id, name,
-		subdb, newname, flags, replyp)
-	long dbenvcl_id;
-	long txnpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int32_t flags;
-	__env_dbrename_reply *replyp;
-/* END __env_dbrename_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-	DB_TXN * txnp;
-	ct_entry *txnp_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	ret = dbenv->dbrename(dbenv, txnp, name, subdb, newname, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_encrypt_proc */
-/*
- * PUBLIC: void __env_encrypt_proc __P((long, char *, u_int32_t,
- * PUBLIC:      __env_encrypt_reply *));
- */
-void
-__env_encrypt_proc(dbenvcl_id, passwd, flags, replyp)
-	long dbenvcl_id;
-	char *passwd;
-	u_int32_t flags;
-	__env_encrypt_reply *replyp;
-/* END __env_encrypt_proc */
-{
-	int ret;
-	DB_ENV * dbenv;
-	ct_entry *dbenv_ctp;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	ret = dbenv->set_encrypt(dbenv, passwd, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_flags_proc */
-/*
- * PUBLIC: void __env_flags_proc __P((long, u_int32_t, u_int32_t,
- * PUBLIC:      __env_flags_reply *));
- */
-void
-__env_flags_proc(dbenvcl_id, flags, onoff, replyp)
-	long dbenvcl_id;
-	u_int32_t flags;
-	u_int32_t onoff;
-	__env_flags_reply *replyp;
-/* END __env_flags_proc */
-{
-	DB_ENV *dbenv;
-	ct_entry *dbenv_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	ret = dbenv->set_flags(dbenv, flags, onoff);
-	if (onoff)
-		dbenv_ctp->ct_envdp.onflags = flags;
-	else
-		dbenv_ctp->ct_envdp.offflags = flags;
-
-	replyp->status = ret;
-	return;
-}
-/* BEGIN __env_open_proc */
-/*
- * PUBLIC: void __env_open_proc __P((long, char *, u_int32_t, u_int32_t,
- * PUBLIC:      __env_open_reply *));
- */
-void
-__env_open_proc(dbenvcl_id, home, flags,
-		mode, replyp)
-	long dbenvcl_id;
-	char *home;
-	u_int32_t flags;
-	u_int32_t mode;
-	__env_open_reply *replyp;
-/* END __env_open_proc */
-{
-	DB_ENV *dbenv;
-	ct_entry *dbenv_ctp, *new_ctp;
-	u_int32_t newflags, shareflags;
-	int ret;
-	home_entry *fullhome;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-	fullhome = get_home(home);
-	if (fullhome == NULL) {
-		ret = DB_NOSERVER_HOME;
-		goto out;
-	}
-
-	/*
-	 * If they are using locking do deadlock detection for them,
-	 * internally.
-	 */
-	if ((flags & DB_INIT_LOCK) &&
-	    (ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT)) != 0)
-		goto out;
-
-	if (__dbsrv_verbose) {
-		dbenv->set_errfile(dbenv, stderr);
-		dbenv->set_errpfx(dbenv, fullhome->home);
-	}
-
-	/*
-	 * Mask off flags we ignore
-	 */
-	newflags = (flags & ~DB_SERVER_FLAGMASK);
-	shareflags = (newflags & DB_SERVER_ENVFLAGS);
-	/*
-	 * Check now whether we can share a handle for this env.
-	 */
-	replyp->envcl_id = dbenvcl_id;
-	if ((new_ctp = __dbsrv_shareenv(dbenv_ctp, fullhome, shareflags))
-	    != NULL) {
-		/*
-		 * We can share, clean up old  ID, set new one.
-		 */
-		if (__dbsrv_verbose)
-			printf("Sharing env ID %ld\n", new_ctp->ct_id);
-		replyp->envcl_id = new_ctp->ct_id;
-		ret = __dbenv_close_int(dbenvcl_id, 0, 0);
-	} else {
-		ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
-		dbenv_ctp->ct_envdp.home = fullhome;
-		dbenv_ctp->ct_envdp.envflags = shareflags;
-	}
-out:	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __env_remove_proc */
-/*
- * PUBLIC: void __env_remove_proc __P((long, char *, u_int32_t,
- * PUBLIC:      __env_remove_reply *));
- */
-void
-__env_remove_proc(dbenvcl_id, home, flags, replyp)
-	long dbenvcl_id;
-	char *home;
-	u_int32_t flags;
-	__env_remove_reply *replyp;
-/* END __env_remove_proc */
-{
-	DB_ENV *dbenv;
-	ct_entry *dbenv_ctp;
-	int ret;
-	home_entry *fullhome;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	fullhome = get_home(home);
-	if (fullhome == NULL) {
-		replyp->status = DB_NOSERVER_HOME;
-		return;
-	}
-
-	ret = dbenv->remove(dbenv, fullhome->home, flags);
-	__dbdel_ctp(dbenv_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_abort_proc */
-/*
- * PUBLIC: void __txn_abort_proc __P((long, __txn_abort_reply *));
- */
-void
-__txn_abort_proc(txnpcl_id, replyp)
-	long txnpcl_id;
-	__txn_abort_reply *replyp;
-/* END __txn_abort_proc */
-{
-	DB_TXN *txnp;
-	ct_entry *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret = txnp->abort(txnp);
-	__dbdel_ctp(txnp_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_begin_proc */
-/*
- * PUBLIC: void __txn_begin_proc __P((long, long, u_int32_t,
- * PUBLIC:      __txn_begin_reply *));
- */
-void
-__txn_begin_proc(dbenvcl_id, parentcl_id,
-		flags, replyp)
-	long dbenvcl_id;
-	long parentcl_id;
-	u_int32_t flags;
-	__txn_begin_reply *replyp;
-/* END __txn_begin_proc */
-{
-	DB_ENV *dbenv;
-	DB_TXN *parent, *txnp;
-	ct_entry *ctp, *dbenv_ctp, *parent_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-	parent_ctp = NULL;
-
-	ctp = new_ct_ent(&replyp->status);
-	if (ctp == NULL)
-		return;
-
-	if (parentcl_id != 0) {
-		ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN);
-		parent = (DB_TXN *)parent_ctp->ct_anyp;
-		ctp->ct_activep = parent_ctp->ct_activep;
-	} else
-		parent = NULL;
-
-	ret = dbenv->txn_begin(dbenv, parent, &txnp, flags);
-	if (ret == 0) {
-		ctp->ct_txnp = txnp;
-		ctp->ct_type = CT_TXN;
-		ctp->ct_parent = parent_ctp;
-		ctp->ct_envparent = dbenv_ctp;
-		replyp->txnidcl_id = ctp->ct_id;
-		__dbsrv_settimeout(ctp, dbenv_ctp->ct_timeout);
-		__dbsrv_active(ctp);
-	} else
-		__dbclear_ctp(ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_commit_proc */
-/*
- * PUBLIC: void __txn_commit_proc __P((long, u_int32_t,
- * PUBLIC:      __txn_commit_reply *));
- */
-void
-__txn_commit_proc(txnpcl_id, flags, replyp)
-	long txnpcl_id;
-	u_int32_t flags;
-	__txn_commit_reply *replyp;
-/* END __txn_commit_proc */
-{
-	DB_TXN *txnp;
-	ct_entry *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret = txnp->commit(txnp, flags);
-	__dbdel_ctp(txnp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_discard_proc */
-/*
- * PUBLIC: void __txn_discard_proc __P((long, u_int32_t,
- * PUBLIC:      __txn_discard_reply *));
- */
-void
-__txn_discard_proc(txnpcl_id, flags, replyp)
-	long txnpcl_id;
-	u_int32_t flags;
-	__txn_discard_reply *replyp;
-/* END __txn_discard_proc */
-{
-	DB_TXN *txnp;
-	ct_entry *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret = txnp->discard(txnp, flags);
-	__dbdel_ctp(txnp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_prepare_proc */
-/*
- * PUBLIC: void __txn_prepare_proc __P((long, u_int8_t *,
- * PUBLIC:      __txn_prepare_reply *));
- */
-void
-__txn_prepare_proc(txnpcl_id, gid, replyp)
-	long txnpcl_id;
-	u_int8_t *gid;
-	__txn_prepare_reply *replyp;
-/* END __txn_prepare_proc */
-{
-	DB_TXN *txnp;
-	ct_entry *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-
-	ret = txnp->prepare(txnp, gid);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __txn_recover_proc */
-/*
- * PUBLIC: void __txn_recover_proc __P((long, u_int32_t, u_int32_t,
- * PUBLIC:      __txn_recover_reply *, int *));
- */
-void
-__txn_recover_proc(dbenvcl_id, count,
-		flags, replyp, freep)
-	long dbenvcl_id;
-	u_int32_t count;
-	u_int32_t flags;
-	__txn_recover_reply *replyp;
-	int * freep;
-/* END __txn_recover_proc */
-{
-	DB_ENV *dbenv;
-	DB_PREPLIST *dbprep, *p;
-	ct_entry *dbenv_ctp, *ctp;
-	long erri, i, retcount;
-	u_int32_t *txnidp;
-	int ret;
-	u_int8_t *gid;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-	dbprep = NULL;
-	*freep = 0;
-
-	if ((ret =
-	    __os_malloc(dbenv, count * sizeof(DB_PREPLIST), &dbprep)) != 0)
-		goto out;
-	if ((ret =
-	    dbenv->txn_recover(dbenv, dbprep, count, &retcount, flags)) != 0)
-		goto out;
-	/*
-	 * If there is nothing, success, but it's easy.
-	 */
-	replyp->retcount = retcount;
-	if (retcount == 0) {
-		replyp->txn.txn_val = NULL;
-		replyp->txn.txn_len = 0;
-		replyp->gid.gid_val = NULL;
-		replyp->gid.gid_len = 0;
-	}
-
-	/*
-	 * We have our txn list.  Now we need to allocate the space for
-	 * the txn ID array and the GID array and set them up.
-	 */
-	if ((ret = __os_calloc(dbenv, retcount, sizeof(u_int32_t),
-	    &replyp->txn.txn_val)) != 0)
-		goto out;
-	replyp->txn.txn_len = retcount * sizeof(u_int32_t);
-	if ((ret = __os_calloc(dbenv, retcount, DB_XIDDATASIZE,
-	    &replyp->gid.gid_val)) != 0) {
-		__os_free(dbenv, replyp->txn.txn_val);
-		goto out;
-	}
-	replyp->gid.gid_len = retcount * DB_XIDDATASIZE;
-
-	/*
-	 * Now walk through our results, creating parallel arrays
-	 * to send back.  For each entry we need to create a new
-	 * txn ctp and then fill in the array info.
-	 */
-	i = 0;
-	p = dbprep;
-	gid = replyp->gid.gid_val;
-	txnidp = replyp->txn.txn_val;
-	while (i++ < retcount) {
-		ctp = new_ct_ent(&ret);
-		if (ret != 0) {
-			i--;
-			goto out2;
-		}
-		ctp->ct_txnp = p->txn;
-		ctp->ct_type = CT_TXN;
-		ctp->ct_parent = NULL;
-		ctp->ct_envparent = dbenv_ctp;
-		__dbsrv_settimeout(ctp, dbenv_ctp->ct_timeout);
-		__dbsrv_active(ctp);
-
-		*txnidp = ctp->ct_id;
-		memcpy(gid, p->gid, DB_XIDDATASIZE);
-
-		p++;
-		txnidp++;
-		gid += DB_XIDDATASIZE;
-	}
-	/*
-	 * If we get here, we have success and we have to set freep
-	 * so it'll get properly freed next time.
-	 */
-	*freep = 1;
-out:
-	if (dbprep != NULL)
-		__os_free(dbenv, dbprep);
-	replyp->status = ret;
-	return;
-out2:
-	/*
-	 * We had an error in the middle of creating our new txn
-	 * ct entries.  We have to unwind all that we have done.  Ugh.
-	 */
-	for (txnidp = replyp->txn.txn_val, erri = 0;
-	    erri < i; erri++, txnidp++) {
-		ctp = get_tableent(*txnidp);
-		__dbclear_ctp(ctp);
-	}
-	__os_free(dbenv, replyp->txn.txn_val);
-	__os_free(dbenv, replyp->gid.gid_val);
-	__os_free(dbenv, dbprep);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_bt_maxkey_proc */
-/*
- * PUBLIC: void __db_bt_maxkey_proc __P((long, u_int32_t,
- * PUBLIC:      __db_bt_maxkey_reply *));
- */
-void
-__db_bt_maxkey_proc(dbpcl_id, maxkey, replyp)
-	long dbpcl_id;
-	u_int32_t maxkey;
-	__db_bt_maxkey_reply *replyp;
-/* END __db_bt_maxkey_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_bt_maxkey(dbp, maxkey);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_associate_proc */
-/*
- * PUBLIC: void __db_associate_proc __P((long, long, long, u_int32_t,
- * PUBLIC:      __db_associate_reply *));
- */
-void
-__db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	long sdbpcl_id;
-	u_int32_t flags;
-	__db_associate_reply *replyp;
-/* END __db_associate_proc */
-{
-	DB *dbp, *sdbp;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *sdbp_ctp, *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	ACTIVATE_CTP(sdbp_ctp, sdbpcl_id, CT_DB);
-	sdbp = (DB *)sdbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-
-	/*
-	 * We do not support DB_CREATE for associate.   Users
-	 * can only access secondary indices on a read-only basis,
-	 * so whatever they are looking for needs to be there already.
-	 */
-	if (flags != 0)
-		ret = EINVAL;
-	else
-		ret = dbp->associate(dbp, txnp, sdbp, NULL, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_bt_minkey_proc */
-/*
- * PUBLIC: void __db_bt_minkey_proc __P((long, u_int32_t,
- * PUBLIC:      __db_bt_minkey_reply *));
- */
-void
-__db_bt_minkey_proc(dbpcl_id, minkey, replyp)
-	long dbpcl_id;
-	u_int32_t minkey;
-	__db_bt_minkey_reply *replyp;
-/* END __db_bt_minkey_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_bt_minkey(dbp, minkey);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_close_proc */
-/*
- * PUBLIC: void __db_close_proc __P((long, u_int32_t, __db_close_reply *));
- */
-void
-__db_close_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_close_reply *replyp;
-/* END __db_close_proc */
-{
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	replyp->status = __db_close_int(dbpcl_id, flags);
-	return;
-}
-
-/* BEGIN __db_create_proc */
-/*
- * PUBLIC: void __db_create_proc __P((long, u_int32_t, __db_create_reply *));
- */
-void
-__db_create_proc(dbenvcl_id, flags, replyp)
-	long dbenvcl_id;
-	u_int32_t flags;
-	__db_create_reply *replyp;
-/* END __db_create_proc */
-{
-	DB *dbp;
-	DB_ENV *dbenv;
-	ct_entry *dbenv_ctp, *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
-	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
-
-	dbp_ctp = new_ct_ent(&replyp->status);
-	if (dbp_ctp == NULL)
-		return ;
-	/*
-	 * We actually require env's for databases.  The client should
-	 * have caught it, but just in case.
-	 */
-	DB_ASSERT(dbenv != NULL);
-	if ((ret = db_create(&dbp, dbenv, flags)) == 0) {
-		dbp_ctp->ct_dbp = dbp;
-		dbp_ctp->ct_type = CT_DB;
-		dbp_ctp->ct_parent = dbenv_ctp;
-		dbp_ctp->ct_envparent = dbenv_ctp;
-		replyp->dbcl_id = dbp_ctp->ct_id;
-	} else
-		__dbclear_ctp(dbp_ctp);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_del_proc */
-/*
- * PUBLIC: void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
- */
-void
-__db_del_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyulen, keyflags, keydata,
-		keysize, flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t flags;
-	__db_del_reply *replyp;
-/* END __db_del_proc */
-{
-	DB *dbp;
-	DBT key;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	memset(&key, 0, sizeof(key));
-
-	/* Set up key DBT */
-	key.dlen = keydlen;
-	key.ulen = keyulen;
-	key.doff = keydoff;
-	key.flags = keyflags;
-	key.size = keysize;
-	key.data = keydata;
-
-	ret = dbp->del(dbp, txnp, &key, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_encrypt_proc */
-/*
- * PUBLIC: void __db_encrypt_proc __P((long, char *, u_int32_t,
- * PUBLIC:      __db_encrypt_reply *));
- */
-void
-__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)
-	long dbpcl_id;
-	char *passwd;
-	u_int32_t flags;
-	__db_encrypt_reply *replyp;
-/* END __db_encrypt_proc */
-{
-	int ret;
-	DB * dbp;
-	ct_entry *dbp_ctp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_encrypt(dbp, passwd, flags);
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_extentsize_proc */
-/*
- * PUBLIC: void __db_extentsize_proc __P((long, u_int32_t,
- * PUBLIC:      __db_extentsize_reply *));
- */
-void
-__db_extentsize_proc(dbpcl_id, extentsize, replyp)
-	long dbpcl_id;
-	u_int32_t extentsize;
-	__db_extentsize_reply *replyp;
-/* END __db_extentsize_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_q_extentsize(dbp, extentsize);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_flags_proc */
-/*
- * PUBLIC: void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));
- */
-void
-__db_flags_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_flags_reply *replyp;
-/* END __db_flags_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_flags(dbp, flags);
-	dbp_ctp->ct_dbdp.setflags |= flags;
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_get_proc */
-/*
- * PUBLIC: void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, __db_get_reply *, int *));
- */
-void
-__db_get_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyulen, keyflags, keydata,
-		keysize, datadlen, datadoff, dataulen,
-		dataflags, datadata, datasize, flags, replyp, freep)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__db_get_reply *replyp;
-	int * freep;
-/* END __db_get_proc */
-{
-	DB *dbp;
-	DBT key, data;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	int key_alloc, bulk_alloc, ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	*freep = 0;
-	bulk_alloc = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.ulen = keyulen;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.doff = datadoff;
-	data.ulen = dataulen;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	data.size = datasize;
-	data.data = datadata;
-	if (flags & DB_MULTIPLE) {
-		if (data.data == 0) {
-			ret = __os_umalloc(dbp->dbenv,
-			    data.ulen, &data.data);
-			if (ret != 0)
-				goto err;
-			bulk_alloc = 1;
-		}
-		data.flags |= DB_DBT_USERMEM;
-	} else
-		data.flags |= DB_DBT_MALLOC;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-
-	/* Got all our stuff, now do the get */
-	ret = dbp->get(dbp, txnp, &key, &data, flags);
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (key.data == keydata) {
-			ret = __os_umalloc(dbp->dbenv,
-			    key.size, &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, key.data);
-				__os_ufree(dbp->dbenv, data.data);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_umalloc(dbp->dbenv,
-			     data.size, &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, key.data);
-				__os_ufree(dbp->dbenv, data.data);
-				if (key_alloc)
-					__os_ufree(dbp->dbenv,
-					    replyp->keydata.keydata_val);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-		if (bulk_alloc)
-			__os_ufree(dbp->dbenv, data.data);
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_h_ffactor_proc */
-/*
- * PUBLIC: void __db_h_ffactor_proc __P((long, u_int32_t,
- * PUBLIC:      __db_h_ffactor_reply *));
- */
-void
-__db_h_ffactor_proc(dbpcl_id, ffactor, replyp)
-	long dbpcl_id;
-	u_int32_t ffactor;
-	__db_h_ffactor_reply *replyp;
-/* END __db_h_ffactor_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_h_ffactor(dbp, ffactor);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_h_nelem_proc */
-/*
- * PUBLIC: void __db_h_nelem_proc __P((long, u_int32_t,
- * PUBLIC:      __db_h_nelem_reply *));
- */
-void
-__db_h_nelem_proc(dbpcl_id, nelem, replyp)
-	long dbpcl_id;
-	u_int32_t nelem;
-	__db_h_nelem_reply *replyp;
-/* END __db_h_nelem_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_h_nelem(dbp, nelem);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_key_range_proc */
-/*
- * PUBLIC: void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
- */
-void
-__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyulen, keyflags, keydata,
-		keysize, flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t flags;
-	__db_key_range_reply *replyp;
-/* END __db_key_range_proc */
-{
-	DB *dbp;
-	DBT key;
-	DB_KEY_RANGE range;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	memset(&key, 0, sizeof(key));
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.ulen = keyulen;
-	key.doff = keydoff;
-	key.size = keysize;
-	key.data = keydata;
-	key.flags = keyflags;
-
-	ret = dbp->key_range(dbp, txnp, &key, &range, flags);
-
-	replyp->status = ret;
-	replyp->less = range.less;
-	replyp->equal = range.equal;
-	replyp->greater = range.greater;
-	return;
-}
-
-/* BEGIN __db_lorder_proc */
-/*
- * PUBLIC: void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));
- */
-void
-__db_lorder_proc(dbpcl_id, lorder, replyp)
-	long dbpcl_id;
-	u_int32_t lorder;
-	__db_lorder_reply *replyp;
-/* END __db_lorder_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_lorder(dbp, lorder);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_open_proc */
-/*
- * PUBLIC: void __db_open_proc __P((long, long, char *, char *, u_int32_t,
- * PUBLIC:      u_int32_t, u_int32_t, __db_open_reply *));
- */
-void
-__db_open_proc(dbpcl_id, txnpcl_id, name,
-		subdb, type, flags, mode, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	char *name;
-	char *subdb;
-	u_int32_t type;
-	u_int32_t flags;
-	u_int32_t mode;
-	__db_open_reply *replyp;
-/* END __db_open_proc */
-{
-	DB *dbp;
-	DB_TXN *txnp;
-	DBTYPE dbtype;
-	ct_entry *dbp_ctp, *new_ctp, *txnp_ctp;
-	int isswapped, ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	replyp->dbcl_id = dbpcl_id;
-	if ((new_ctp = __dbsrv_sharedb(dbp_ctp, name, subdb, type, flags))
-	    != NULL) {
-		/*
-		 * We can share, clean up old ID, set new one.
-		 */
-		if (__dbsrv_verbose)
-			printf("Sharing db ID %ld\n", new_ctp->ct_id);
-		replyp->dbcl_id = new_ctp->ct_id;
-		ret = __db_close_int(dbpcl_id, 0);
-		goto out;
-	}
-	ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
-	if (ret == 0) {
-		(void)dbp->get_type(dbp, &dbtype);
-		replyp->type = dbtype;
-		/* XXX
-		 * Tcl needs to peek at dbp->flags for DB_AM_DUP.  Send
-		 * this dbp's flags back.
-		 */
-		replyp->dbflags = (int) dbp->flags;
-		/*
-		 * We need to determine the byte order of the database
-		 * and send it back to the client.  Determine it by
-		 * the server's native order and the swapped value of
-		 * the DB itself.
-		 */
-		(void)dbp->get_byteswapped(dbp, &isswapped);
-		if (__db_byteorder(NULL, 1234) == 0) {
-			if (isswapped == 0)
-				replyp->lorder = 1234;
-			else
-				replyp->lorder = 4321;
-		} else {
-			if (isswapped == 0)
-				replyp->lorder = 4321;
-			else
-				replyp->lorder = 1234;
-		}
-		dbp_ctp->ct_dbdp.type = dbtype;
-		dbp_ctp->ct_dbdp.dbflags = LF_ISSET(DB_SERVER_DBFLAGS);
-		if (name == NULL)
-			dbp_ctp->ct_dbdp.db = NULL;
-		else if ((ret = __os_strdup(dbp->dbenv, name,
-		    &dbp_ctp->ct_dbdp.db)) != 0)
-			goto out;
-		if (subdb == NULL)
-			dbp_ctp->ct_dbdp.subdb = NULL;
-		else if ((ret = __os_strdup(dbp->dbenv, subdb,
-		    &dbp_ctp->ct_dbdp.subdb)) != 0)
-			goto out;
-	}
-out:
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_pagesize_proc */
-/*
- * PUBLIC: void __db_pagesize_proc __P((long, u_int32_t,
- * PUBLIC:      __db_pagesize_reply *));
- */
-void
-__db_pagesize_proc(dbpcl_id, pagesize, replyp)
-	long dbpcl_id;
-	u_int32_t pagesize;
-	__db_pagesize_reply *replyp;
-/* END __db_pagesize_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_pagesize(dbp, pagesize);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_pget_proc */
-/*
- * PUBLIC: void __db_pget_proc __P((long, long, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, __db_pget_reply *, int *));
- */
-void
-__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,
-		skeydoff, skeyulen, skeyflags, skeydata,
-		skeysize, pkeydlen, pkeydoff, pkeyulen,
-		pkeyflags, pkeydata, pkeysize, datadlen,
-		datadoff, dataulen, dataflags, datadata,
-		datasize, flags, replyp, freep)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t skeydlen;
-	u_int32_t skeydoff;
-	u_int32_t skeyulen;
-	u_int32_t skeyflags;
-	void *skeydata;
-	u_int32_t skeysize;
-	u_int32_t pkeydlen;
-	u_int32_t pkeydoff;
-	u_int32_t pkeyulen;
-	u_int32_t pkeyflags;
-	void *pkeydata;
-	u_int32_t pkeysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__db_pget_reply *replyp;
-	int * freep;
-/* END __db_pget_proc */
-{
-	DB *dbp;
-	DBT skey, pkey, data;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	int key_alloc, ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	*freep = 0;
-	memset(&skey, 0, sizeof(skey));
-	memset(&pkey, 0, sizeof(pkey));
-	memset(&data, 0, sizeof(data));
-
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	/* Set up key and data DBT */
-	skey.flags = DB_DBT_MALLOC;
-	skey.dlen = skeydlen;
-	skey.ulen = skeyulen;
-	skey.doff = skeydoff;
-	if (skeyflags & DB_DBT_PARTIAL)
-		skey.flags |= DB_DBT_PARTIAL;
-	skey.size = skeysize;
-	skey.data = skeydata;
-
-	pkey.flags = DB_DBT_MALLOC;
-	pkey.dlen = pkeydlen;
-	pkey.ulen = pkeyulen;
-	pkey.doff = pkeydoff;
-	if (pkeyflags & DB_DBT_PARTIAL)
-		pkey.flags |= DB_DBT_PARTIAL;
-	pkey.size = pkeysize;
-	pkey.data = pkeydata;
-
-	data.flags = DB_DBT_MALLOC;
-	data.dlen = datadlen;
-	data.ulen = dataulen;
-	data.doff = datadoff;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the get */
-	ret = dbp->pget(dbp, txnp, &skey, &pkey, &data, flags);
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (skey.data == skeydata) {
-			ret = __os_umalloc(dbp->dbenv,
-			    skey.size, &replyp->skeydata.skeydata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, skey.data);
-				__os_ufree(dbp->dbenv, pkey.data);
-				__os_ufree(dbp->dbenv, data.data);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->skeydata.skeydata_val, skey.data,
-			    skey.size);
-		} else
-			replyp->skeydata.skeydata_val = skey.data;
-
-		replyp->skeydata.skeydata_len = skey.size;
-
-		/*
-		 * Primary key
-		 */
-		if (pkey.data == pkeydata) {
-			ret = __os_umalloc(dbp->dbenv,
-			     pkey.size, &replyp->pkeydata.pkeydata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, skey.data);
-				__os_ufree(dbp->dbenv, pkey.data);
-				__os_ufree(dbp->dbenv, data.data);
-				if (key_alloc)
-					__os_ufree(dbp->dbenv,
-					    replyp->skeydata.skeydata_val);
-				goto err;
-			}
-			/*
-			 * We can set it to 2, because they cannot send the
-			 * pkey over without sending the skey over too.
-			 * So if they did send a pkey, they must have sent
-			 * the skey as well.
-			 */
-			key_alloc = 2;
-			memcpy(replyp->pkeydata.pkeydata_val, pkey.data,
-			    pkey.size);
-		} else
-			replyp->pkeydata.pkeydata_val = pkey.data;
-		replyp->pkeydata.pkeydata_len = pkey.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_umalloc(dbp->dbenv,
-			     data.size, &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, skey.data);
-				__os_ufree(dbp->dbenv, pkey.data);
-				__os_ufree(dbp->dbenv, data.data);
-				/*
-				 * If key_alloc is 1, just skey needs to be
-				 * freed, if key_alloc is 2, both skey and pkey
-				 * need to be freed.
-				 */
-				if (key_alloc--)
-					__os_ufree(dbp->dbenv,
-					    replyp->skeydata.skeydata_val);
-				if (key_alloc)
-					__os_ufree(dbp->dbenv,
-					    replyp->pkeydata.pkeydata_val);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->skeydata.skeydata_val = NULL;
-		replyp->skeydata.skeydata_len = 0;
-		replyp->pkeydata.pkeydata_val = NULL;
-		replyp->pkeydata.pkeydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_put_proc */
-/*
- * PUBLIC: void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, __db_put_reply *, int *));
- */
-void
-__db_put_proc(dbpcl_id, txnpcl_id, keydlen,
-		keydoff, keyulen, keyflags, keydata,
-		keysize, datadlen, datadoff, dataulen,
-		dataflags, datadata, datasize, flags, replyp, freep)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__db_put_reply *replyp;
-	int * freep;
-/* END __db_put_proc */
-{
-	DB *dbp;
-	DBT key, data;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	*freep = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.ulen = keyulen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.ulen = dataulen;
-	data.doff = datadoff;
-	data.flags = dataflags;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the put */
-	ret = dbp->put(dbp, txnp, &key, &data, flags);
-	/*
-	 * If the client did a DB_APPEND, set up key in reply.
-	 * Otherwise just status.
-	 */
-	if (ret == 0 && (flags == DB_APPEND)) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		if (key.data == keydata) {
-			ret = __os_umalloc(dbp->dbenv,
-			    key.size, &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_ufree(dbp->dbenv, key.data);
-				goto err;
-			}
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_delim_proc */
-/*
- * PUBLIC: void __db_re_delim_proc __P((long, u_int32_t,
- * PUBLIC:      __db_re_delim_reply *));
- */
-void
-__db_re_delim_proc(dbpcl_id, delim, replyp)
-	long dbpcl_id;
-	u_int32_t delim;
-	__db_re_delim_reply *replyp;
-/* END __db_re_delim_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_delim(dbp, delim);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_len_proc */
-/*
- * PUBLIC: void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));
- */
-void
-__db_re_len_proc(dbpcl_id, len, replyp)
-	long dbpcl_id;
-	u_int32_t len;
-	__db_re_len_reply *replyp;
-/* END __db_re_len_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_len(dbp, len);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_re_pad_proc */
-/*
- * PUBLIC: void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));
- */
-void
-__db_re_pad_proc(dbpcl_id, pad, replyp)
-	long dbpcl_id;
-	u_int32_t pad;
-	__db_re_pad_reply *replyp;
-/* END __db_re_pad_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->set_re_pad(dbp, pad);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_remove_proc */
-/*
- * PUBLIC: void __db_remove_proc __P((long, char *, char *, u_int32_t,
- * PUBLIC:      __db_remove_reply *));
- */
-void
-__db_remove_proc(dbpcl_id, name, subdb,
-		flags, replyp)
-	long dbpcl_id;
-	char *name;
-	char *subdb;
-	u_int32_t flags;
-	__db_remove_reply *replyp;
-/* END __db_remove_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->remove(dbp, name, subdb, flags);
-	__dbdel_ctp(dbp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_rename_proc */
-/*
- * PUBLIC: void __db_rename_proc __P((long, char *, char *, char *, u_int32_t,
- * PUBLIC:      __db_rename_reply *));
- */
-void
-__db_rename_proc(dbpcl_id, name, subdb,
-		newname, flags, replyp)
-	long dbpcl_id;
-	char *name;
-	char *subdb;
-	char *newname;
-	u_int32_t flags;
-	__db_rename_reply *replyp;
-/* END __db_rename_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->rename(dbp, name, subdb, newname, flags);
-	__dbdel_ctp(dbp_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_stat_proc */
-/*
- * PUBLIC: void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *,
- * PUBLIC:      int *));
- */
-void
-__db_stat_proc(dbpcl_id, flags, replyp, freep)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_stat_reply *replyp;
-	int * freep;
-/* END __db_stat_proc */
-{
-	DB *dbp;
-	DBTYPE type;
-	ct_entry *dbp_ctp;
-	u_int32_t *q, *p, *retsp;
-	int i, len, ret;
-	void *sp;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->stat(dbp, &sp, flags);
-	replyp->status = ret;
-	if (ret != 0)
-		return;
-	/*
-	 * We get here, we have success.  Allocate an array so that
-	 * we can use the list generator.  Generate the reply, free
-	 * up the space.
-	 */
-	/*
-	 * XXX This assumes that all elements of all stat structures
-	 * are u_int32_t fields.  They are, currently.
-	 */
-	(void)dbp->get_type(dbp, &type);
-	if (type == DB_HASH)
-		len = sizeof(DB_HASH_STAT);
-	else if (type == DB_QUEUE)
-		len = sizeof(DB_QUEUE_STAT);
-	else            /* BTREE or RECNO are same stats */
-		len = sizeof(DB_BTREE_STAT);
-	replyp->stats.stats_len = len / sizeof(u_int32_t);
-
-	if ((ret = __os_umalloc(dbp->dbenv, len * replyp->stats.stats_len,
-	    &retsp)) != 0)
-		goto out;
-	for (i = 0, q = retsp, p = sp; i < len;
-	    i++, q++, p++)
-		*q = *p;
-	replyp->stats.stats_val = retsp;
-	__os_ufree(dbp->dbenv, sp);
-	if (ret == 0)
-		*freep = 1;
-out:
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_sync_proc */
-/*
- * PUBLIC: void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));
- */
-void
-__db_sync_proc(dbpcl_id, flags, replyp)
-	long dbpcl_id;
-	u_int32_t flags;
-	__db_sync_reply *replyp;
-/* END __db_sync_proc */
-{
-	DB *dbp;
-	ct_entry *dbp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	ret = dbp->sync(dbp, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_truncate_proc */
-/*
- * PUBLIC: void __db_truncate_proc __P((long, long, u_int32_t,
- * PUBLIC:      __db_truncate_reply *));
- */
-void
-__db_truncate_proc(dbpcl_id, txnpcl_id,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t flags;
-	__db_truncate_reply *replyp;
-/* END __db_truncate_proc */
-{
-	DB *dbp;
-	DB_TXN *txnp;
-	ct_entry *dbp_ctp, *txnp_ctp;
-	u_int32_t count;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-	} else
-		txnp = NULL;
-
-	ret = dbp->truncate(dbp, txnp, &count, flags);
-	replyp->status = ret;
-	if (ret == 0)
-		replyp->count = count;
-	return;
-}
-
-/* BEGIN __db_cursor_proc */
-/*
- * PUBLIC: void __db_cursor_proc __P((long, long, u_int32_t,
- * PUBLIC:      __db_cursor_reply *));
- */
-void
-__db_cursor_proc(dbpcl_id, txnpcl_id,
-		flags, replyp)
-	long dbpcl_id;
-	long txnpcl_id;
-	u_int32_t flags;
-	__db_cursor_reply *replyp;
-/* END __db_cursor_proc */
-{
-	DB *dbp;
-	DBC *dbc;
-	DB_TXN *txnp;
-	ct_entry *dbc_ctp, *env_ctp, *dbp_ctp, *txnp_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-	dbc_ctp = new_ct_ent(&replyp->status);
-	if (dbc_ctp == NULL)
-		return;
-
-	if (txnpcl_id != 0) {
-		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
-		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
-		dbc_ctp->ct_activep = txnp_ctp->ct_activep;
-	} else
-		txnp = NULL;
-
-	if ((ret = dbp->cursor(dbp, txnp, &dbc, flags)) == 0) {
-		dbc_ctp->ct_dbc = dbc;
-		dbc_ctp->ct_type = CT_CURSOR;
-		dbc_ctp->ct_parent = dbp_ctp;
-		env_ctp = dbp_ctp->ct_envparent;
-		dbc_ctp->ct_envparent = env_ctp;
-		__dbsrv_settimeout(dbc_ctp, env_ctp->ct_timeout);
-		__dbsrv_active(dbc_ctp);
-		replyp->dbcidcl_id = dbc_ctp->ct_id;
-	} else
-		__dbclear_ctp(dbc_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __db_join_proc */
-/*
- * PUBLIC: void __db_join_proc __P((long, u_int32_t *, u_int32_t, u_int32_t,
- * PUBLIC:      __db_join_reply *));
- */
-void
-__db_join_proc(dbpcl_id, curs, curslen,
-		flags, replyp)
-	long dbpcl_id;
-	u_int32_t * curs;
-	u_int32_t curslen;
-	u_int32_t flags;
-	__db_join_reply *replyp;
-/* END __db_join_proc */
-{
-	DB *dbp;
-	DBC **jcurs, **c;
-	DBC *dbc;
-	ct_entry *dbc_ctp, *ctp, *dbp_ctp;
-	size_t size;
-	u_int32_t *cl, i;
-	int ret;
-
-	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
-	dbp = (DB *)dbp_ctp->ct_anyp;
-
-	dbc_ctp = new_ct_ent(&replyp->status);
-	if (dbc_ctp == NULL)
-		return;
-
-	size = (curslen + 1) * sizeof(DBC *);
-	if ((ret = __os_calloc(dbp->dbenv,
-	    curslen + 1, sizeof(DBC *), &jcurs)) != 0) {
-		replyp->status = ret;
-		__dbclear_ctp(dbc_ctp);
-		return;
-	}
-	/*
-	 * If our curslist has a parent txn, we need to use it too
-	 * for the activity timeout.  All cursors must be part of
-	 * the same transaction, so just check the first.
-	 */
-	ctp = get_tableent(*curs);
-	DB_ASSERT(ctp->ct_type == CT_CURSOR);
-	/*
-	 * If we are using a transaction, set the join activity timer
-	 * to point to the parent transaction.
-	 */
-	if (ctp->ct_activep != &ctp->ct_active)
-		dbc_ctp->ct_activep = ctp->ct_activep;
-	for (i = 0, cl = curs, c = jcurs; i < curslen; i++, cl++, c++) {
-		ctp = get_tableent(*cl);
-		if (ctp == NULL) {
-			replyp->status = DB_NOSERVER_ID;
-			goto out;
-		}
-		/*
-		 * If we are using a txn, the join cursor points to the
-		 * transaction timeout.  If we are not using a transaction,
-		 * then all the curslist cursors must point to the join
-		 * cursor's timeout so that we do not timeout any of the
-		 * curlist cursors while the join cursor is active.
-		 * Change the type of the curslist ctps to CT_JOIN so that
-		 * we know they are part of a join list and we can distinguish
-		 * them and later restore them when the join cursor is closed.
-		 */
-		DB_ASSERT(ctp->ct_type == CT_CURSOR);
-		ctp->ct_type |= CT_JOIN;
-		ctp->ct_origp = ctp->ct_activep;
-		/*
-		 * Setting this to the ct_active field of the dbc_ctp is
-		 * really just a way to distinguish which join dbc this
-		 * cursor is part of.  The ct_activep of this cursor is
-		 * not used at all during its lifetime as part of a join
-		 * cursor.
-		 */
-		ctp->ct_activep = &dbc_ctp->ct_active;
-		*c = ctp->ct_dbc;
-	}
-	*c = NULL;
-	if ((ret = dbp->join(dbp, jcurs, &dbc, flags)) == 0) {
-		dbc_ctp->ct_dbc = dbc;
-		dbc_ctp->ct_type = (CT_JOINCUR | CT_CURSOR);
-		dbc_ctp->ct_parent = dbp_ctp;
-		dbc_ctp->ct_envparent = dbp_ctp->ct_envparent;
-		__dbsrv_settimeout(dbc_ctp, dbp_ctp->ct_envparent->ct_timeout);
-		__dbsrv_active(dbc_ctp);
-		replyp->dbcidcl_id = dbc_ctp->ct_id;
-	} else {
-		__dbclear_ctp(dbc_ctp);
-		/*
-		 * If we get an error, undo what we did above to any cursors.
-		 */
-		for (cl = curs; *cl != 0; cl++) {
-			ctp = get_tableent(*cl);
-			ctp->ct_type = CT_CURSOR;
-			ctp->ct_activep = ctp->ct_origp;
-		}
-	}
-
-	replyp->status = ret;
-out:
-	__os_free(dbp->dbenv, jcurs);
-	return;
-}
-
-/* BEGIN __dbc_close_proc */
-/*
- * PUBLIC: void __dbc_close_proc __P((long, __dbc_close_reply *));
- */
-void
-__dbc_close_proc(dbccl_id, replyp)
-	long dbccl_id;
-	__dbc_close_reply *replyp;
-/* END __dbc_close_proc */
-{
-	ct_entry *dbc_ctp;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	replyp->status = __dbc_close_int(dbc_ctp);
-	return;
-}
-
-/* BEGIN __dbc_count_proc */
-/*
- * PUBLIC: void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));
- */
-void
-__dbc_count_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_count_reply *replyp;
-/* END __dbc_count_proc */
-{
-	DBC *dbc;
-	ct_entry *dbc_ctp;
-	db_recno_t num;
-	int ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	ret = dbc->c_count(dbc, &num, flags);
-	replyp->status = ret;
-	if (ret == 0)
-		replyp->dupcount = num;
-	return;
-}
-
-/* BEGIN __dbc_del_proc */
-/*
- * PUBLIC: void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));
- */
-void
-__dbc_del_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_del_reply *replyp;
-/* END __dbc_del_proc */
-{
-	DBC *dbc;
-	ct_entry *dbc_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	ret = dbc->c_del(dbc, flags);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_dup_proc */
-/*
- * PUBLIC: void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));
- */
-void
-__dbc_dup_proc(dbccl_id, flags, replyp)
-	long dbccl_id;
-	u_int32_t flags;
-	__dbc_dup_reply *replyp;
-/* END __dbc_dup_proc */
-{
-	DBC *dbc, *newdbc;
-	ct_entry *dbc_ctp, *new_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-
-	new_ctp = new_ct_ent(&replyp->status);
-	if (new_ctp == NULL)
-		return;
-
-	if ((ret = dbc->c_dup(dbc, &newdbc, flags)) == 0) {
-		new_ctp->ct_dbc = newdbc;
-		new_ctp->ct_type = CT_CURSOR;
-		new_ctp->ct_parent = dbc_ctp->ct_parent;
-		new_ctp->ct_envparent = dbc_ctp->ct_envparent;
-		/*
-		 * If our cursor has a parent txn, we need to use it too.
-		 */
-		if (dbc_ctp->ct_activep != &dbc_ctp->ct_active)
-			new_ctp->ct_activep = dbc_ctp->ct_activep;
-		__dbsrv_settimeout(new_ctp, dbc_ctp->ct_timeout);
-		__dbsrv_active(new_ctp);
-		replyp->dbcidcl_id = new_ctp->ct_id;
-	} else
-		__dbclear_ctp(new_ctp);
-
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_get_proc */
-/*
- * PUBLIC: void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, __dbc_get_reply *, int *));
- */
-void
-__dbc_get_proc(dbccl_id, keydlen, keydoff,
-		keyulen, keyflags, keydata, keysize,
-		datadlen, datadoff, dataulen, dataflags,
-		datadata, datasize, flags, replyp, freep)
-	long dbccl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__dbc_get_reply *replyp;
-	int * freep;
-/* END __dbc_get_proc */
-{
-	DBC *dbc;
-	DBT key, data;
-	DB_ENV *dbenv;
-	ct_entry *dbc_ctp;
-	int key_alloc, bulk_alloc, ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-	dbenv = dbc->dbp->dbenv;
-
-	*freep = 0;
-	bulk_alloc = 0;
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.ulen = keyulen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = DB_DBT_MALLOC;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.ulen = dataulen;
-	data.doff = datadoff;
-	data.size = datasize;
-	data.data = datadata;
-	if (flags & DB_MULTIPLE || flags & DB_MULTIPLE_KEY) {
-		if (data.data == 0) {
-			ret = __os_umalloc(dbenv, data.ulen, &data.data);
-			if (ret != 0)
-				goto err;
-			bulk_alloc = 1;
-		}
-		data.flags |= DB_DBT_USERMEM;
-	} else
-		data.flags |= DB_DBT_MALLOC;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-
-	/* Got all our stuff, now do the get */
-	ret = dbc->c_get(dbc, &key, &data, flags);
-
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (key.data == keydata) {
-			ret = __os_umalloc(dbenv, key.size,
-			    &replyp->keydata.keydata_val);
-			if (ret != 0) {
-				__os_ufree(dbenv, key.data);
-				__os_ufree(dbenv, data.data);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->keydata.keydata_val, key.data, key.size);
-		} else
-			replyp->keydata.keydata_val = key.data;
-
-		replyp->keydata.keydata_len = key.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_umalloc(dbenv, data.size,
-			    &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_ufree(dbenv, key.data);
-				__os_ufree(dbenv, data.data);
-				if (key_alloc)
-					__os_ufree(dbenv, replyp->keydata.keydata_val);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-		if (bulk_alloc)
-			__os_ufree(dbenv, data.data);
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_pget_proc */
-/*
- * PUBLIC: void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t,
- * PUBLIC:      u_int32_t, __dbc_pget_reply *, int *));
- */
-void
-__dbc_pget_proc(dbccl_id, skeydlen, skeydoff,
-		skeyulen, skeyflags, skeydata, skeysize,
-		pkeydlen, pkeydoff, pkeyulen, pkeyflags,
-		pkeydata, pkeysize, datadlen, datadoff,
-		dataulen, dataflags, datadata, datasize,
-		flags, replyp, freep)
-	long dbccl_id;
-	u_int32_t skeydlen;
-	u_int32_t skeydoff;
-	u_int32_t skeyulen;
-	u_int32_t skeyflags;
-	void *skeydata;
-	u_int32_t skeysize;
-	u_int32_t pkeydlen;
-	u_int32_t pkeydoff;
-	u_int32_t pkeyulen;
-	u_int32_t pkeyflags;
-	void *pkeydata;
-	u_int32_t pkeysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__dbc_pget_reply *replyp;
-	int * freep;
-/* END __dbc_pget_proc */
-{
-	DBC *dbc;
-	DBT skey, pkey, data;
-	DB_ENV *dbenv;
-	ct_entry *dbc_ctp;
-	int key_alloc, ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-	dbenv = dbc->dbp->dbenv;
-
-	*freep = 0;
-	memset(&skey, 0, sizeof(skey));
-	memset(&pkey, 0, sizeof(pkey));
-	memset(&data, 0, sizeof(data));
-
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	/* Set up key and data DBT */
-	skey.flags = DB_DBT_MALLOC;
-	skey.dlen = skeydlen;
-	skey.ulen = skeyulen;
-	skey.doff = skeydoff;
-	if (skeyflags & DB_DBT_PARTIAL)
-		skey.flags |= DB_DBT_PARTIAL;
-	skey.size = skeysize;
-	skey.data = skeydata;
-
-	pkey.flags = DB_DBT_MALLOC;
-	pkey.dlen = pkeydlen;
-	pkey.ulen = pkeyulen;
-	pkey.doff = pkeydoff;
-	if (pkeyflags & DB_DBT_PARTIAL)
-		pkey.flags |= DB_DBT_PARTIAL;
-	pkey.size = pkeysize;
-	pkey.data = pkeydata;
-
-	data.flags = DB_DBT_MALLOC;
-	data.dlen = datadlen;
-	data.ulen = dataulen;
-	data.doff = datadoff;
-	if (dataflags & DB_DBT_PARTIAL)
-		data.flags |= DB_DBT_PARTIAL;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the get */
-	ret = dbc->c_pget(dbc, &skey, &pkey, &data, flags);
-	/*
-	 * Otherwise just status.
-	 */
-	if (ret == 0) {
-		/*
-		 * XXX
-		 * We need to xdr_free whatever we are returning, next time.
-		 * However, DB does not allocate a new key if one was given
-		 * and we'd be free'ing up space allocated in the request.
-		 * So, allocate a new key/data pointer if it is the same one
-		 * as in the request.
-		 */
-		*freep = 1;
-		/*
-		 * Key
-		 */
-		key_alloc = 0;
-		if (skey.data == skeydata) {
-			ret = __os_umalloc(dbenv,
-			    skey.size, &replyp->skeydata.skeydata_val);
-			if (ret != 0) {
-				__os_ufree(dbenv, skey.data);
-				__os_ufree(dbenv, pkey.data);
-				__os_ufree(dbenv, data.data);
-				goto err;
-			}
-			key_alloc = 1;
-			memcpy(replyp->skeydata.skeydata_val, skey.data,
-			    skey.size);
-		} else
-			replyp->skeydata.skeydata_val = skey.data;
-		replyp->skeydata.skeydata_len = skey.size;
-
-		/*
-		 * Primary key
-		 */
-		if (pkey.data == pkeydata) {
-			ret = __os_umalloc(dbenv,
-			     pkey.size, &replyp->pkeydata.pkeydata_val);
-			if (ret != 0) {
-				__os_ufree(dbenv, skey.data);
-				__os_ufree(dbenv, pkey.data);
-				__os_ufree(dbenv, data.data);
-				if (key_alloc)
-					__os_ufree(dbenv,
-					    replyp->skeydata.skeydata_val);
-				goto err;
-			}
-			/*
-			 * We can set it to 2, because they cannot send the
-			 * pkey over without sending the skey over too.
-			 * So if they did send a pkey, they must have sent
-			 * the skey as well.
-			 */
-			key_alloc = 2;
-			memcpy(replyp->pkeydata.pkeydata_val, pkey.data,
-			    pkey.size);
-		} else
-			replyp->pkeydata.pkeydata_val = pkey.data;
-		replyp->pkeydata.pkeydata_len = pkey.size;
-
-		/*
-		 * Data
-		 */
-		if (data.data == datadata) {
-			ret = __os_umalloc(dbenv,
-			     data.size, &replyp->datadata.datadata_val);
-			if (ret != 0) {
-				__os_ufree(dbenv, skey.data);
-				__os_ufree(dbenv, pkey.data);
-				__os_ufree(dbenv, data.data);
-				/*
-				 * If key_alloc is 1, just skey needs to be
-				 * freed, if key_alloc is 2, both skey and pkey
-				 * need to be freed.
-				 */
-				if (key_alloc--)
-					__os_ufree(dbenv,
-					    replyp->skeydata.skeydata_val);
-				if (key_alloc)
-					__os_ufree(dbenv,
-					    replyp->pkeydata.pkeydata_val);
-				goto err;
-			}
-			memcpy(replyp->datadata.datadata_val, data.data,
-			    data.size);
-		} else
-			replyp->datadata.datadata_val = data.data;
-		replyp->datadata.datadata_len = data.size;
-	} else {
-err:		replyp->skeydata.skeydata_val = NULL;
-		replyp->skeydata.skeydata_len = 0;
-		replyp->pkeydata.pkeydata_val = NULL;
-		replyp->pkeydata.pkeydata_len = 0;
-		replyp->datadata.datadata_val = NULL;
-		replyp->datadata.datadata_len = 0;
-		*freep = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-
-/* BEGIN __dbc_put_proc */
-/*
- * PUBLIC: void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
- * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
- * PUBLIC:      u_int32_t, u_int32_t, __dbc_put_reply *, int *));
- */
-void
-__dbc_put_proc(dbccl_id, keydlen, keydoff,
-		keyulen, keyflags, keydata, keysize,
-		datadlen, datadoff, dataulen, dataflags,
-		datadata, datasize, flags, replyp, freep)
-	long dbccl_id;
-	u_int32_t keydlen;
-	u_int32_t keydoff;
-	u_int32_t keyulen;
-	u_int32_t keyflags;
-	void *keydata;
-	u_int32_t keysize;
-	u_int32_t datadlen;
-	u_int32_t datadoff;
-	u_int32_t dataulen;
-	u_int32_t dataflags;
-	void *datadata;
-	u_int32_t datasize;
-	u_int32_t flags;
-	__dbc_put_reply *replyp;
-	int * freep;
-/* END __dbc_put_proc */
-{
-	DB *dbp;
-	DBC *dbc;
-	DBT key, data;
-	ct_entry *dbc_ctp;
-	int ret;
-
-	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
-	dbc = (DBC *)dbc_ctp->ct_anyp;
-	dbp = (DB *)dbc_ctp->ct_parent->ct_anyp;
-
-	memset(&key, 0, sizeof(key));
-	memset(&data, 0, sizeof(data));
-
-	/* Set up key and data DBT */
-	key.dlen = keydlen;
-	key.ulen = keyulen;
-	key.doff = keydoff;
-	/*
-	 * Ignore memory related flags on server.
-	 */
-	key.flags = 0;
-	if (keyflags & DB_DBT_PARTIAL)
-		key.flags |= DB_DBT_PARTIAL;
-	key.size = keysize;
-	key.data = keydata;
-
-	data.dlen = datadlen;
-	data.ulen = dataulen;
-	data.doff = datadoff;
-	data.flags = dataflags;
-	data.size = datasize;
-	data.data = datadata;
-
-	/* Got all our stuff, now do the put */
-	ret = dbc->c_put(dbc, &key, &data, flags);
-
-	*freep = 0;
-	if (ret == 0 && (flags == DB_AFTER || flags == DB_BEFORE) &&
-	    dbp->type == DB_RECNO) {
-		/*
-		 * We need to xdr_free whatever we are returning, next time.
-		 */
-		replyp->keydata.keydata_val = key.data;
-		replyp->keydata.keydata_len = key.size;
-	} else {
-		replyp->keydata.keydata_val = NULL;
-		replyp->keydata.keydata_len = 0;
-	}
-	replyp->status = ret;
-	return;
-}
-#endif /* HAVE_RPC */
diff --git a/bdb/rpc_server/c/db_server_proc.c.in b/bdb/rpc_server/c/db_server_proc.c.in
new file mode 100644
index 00000000000..d5d1f49508a
--- /dev/null
+++ b/bdb/rpc_server/c/db_server_proc.c.in
@@ -0,0 +1,2500 @@
+/*-
+ * See the file LICENSE for redistribution information.
+ *
+ * Copyright (c) 2000-2002
+ *      Sleepycat Software.  All rights reserved.
+ */
+
+#include "db_config.h"
+
+#ifdef HAVE_RPC
+#ifndef lint
+static const char revid[] = "$Id: db_server_proc.c,v 1.92 2002/07/29 15:21:20 sue Exp $";
+#endif /* not lint */
+
+#ifndef NO_SYSTEM_INCLUDES
+#include <sys/types.h>
+
+#include <rpc/rpc.h>
+
+#include <string.h>
+#endif
+#include "dbinc_auto/db_server.h"
+
+#include "db_int.h"
+#include "dbinc/db_server_int.h"
+#include "dbinc_auto/rpc_server_ext.h"
+
+/* BEGIN __env_cachesize_proc */
+/*
+ * PUBLIC: void __env_cachesize_proc __P((long, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, __env_cachesize_reply *));
+ */
+void
+__env_cachesize_proc(dbenvcl_id, gbytes, bytes,
+		ncache, replyp)
+	long dbenvcl_id;
+	u_int32_t gbytes;
+	u_int32_t bytes;
+	u_int32_t ncache;
+	__env_cachesize_reply *replyp;
+/* END __env_cachesize_proc */
+{
+	DB_ENV *dbenv;
+	ct_entry *dbenv_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	ret = dbenv->set_cachesize(dbenv, gbytes, bytes, ncache);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_close_proc */
+/*
+ * PUBLIC: void __env_close_proc __P((long, u_int32_t, __env_close_reply *));
+ */
+void
+__env_close_proc(dbenvcl_id, flags, replyp)
+	long dbenvcl_id;
+	u_int32_t flags;
+	__env_close_reply *replyp;
+/* END __env_close_proc */
+{
+	ct_entry *dbenv_ctp;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	replyp->status = __dbenv_close_int(dbenvcl_id, flags, 0);
+	return;
+}
+
+/* BEGIN __env_create_proc */
+/*
+ * PUBLIC: void __env_create_proc __P((u_int32_t, __env_create_reply *));
+ */
+void
+__env_create_proc(timeout, replyp)
+	u_int32_t timeout;
+	__env_create_reply *replyp;
+/* END __env_create_proc */
+{
+	DB_ENV *dbenv;
+	ct_entry *ctp;
+	int ret;
+
+	ctp = new_ct_ent(&replyp->status);
+	if (ctp == NULL)
+		return;
+	if ((ret = db_env_create(&dbenv, 0)) == 0) {
+		ctp->ct_envp = dbenv;
+		ctp->ct_type = CT_ENV;
+		ctp->ct_parent = NULL;
+		ctp->ct_envparent = ctp;
+		__dbsrv_settimeout(ctp, timeout);
+		__dbsrv_active(ctp);
+		replyp->envcl_id = ctp->ct_id;
+	} else
+		__dbclear_ctp(ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_dbremove_proc */
+/*
+ * PUBLIC: void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t,
+ * PUBLIC:      __env_dbremove_reply *));
+ */
+void
+__env_dbremove_proc(dbenvcl_id, txnpcl_id, name,
+		subdb, flags, replyp)
+	long dbenvcl_id;
+	long txnpcl_id;
+	char *name;
+	char *subdb;
+	u_int32_t flags;
+	__env_dbremove_reply *replyp;
+/* END __env_dbremove_proc */
+{
+	int ret;
+	DB_ENV * dbenv;
+	ct_entry *dbenv_ctp;
+	DB_TXN * txnp;
+	ct_entry *txnp_ctp;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	ret = dbenv->dbremove(dbenv, txnp, name, subdb, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_dbrename_proc */
+/*
+ * PUBLIC: void __env_dbrename_proc __P((long, long, char *, char *, char *,
+ * PUBLIC:      u_int32_t, __env_dbrename_reply *));
+ */
+void
+__env_dbrename_proc(dbenvcl_id, txnpcl_id, name,
+		subdb, newname, flags, replyp)
+	long dbenvcl_id;
+	long txnpcl_id;
+	char *name;
+	char *subdb;
+	char *newname;
+	u_int32_t flags;
+	__env_dbrename_reply *replyp;
+/* END __env_dbrename_proc */
+{
+	int ret;
+	DB_ENV * dbenv;
+	ct_entry *dbenv_ctp;
+	DB_TXN * txnp;
+	ct_entry *txnp_ctp;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	ret = dbenv->dbrename(dbenv, txnp, name, subdb, newname, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_encrypt_proc */
+/*
+ * PUBLIC: void __env_encrypt_proc __P((long, char *, u_int32_t,
+ * PUBLIC:      __env_encrypt_reply *));
+ */
+void
+__env_encrypt_proc(dbenvcl_id, passwd, flags, replyp)
+	long dbenvcl_id;
+	char *passwd;
+	u_int32_t flags;
+	__env_encrypt_reply *replyp;
+/* END __env_encrypt_proc */
+{
+	int ret;
+	DB_ENV * dbenv;
+	ct_entry *dbenv_ctp;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	ret = dbenv->set_encrypt(dbenv, passwd, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_flags_proc */
+/*
+ * PUBLIC: void __env_flags_proc __P((long, u_int32_t, u_int32_t,
+ * PUBLIC:      __env_flags_reply *));
+ */
+void
+__env_flags_proc(dbenvcl_id, flags, onoff, replyp)
+	long dbenvcl_id;
+	u_int32_t flags;
+	u_int32_t onoff;
+	__env_flags_reply *replyp;
+/* END __env_flags_proc */
+{
+	DB_ENV *dbenv;
+	ct_entry *dbenv_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	ret = dbenv->set_flags(dbenv, flags, onoff);
+	if (onoff)
+		dbenv_ctp->ct_envdp.onflags = flags;
+	else
+		dbenv_ctp->ct_envdp.offflags = flags;
+
+	replyp->status = ret;
+	return;
+}
+/* BEGIN __env_open_proc */
+/*
+ * PUBLIC: void __env_open_proc __P((long, char *, u_int32_t, u_int32_t,
+ * PUBLIC:      __env_open_reply *));
+ */
+void
+__env_open_proc(dbenvcl_id, home, flags,
+		mode, replyp)
+	long dbenvcl_id;
+	char *home;
+	u_int32_t flags;
+	u_int32_t mode;
+	__env_open_reply *replyp;
+/* END __env_open_proc */
+{
+	DB_ENV *dbenv;
+	ct_entry *dbenv_ctp, *new_ctp;
+	u_int32_t newflags, shareflags;
+	int ret;
+	home_entry *fullhome;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+	fullhome = get_home(home);
+	if (fullhome == NULL) {
+		ret = DB_NOSERVER_HOME;
+		goto out;
+	}
+
+	/*
+	 * If they are using locking do deadlock detection for them,
+	 * internally.
+	 */
+	if ((flags & DB_INIT_LOCK) &&
+	    (ret = dbenv->set_lk_detect(dbenv, DB_LOCK_DEFAULT)) != 0)
+		goto out;
+
+	if (__dbsrv_verbose) {
+		dbenv->set_errfile(dbenv, stderr);
+		dbenv->set_errpfx(dbenv, fullhome->home);
+	}
+
+	/*
+	 * Mask off flags we ignore
+	 */
+	newflags = (flags & ~DB_SERVER_FLAGMASK);
+	shareflags = (newflags & DB_SERVER_ENVFLAGS);
+	/*
+	 * Check now whether we can share a handle for this env.
+	 */
+	replyp->envcl_id = dbenvcl_id;
+	if ((new_ctp = __dbsrv_shareenv(dbenv_ctp, fullhome, shareflags))
+	    != NULL) {
+		/*
+		 * We can share, clean up old  ID, set new one.
+		 */
+		if (__dbsrv_verbose)
+			printf("Sharing env ID %ld\n", new_ctp->ct_id);
+		replyp->envcl_id = new_ctp->ct_id;
+		ret = __dbenv_close_int(dbenvcl_id, 0, 0);
+	} else {
+		ret = dbenv->open(dbenv, fullhome->home, newflags, mode);
+		dbenv_ctp->ct_envdp.home = fullhome;
+		dbenv_ctp->ct_envdp.envflags = shareflags;
+	}
+out:	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __env_remove_proc */
+/*
+ * PUBLIC: void __env_remove_proc __P((long, char *, u_int32_t,
+ * PUBLIC:      __env_remove_reply *));
+ */
+void
+__env_remove_proc(dbenvcl_id, home, flags, replyp)
+	long dbenvcl_id;
+	char *home;
+	u_int32_t flags;
+	__env_remove_reply *replyp;
+/* END __env_remove_proc */
+{
+	DB_ENV *dbenv;
+	ct_entry *dbenv_ctp;
+	int ret;
+	home_entry *fullhome;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	fullhome = get_home(home);
+	if (fullhome == NULL) {
+		replyp->status = DB_NOSERVER_HOME;
+		return;
+	}
+
+	ret = dbenv->remove(dbenv, fullhome->home, flags);
+	__dbdel_ctp(dbenv_ctp);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_abort_proc */
+/*
+ * PUBLIC: void __txn_abort_proc __P((long, __txn_abort_reply *));
+ */
+void
+__txn_abort_proc(txnpcl_id, replyp)
+	long txnpcl_id;
+	__txn_abort_reply *replyp;
+/* END __txn_abort_proc */
+{
+	DB_TXN *txnp;
+	ct_entry *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+
+	ret = txnp->abort(txnp);
+	__dbdel_ctp(txnp_ctp);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_begin_proc */
+/*
+ * PUBLIC: void __txn_begin_proc __P((long, long, u_int32_t,
+ * PUBLIC:      __txn_begin_reply *));
+ */
+void
+__txn_begin_proc(dbenvcl_id, parentcl_id,
+		flags, replyp)
+	long dbenvcl_id;
+	long parentcl_id;
+	u_int32_t flags;
+	__txn_begin_reply *replyp;
+/* END __txn_begin_proc */
+{
+	DB_ENV *dbenv;
+	DB_TXN *parent, *txnp;
+	ct_entry *ctp, *dbenv_ctp, *parent_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+	parent_ctp = NULL;
+
+	ctp = new_ct_ent(&replyp->status);
+	if (ctp == NULL)
+		return;
+
+	if (parentcl_id != 0) {
+		ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN);
+		parent = (DB_TXN *)parent_ctp->ct_anyp;
+		ctp->ct_activep = parent_ctp->ct_activep;
+	} else
+		parent = NULL;
+
+	ret = dbenv->txn_begin(dbenv, parent, &txnp, flags);
+	if (ret == 0) {
+		ctp->ct_txnp = txnp;
+		ctp->ct_type = CT_TXN;
+		ctp->ct_parent = parent_ctp;
+		ctp->ct_envparent = dbenv_ctp;
+		replyp->txnidcl_id = ctp->ct_id;
+		__dbsrv_settimeout(ctp, dbenv_ctp->ct_timeout);
+		__dbsrv_active(ctp);
+	} else
+		__dbclear_ctp(ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_commit_proc */
+/*
+ * PUBLIC: void __txn_commit_proc __P((long, u_int32_t,
+ * PUBLIC:      __txn_commit_reply *));
+ */
+void
+__txn_commit_proc(txnpcl_id, flags, replyp)
+	long txnpcl_id;
+	u_int32_t flags;
+	__txn_commit_reply *replyp;
+/* END __txn_commit_proc */
+{
+	DB_TXN *txnp;
+	ct_entry *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+
+	ret = txnp->commit(txnp, flags);
+	__dbdel_ctp(txnp_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_discard_proc */
+/*
+ * PUBLIC: void __txn_discard_proc __P((long, u_int32_t,
+ * PUBLIC:      __txn_discard_reply *));
+ */
+void
+__txn_discard_proc(txnpcl_id, flags, replyp)
+	long txnpcl_id;
+	u_int32_t flags;
+	__txn_discard_reply *replyp;
+/* END __txn_discard_proc */
+{
+	DB_TXN *txnp;
+	ct_entry *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+
+	ret = txnp->discard(txnp, flags);
+	__dbdel_ctp(txnp_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_prepare_proc */
+/*
+ * PUBLIC: void __txn_prepare_proc __P((long, u_int8_t *,
+ * PUBLIC:      __txn_prepare_reply *));
+ */
+void
+__txn_prepare_proc(txnpcl_id, gid, replyp)
+	long txnpcl_id;
+	u_int8_t *gid;
+	__txn_prepare_reply *replyp;
+/* END __txn_prepare_proc */
+{
+	DB_TXN *txnp;
+	ct_entry *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+	txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+
+	ret = txnp->prepare(txnp, gid);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __txn_recover_proc */
+/*
+ * PUBLIC: void __txn_recover_proc __P((long, u_int32_t, u_int32_t,
+ * PUBLIC:      __txn_recover_reply *, int *));
+ */
+void
+__txn_recover_proc(dbenvcl_id, count,
+		flags, replyp, freep)
+	long dbenvcl_id;
+	u_int32_t count;
+	u_int32_t flags;
+	__txn_recover_reply *replyp;
+	int * freep;
+/* END __txn_recover_proc */
+{
+	DB_ENV *dbenv;
+	DB_PREPLIST *dbprep, *p;
+	ct_entry *dbenv_ctp, *ctp;
+	long erri, i, retcount;
+	u_int32_t *txnidp;
+	int ret;
+	u_int8_t *gid;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+	dbprep = NULL;
+	*freep = 0;
+
+	if ((ret =
+	    __os_malloc(dbenv, count * sizeof(DB_PREPLIST), &dbprep)) != 0)
+		goto out;
+	if ((ret =
+	    dbenv->txn_recover(dbenv, dbprep, count, &retcount, flags)) != 0)
+		goto out;
+	/*
+	 * If there is nothing, success, but it's easy.
+	 */
+	replyp->retcount = retcount;
+	if (retcount == 0) {
+		replyp->txn.txn_val = NULL;
+		replyp->txn.txn_len = 0;
+		replyp->gid.gid_val = NULL;
+		replyp->gid.gid_len = 0;
+	}
+
+	/*
+	 * We have our txn list.  Now we need to allocate the space for
+	 * the txn ID array and the GID array and set them up.
+	 */
+	if ((ret = __os_calloc(dbenv, retcount, sizeof(u_int32_t),
+	    &replyp->txn.txn_val)) != 0)
+		goto out;
+	replyp->txn.txn_len = retcount * sizeof(u_int32_t);
+	if ((ret = __os_calloc(dbenv, retcount, DB_XIDDATASIZE,
+	    &replyp->gid.gid_val)) != 0) {
+		__os_free(dbenv, replyp->txn.txn_val);
+		goto out;
+	}
+	replyp->gid.gid_len = retcount * DB_XIDDATASIZE;
+
+	/*
+	 * Now walk through our results, creating parallel arrays
+	 * to send back.  For each entry we need to create a new
+	 * txn ctp and then fill in the array info.
+	 */
+	i = 0;
+	p = dbprep;
+	gid = replyp->gid.gid_val;
+	txnidp = replyp->txn.txn_val;
+	while (i++ < retcount) {
+		ctp = new_ct_ent(&ret);
+		if (ret != 0) {
+			i--;
+			goto out2;
+		}
+		ctp->ct_txnp = p->txn;
+		ctp->ct_type = CT_TXN;
+		ctp->ct_parent = NULL;
+		ctp->ct_envparent = dbenv_ctp;
+		__dbsrv_settimeout(ctp, dbenv_ctp->ct_timeout);
+		__dbsrv_active(ctp);
+
+		*txnidp = ctp->ct_id;
+		memcpy(gid, p->gid, DB_XIDDATASIZE);
+
+		p++;
+		txnidp++;
+		gid += DB_XIDDATASIZE;
+	}
+	/*
+	 * If we get here, we have success and we have to set freep
+	 * so it'll get properly freed next time.
+	 */
+	*freep = 1;
+out:
+	if (dbprep != NULL)
+		__os_free(dbenv, dbprep);
+	replyp->status = ret;
+	return;
+out2:
+	/*
+	 * We had an error in the middle of creating our new txn
+	 * ct entries.  We have to unwind all that we have done.  Ugh.
+	 */
+	for (txnidp = replyp->txn.txn_val, erri = 0;
+	    erri < i; erri++, txnidp++) {
+		ctp = get_tableent(*txnidp);
+		__dbclear_ctp(ctp);
+	}
+	__os_free(dbenv, replyp->txn.txn_val);
+	__os_free(dbenv, replyp->gid.gid_val);
+	__os_free(dbenv, dbprep);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_bt_maxkey_proc */
+/*
+ * PUBLIC: void __db_bt_maxkey_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_bt_maxkey_reply *));
+ */
+void
+__db_bt_maxkey_proc(dbpcl_id, maxkey, replyp)
+	long dbpcl_id;
+	u_int32_t maxkey;
+	__db_bt_maxkey_reply *replyp;
+/* END __db_bt_maxkey_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_bt_maxkey(dbp, maxkey);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_associate_proc */
+/*
+ * PUBLIC: void __db_associate_proc __P((long, long, long, u_int32_t,
+ * PUBLIC:      __db_associate_reply *));
+ */
+void
+__db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id,
+		flags, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	long sdbpcl_id;
+	u_int32_t flags;
+	__db_associate_reply *replyp;
+/* END __db_associate_proc */
+{
+	DB *dbp, *sdbp;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *sdbp_ctp, *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	ACTIVATE_CTP(sdbp_ctp, sdbpcl_id, CT_DB);
+	sdbp = (DB *)sdbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+
+	/*
+	 * We do not support DB_CREATE for associate.   Users
+	 * can only access secondary indices on a read-only basis,
+	 * so whatever they are looking for needs to be there already.
+	 */
+	if (flags != 0)
+		ret = EINVAL;
+	else
+		ret = dbp->associate(dbp, txnp, sdbp, NULL, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_bt_minkey_proc */
+/*
+ * PUBLIC: void __db_bt_minkey_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_bt_minkey_reply *));
+ */
+void
+__db_bt_minkey_proc(dbpcl_id, minkey, replyp)
+	long dbpcl_id;
+	u_int32_t minkey;
+	__db_bt_minkey_reply *replyp;
+/* END __db_bt_minkey_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_bt_minkey(dbp, minkey);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_close_proc */
+/*
+ * PUBLIC: void __db_close_proc __P((long, u_int32_t, __db_close_reply *));
+ */
+void
+__db_close_proc(dbpcl_id, flags, replyp)
+	long dbpcl_id;
+	u_int32_t flags;
+	__db_close_reply *replyp;
+/* END __db_close_proc */
+{
+	ct_entry *dbp_ctp;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	replyp->status = __db_close_int(dbpcl_id, flags);
+	return;
+}
+
+/* BEGIN __db_create_proc */
+/*
+ * PUBLIC: void __db_create_proc __P((long, u_int32_t, __db_create_reply *));
+ */
+void
+__db_create_proc(dbenvcl_id, flags, replyp)
+	long dbenvcl_id;
+	u_int32_t flags;
+	__db_create_reply *replyp;
+/* END __db_create_proc */
+{
+	DB *dbp;
+	DB_ENV *dbenv;
+	ct_entry *dbenv_ctp, *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV);
+	dbenv = (DB_ENV *)dbenv_ctp->ct_anyp;
+
+	dbp_ctp = new_ct_ent(&replyp->status);
+	if (dbp_ctp == NULL)
+		return ;
+	/*
+	 * We actually require env's for databases.  The client should
+	 * have caught it, but just in case.
+	 */
+	DB_ASSERT(dbenv != NULL);
+	if ((ret = db_create(&dbp, dbenv, flags)) == 0) {
+		dbp_ctp->ct_dbp = dbp;
+		dbp_ctp->ct_type = CT_DB;
+		dbp_ctp->ct_parent = dbenv_ctp;
+		dbp_ctp->ct_envparent = dbenv_ctp;
+		replyp->dbcl_id = dbp_ctp->ct_id;
+	} else
+		__dbclear_ctp(dbp_ctp);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_del_proc */
+/*
+ * PUBLIC: void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
+ */
+void
+__db_del_proc(dbpcl_id, txnpcl_id, keydlen,
+		keydoff, keyulen, keyflags, keydata,
+		keysize, flags, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t flags;
+	__db_del_reply *replyp;
+/* END __db_del_proc */
+{
+	DB *dbp;
+	DBT key;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	memset(&key, 0, sizeof(key));
+
+	/* Set up key DBT */
+	key.dlen = keydlen;
+	key.ulen = keyulen;
+	key.doff = keydoff;
+	key.flags = keyflags;
+	key.size = keysize;
+	key.data = keydata;
+
+	ret = dbp->del(dbp, txnp, &key, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_encrypt_proc */
+/*
+ * PUBLIC: void __db_encrypt_proc __P((long, char *, u_int32_t,
+ * PUBLIC:      __db_encrypt_reply *));
+ */
+void
+__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)
+	long dbpcl_id;
+	char *passwd;
+	u_int32_t flags;
+	__db_encrypt_reply *replyp;
+/* END __db_encrypt_proc */
+{
+	int ret;
+	DB * dbp;
+	ct_entry *dbp_ctp;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_encrypt(dbp, passwd, flags);
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_extentsize_proc */
+/*
+ * PUBLIC: void __db_extentsize_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_extentsize_reply *));
+ */
+void
+__db_extentsize_proc(dbpcl_id, extentsize, replyp)
+	long dbpcl_id;
+	u_int32_t extentsize;
+	__db_extentsize_reply *replyp;
+/* END __db_extentsize_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_q_extentsize(dbp, extentsize);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_flags_proc */
+/*
+ * PUBLIC: void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));
+ */
+void
+__db_flags_proc(dbpcl_id, flags, replyp)
+	long dbpcl_id;
+	u_int32_t flags;
+	__db_flags_reply *replyp;
+/* END __db_flags_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_flags(dbp, flags);
+	dbp_ctp->ct_dbdp.setflags |= flags;
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_get_proc */
+/*
+ * PUBLIC: void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, __db_get_reply *, int *));
+ */
+void
+__db_get_proc(dbpcl_id, txnpcl_id, keydlen,
+		keydoff, keyulen, keyflags, keydata,
+		keysize, datadlen, datadoff, dataulen,
+		dataflags, datadata, datasize, flags, replyp, freep)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__db_get_reply *replyp;
+	int * freep;
+/* END __db_get_proc */
+{
+	DB *dbp;
+	DBT key, data;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	int key_alloc, bulk_alloc, ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	*freep = 0;
+	bulk_alloc = 0;
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+
+	/* Set up key and data DBT */
+	key.dlen = keydlen;
+	key.doff = keydoff;
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	key.flags = DB_DBT_MALLOC;
+	if (keyflags & DB_DBT_PARTIAL)
+		key.flags |= DB_DBT_PARTIAL;
+	key.size = keysize;
+	key.ulen = keyulen;
+	key.data = keydata;
+
+	data.dlen = datadlen;
+	data.doff = datadoff;
+	data.ulen = dataulen;
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	data.size = datasize;
+	data.data = datadata;
+	if (flags & DB_MULTIPLE) {
+		if (data.data == 0) {
+			ret = __os_umalloc(dbp->dbenv,
+			    data.ulen, &data.data);
+			if (ret != 0)
+				goto err;
+			bulk_alloc = 1;
+		}
+		data.flags |= DB_DBT_USERMEM;
+	} else
+		data.flags |= DB_DBT_MALLOC;
+	if (dataflags & DB_DBT_PARTIAL)
+		data.flags |= DB_DBT_PARTIAL;
+
+	/* Got all our stuff, now do the get */
+	ret = dbp->get(dbp, txnp, &key, &data, flags);
+	/*
+	 * Otherwise just status.
+	 */
+	if (ret == 0) {
+		/*
+		 * XXX
+		 * We need to xdr_free whatever we are returning, next time.
+		 * However, DB does not allocate a new key if one was given
+		 * and we'd be free'ing up space allocated in the request.
+		 * So, allocate a new key/data pointer if it is the same one
+		 * as in the request.
+		 */
+		*freep = 1;
+		/*
+		 * Key
+		 */
+		key_alloc = 0;
+		if (key.data == keydata) {
+			ret = __os_umalloc(dbp->dbenv,
+			    key.size, &replyp->keydata.keydata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, key.data);
+				__os_ufree(dbp->dbenv, data.data);
+				goto err;
+			}
+			key_alloc = 1;
+			memcpy(replyp->keydata.keydata_val, key.data, key.size);
+		} else
+			replyp->keydata.keydata_val = key.data;
+
+		replyp->keydata.keydata_len = key.size;
+
+		/*
+		 * Data
+		 */
+		if (data.data == datadata) {
+			ret = __os_umalloc(dbp->dbenv,
+			     data.size, &replyp->datadata.datadata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, key.data);
+				__os_ufree(dbp->dbenv, data.data);
+				if (key_alloc)
+					__os_ufree(dbp->dbenv,
+					    replyp->keydata.keydata_val);
+				goto err;
+			}
+			memcpy(replyp->datadata.datadata_val, data.data,
+			    data.size);
+		} else
+			replyp->datadata.datadata_val = data.data;
+		replyp->datadata.datadata_len = data.size;
+	} else {
+err:		replyp->keydata.keydata_val = NULL;
+		replyp->keydata.keydata_len = 0;
+		replyp->datadata.datadata_val = NULL;
+		replyp->datadata.datadata_len = 0;
+		*freep = 0;
+		if (bulk_alloc)
+			__os_ufree(dbp->dbenv, data.data);
+	}
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_h_ffactor_proc */
+/*
+ * PUBLIC: void __db_h_ffactor_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_h_ffactor_reply *));
+ */
+void
+__db_h_ffactor_proc(dbpcl_id, ffactor, replyp)
+	long dbpcl_id;
+	u_int32_t ffactor;
+	__db_h_ffactor_reply *replyp;
+/* END __db_h_ffactor_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_h_ffactor(dbp, ffactor);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_h_nelem_proc */
+/*
+ * PUBLIC: void __db_h_nelem_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_h_nelem_reply *));
+ */
+void
+__db_h_nelem_proc(dbpcl_id, nelem, replyp)
+	long dbpcl_id;
+	u_int32_t nelem;
+	__db_h_nelem_reply *replyp;
+/* END __db_h_nelem_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_h_nelem(dbp, nelem);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_key_range_proc */
+/*
+ * PUBLIC: void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
+ */
+void
+__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,
+		keydoff, keyulen, keyflags, keydata,
+		keysize, flags, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t flags;
+	__db_key_range_reply *replyp;
+/* END __db_key_range_proc */
+{
+	DB *dbp;
+	DBT key;
+	DB_KEY_RANGE range;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	memset(&key, 0, sizeof(key));
+	/* Set up key and data DBT */
+	key.dlen = keydlen;
+	key.ulen = keyulen;
+	key.doff = keydoff;
+	key.size = keysize;
+	key.data = keydata;
+	key.flags = keyflags;
+
+	ret = dbp->key_range(dbp, txnp, &key, &range, flags);
+
+	replyp->status = ret;
+	replyp->less = range.less;
+	replyp->equal = range.equal;
+	replyp->greater = range.greater;
+	return;
+}
+
+/* BEGIN __db_lorder_proc */
+/*
+ * PUBLIC: void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));
+ */
+void
+__db_lorder_proc(dbpcl_id, lorder, replyp)
+	long dbpcl_id;
+	u_int32_t lorder;
+	__db_lorder_reply *replyp;
+/* END __db_lorder_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_lorder(dbp, lorder);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_open_proc */
+/*
+ * PUBLIC: void __db_open_proc __P((long, long, char *, char *, u_int32_t,
+ * PUBLIC:      u_int32_t, u_int32_t, __db_open_reply *));
+ */
+void
+__db_open_proc(dbpcl_id, txnpcl_id, name,
+		subdb, type, flags, mode, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	char *name;
+	char *subdb;
+	u_int32_t type;
+	u_int32_t flags;
+	u_int32_t mode;
+	__db_open_reply *replyp;
+/* END __db_open_proc */
+{
+	DB *dbp;
+	DB_TXN *txnp;
+	DBTYPE dbtype;
+	ct_entry *dbp_ctp, *new_ctp, *txnp_ctp;
+	int isswapped, ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	replyp->dbcl_id = dbpcl_id;
+	if ((new_ctp = __dbsrv_sharedb(dbp_ctp, name, subdb, type, flags))
+	    != NULL) {
+		/*
+		 * We can share, clean up old ID, set new one.
+		 */
+		if (__dbsrv_verbose)
+			printf("Sharing db ID %ld\n", new_ctp->ct_id);
+		replyp->dbcl_id = new_ctp->ct_id;
+		ret = __db_close_int(dbpcl_id, 0);
+		goto out;
+	}
+	ret = dbp->open(dbp, txnp, name, subdb, (DBTYPE)type, flags, mode);
+	if (ret == 0) {
+		(void)dbp->get_type(dbp, &dbtype);
+		replyp->type = dbtype;
+		/* XXX
+		 * Tcl needs to peek at dbp->flags for DB_AM_DUP.  Send
+		 * this dbp's flags back.
+		 */
+		replyp->dbflags = (int) dbp->flags;
+		/*
+		 * We need to determine the byte order of the database
+		 * and send it back to the client.  Determine it by
+		 * the server's native order and the swapped value of
+		 * the DB itself.
+		 */
+		(void)dbp->get_byteswapped(dbp, &isswapped);
+		if (__db_byteorder(NULL, 1234) == 0) {
+			if (isswapped == 0)
+				replyp->lorder = 1234;
+			else
+				replyp->lorder = 4321;
+		} else {
+			if (isswapped == 0)
+				replyp->lorder = 4321;
+			else
+				replyp->lorder = 1234;
+		}
+		dbp_ctp->ct_dbdp.type = dbtype;
+		dbp_ctp->ct_dbdp.dbflags = LF_ISSET(DB_SERVER_DBFLAGS);
+		if (name == NULL)
+			dbp_ctp->ct_dbdp.db = NULL;
+		else if ((ret = __os_strdup(dbp->dbenv, name,
+		    &dbp_ctp->ct_dbdp.db)) != 0)
+			goto out;
+		if (subdb == NULL)
+			dbp_ctp->ct_dbdp.subdb = NULL;
+		else if ((ret = __os_strdup(dbp->dbenv, subdb,
+		    &dbp_ctp->ct_dbdp.subdb)) != 0)
+			goto out;
+	}
+out:
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_pagesize_proc */
+/*
+ * PUBLIC: void __db_pagesize_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_pagesize_reply *));
+ */
+void
+__db_pagesize_proc(dbpcl_id, pagesize, replyp)
+	long dbpcl_id;
+	u_int32_t pagesize;
+	__db_pagesize_reply *replyp;
+/* END __db_pagesize_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_pagesize(dbp, pagesize);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_pget_proc */
+/*
+ * PUBLIC: void __db_pget_proc __P((long, long, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, __db_pget_reply *, int *));
+ */
+void
+__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,
+		skeydoff, skeyulen, skeyflags, skeydata,
+		skeysize, pkeydlen, pkeydoff, pkeyulen,
+		pkeyflags, pkeydata, pkeysize, datadlen,
+		datadoff, dataulen, dataflags, datadata,
+		datasize, flags, replyp, freep)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t skeydlen;
+	u_int32_t skeydoff;
+	u_int32_t skeyulen;
+	u_int32_t skeyflags;
+	void *skeydata;
+	u_int32_t skeysize;
+	u_int32_t pkeydlen;
+	u_int32_t pkeydoff;
+	u_int32_t pkeyulen;
+	u_int32_t pkeyflags;
+	void *pkeydata;
+	u_int32_t pkeysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__db_pget_reply *replyp;
+	int * freep;
+/* END __db_pget_proc */
+{
+	DB *dbp;
+	DBT skey, pkey, data;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	int key_alloc, ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	*freep = 0;
+	memset(&skey, 0, sizeof(skey));
+	memset(&pkey, 0, sizeof(pkey));
+	memset(&data, 0, sizeof(data));
+
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	/* Set up key and data DBT */
+	skey.flags = DB_DBT_MALLOC;
+	skey.dlen = skeydlen;
+	skey.ulen = skeyulen;
+	skey.doff = skeydoff;
+	if (skeyflags & DB_DBT_PARTIAL)
+		skey.flags |= DB_DBT_PARTIAL;
+	skey.size = skeysize;
+	skey.data = skeydata;
+
+	pkey.flags = DB_DBT_MALLOC;
+	pkey.dlen = pkeydlen;
+	pkey.ulen = pkeyulen;
+	pkey.doff = pkeydoff;
+	if (pkeyflags & DB_DBT_PARTIAL)
+		pkey.flags |= DB_DBT_PARTIAL;
+	pkey.size = pkeysize;
+	pkey.data = pkeydata;
+
+	data.flags = DB_DBT_MALLOC;
+	data.dlen = datadlen;
+	data.ulen = dataulen;
+	data.doff = datadoff;
+	if (dataflags & DB_DBT_PARTIAL)
+		data.flags |= DB_DBT_PARTIAL;
+	data.size = datasize;
+	data.data = datadata;
+
+	/* Got all our stuff, now do the get */
+	ret = dbp->pget(dbp, txnp, &skey, &pkey, &data, flags);
+	/*
+	 * Otherwise just status.
+	 */
+	if (ret == 0) {
+		/*
+		 * XXX
+		 * We need to xdr_free whatever we are returning, next time.
+		 * However, DB does not allocate a new key if one was given
+		 * and we'd be free'ing up space allocated in the request.
+		 * So, allocate a new key/data pointer if it is the same one
+		 * as in the request.
+		 */
+		*freep = 1;
+		/*
+		 * Key
+		 */
+		key_alloc = 0;
+		if (skey.data == skeydata) {
+			ret = __os_umalloc(dbp->dbenv,
+			    skey.size, &replyp->skeydata.skeydata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, skey.data);
+				__os_ufree(dbp->dbenv, pkey.data);
+				__os_ufree(dbp->dbenv, data.data);
+				goto err;
+			}
+			key_alloc = 1;
+			memcpy(replyp->skeydata.skeydata_val, skey.data,
+			    skey.size);
+		} else
+			replyp->skeydata.skeydata_val = skey.data;
+
+		replyp->skeydata.skeydata_len = skey.size;
+
+		/*
+		 * Primary key
+		 */
+		if (pkey.data == pkeydata) {
+			ret = __os_umalloc(dbp->dbenv,
+			     pkey.size, &replyp->pkeydata.pkeydata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, skey.data);
+				__os_ufree(dbp->dbenv, pkey.data);
+				__os_ufree(dbp->dbenv, data.data);
+				if (key_alloc)
+					__os_ufree(dbp->dbenv,
+					    replyp->skeydata.skeydata_val);
+				goto err;
+			}
+			/*
+			 * We can set it to 2, because they cannot send the
+			 * pkey over without sending the skey over too.
+			 * So if they did send a pkey, they must have sent
+			 * the skey as well.
+			 */
+			key_alloc = 2;
+			memcpy(replyp->pkeydata.pkeydata_val, pkey.data,
+			    pkey.size);
+		} else
+			replyp->pkeydata.pkeydata_val = pkey.data;
+		replyp->pkeydata.pkeydata_len = pkey.size;
+
+		/*
+		 * Data
+		 */
+		if (data.data == datadata) {
+			ret = __os_umalloc(dbp->dbenv,
+			     data.size, &replyp->datadata.datadata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, skey.data);
+				__os_ufree(dbp->dbenv, pkey.data);
+				__os_ufree(dbp->dbenv, data.data);
+				/*
+				 * If key_alloc is 1, just skey needs to be
+				 * freed, if key_alloc is 2, both skey and pkey
+				 * need to be freed.
+				 */
+				if (key_alloc--)
+					__os_ufree(dbp->dbenv,
+					    replyp->skeydata.skeydata_val);
+				if (key_alloc)
+					__os_ufree(dbp->dbenv,
+					    replyp->pkeydata.pkeydata_val);
+				goto err;
+			}
+			memcpy(replyp->datadata.datadata_val, data.data,
+			    data.size);
+		} else
+			replyp->datadata.datadata_val = data.data;
+		replyp->datadata.datadata_len = data.size;
+	} else {
+err:		replyp->skeydata.skeydata_val = NULL;
+		replyp->skeydata.skeydata_len = 0;
+		replyp->pkeydata.pkeydata_val = NULL;
+		replyp->pkeydata.pkeydata_len = 0;
+		replyp->datadata.datadata_val = NULL;
+		replyp->datadata.datadata_len = 0;
+		*freep = 0;
+	}
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_put_proc */
+/*
+ * PUBLIC: void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, __db_put_reply *, int *));
+ */
+void
+__db_put_proc(dbpcl_id, txnpcl_id, keydlen,
+		keydoff, keyulen, keyflags, keydata,
+		keysize, datadlen, datadoff, dataulen,
+		dataflags, datadata, datasize, flags, replyp, freep)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__db_put_reply *replyp;
+	int * freep;
+/* END __db_put_proc */
+{
+	DB *dbp;
+	DBT key, data;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	*freep = 0;
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+
+	/* Set up key and data DBT */
+	key.dlen = keydlen;
+	key.ulen = keyulen;
+	key.doff = keydoff;
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	key.flags = DB_DBT_MALLOC;
+	if (keyflags & DB_DBT_PARTIAL)
+		key.flags |= DB_DBT_PARTIAL;
+	key.size = keysize;
+	key.data = keydata;
+
+	data.dlen = datadlen;
+	data.ulen = dataulen;
+	data.doff = datadoff;
+	data.flags = dataflags;
+	data.size = datasize;
+	data.data = datadata;
+
+	/* Got all our stuff, now do the put */
+	ret = dbp->put(dbp, txnp, &key, &data, flags);
+	/*
+	 * If the client did a DB_APPEND, set up key in reply.
+	 * Otherwise just status.
+	 */
+	if (ret == 0 && (flags == DB_APPEND)) {
+		/*
+		 * XXX
+		 * We need to xdr_free whatever we are returning, next time.
+		 * However, DB does not allocate a new key if one was given
+		 * and we'd be free'ing up space allocated in the request.
+		 * So, allocate a new key/data pointer if it is the same one
+		 * as in the request.
+		 */
+		*freep = 1;
+		/*
+		 * Key
+		 */
+		if (key.data == keydata) {
+			ret = __os_umalloc(dbp->dbenv,
+			    key.size, &replyp->keydata.keydata_val);
+			if (ret != 0) {
+				__os_ufree(dbp->dbenv, key.data);
+				goto err;
+			}
+			memcpy(replyp->keydata.keydata_val, key.data, key.size);
+		} else
+			replyp->keydata.keydata_val = key.data;
+
+		replyp->keydata.keydata_len = key.size;
+	} else {
+err:		replyp->keydata.keydata_val = NULL;
+		replyp->keydata.keydata_len = 0;
+		*freep = 0;
+	}
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_re_delim_proc */
+/*
+ * PUBLIC: void __db_re_delim_proc __P((long, u_int32_t,
+ * PUBLIC:      __db_re_delim_reply *));
+ */
+void
+__db_re_delim_proc(dbpcl_id, delim, replyp)
+	long dbpcl_id;
+	u_int32_t delim;
+	__db_re_delim_reply *replyp;
+/* END __db_re_delim_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_re_delim(dbp, delim);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_re_len_proc */
+/*
+ * PUBLIC: void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));
+ */
+void
+__db_re_len_proc(dbpcl_id, len, replyp)
+	long dbpcl_id;
+	u_int32_t len;
+	__db_re_len_reply *replyp;
+/* END __db_re_len_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_re_len(dbp, len);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_re_pad_proc */
+/*
+ * PUBLIC: void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));
+ */
+void
+__db_re_pad_proc(dbpcl_id, pad, replyp)
+	long dbpcl_id;
+	u_int32_t pad;
+	__db_re_pad_reply *replyp;
+/* END __db_re_pad_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->set_re_pad(dbp, pad);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_remove_proc */
+/*
+ * PUBLIC: void __db_remove_proc __P((long, char *, char *, u_int32_t,
+ * PUBLIC:      __db_remove_reply *));
+ */
+void
+__db_remove_proc(dbpcl_id, name, subdb,
+		flags, replyp)
+	long dbpcl_id;
+	char *name;
+	char *subdb;
+	u_int32_t flags;
+	__db_remove_reply *replyp;
+/* END __db_remove_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->remove(dbp, name, subdb, flags);
+	__dbdel_ctp(dbp_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_rename_proc */
+/*
+ * PUBLIC: void __db_rename_proc __P((long, char *, char *, char *, u_int32_t,
+ * PUBLIC:      __db_rename_reply *));
+ */
+void
+__db_rename_proc(dbpcl_id, name, subdb,
+		newname, flags, replyp)
+	long dbpcl_id;
+	char *name;
+	char *subdb;
+	char *newname;
+	u_int32_t flags;
+	__db_rename_reply *replyp;
+/* END __db_rename_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->rename(dbp, name, subdb, newname, flags);
+	__dbdel_ctp(dbp_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_stat_proc */
+/*
+ * PUBLIC: void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *,
+ * PUBLIC:      int *));
+ */
+void
+__db_stat_proc(dbpcl_id, flags, replyp, freep)
+	long dbpcl_id;
+	u_int32_t flags;
+	__db_stat_reply *replyp;
+	int * freep;
+/* END __db_stat_proc */
+{
+	DB *dbp;
+	DBTYPE type;
+	ct_entry *dbp_ctp;
+	u_int32_t *q, *p, *retsp;
+	int i, len, ret;
+	void *sp;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->stat(dbp, &sp, flags);
+	replyp->status = ret;
+	if (ret != 0)
+		return;
+	/*
+	 * We get here, we have success.  Allocate an array so that
+	 * we can use the list generator.  Generate the reply, free
+	 * up the space.
+	 */
+	/*
+	 * XXX This assumes that all elements of all stat structures
+	 * are u_int32_t fields.  They are, currently.
+	 */
+	(void)dbp->get_type(dbp, &type);
+	if (type == DB_HASH)
+		len = sizeof(DB_HASH_STAT);
+	else if (type == DB_QUEUE)
+		len = sizeof(DB_QUEUE_STAT);
+	else            /* BTREE or RECNO are same stats */
+		len = sizeof(DB_BTREE_STAT);
+	replyp->stats.stats_len = len / sizeof(u_int32_t);
+
+	if ((ret = __os_umalloc(dbp->dbenv, len * replyp->stats.stats_len,
+	    &retsp)) != 0)
+		goto out;
+	for (i = 0, q = retsp, p = sp; i < len;
+	    i++, q++, p++)
+		*q = *p;
+	replyp->stats.stats_val = retsp;
+	__os_ufree(dbp->dbenv, sp);
+	if (ret == 0)
+		*freep = 1;
+out:
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_sync_proc */
+/*
+ * PUBLIC: void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));
+ */
+void
+__db_sync_proc(dbpcl_id, flags, replyp)
+	long dbpcl_id;
+	u_int32_t flags;
+	__db_sync_reply *replyp;
+/* END __db_sync_proc */
+{
+	DB *dbp;
+	ct_entry *dbp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	ret = dbp->sync(dbp, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_truncate_proc */
+/*
+ * PUBLIC: void __db_truncate_proc __P((long, long, u_int32_t,
+ * PUBLIC:      __db_truncate_reply *));
+ */
+void
+__db_truncate_proc(dbpcl_id, txnpcl_id,
+		flags, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t flags;
+	__db_truncate_reply *replyp;
+/* END __db_truncate_proc */
+{
+	DB *dbp;
+	DB_TXN *txnp;
+	ct_entry *dbp_ctp, *txnp_ctp;
+	u_int32_t count;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+	} else
+		txnp = NULL;
+
+	ret = dbp->truncate(dbp, txnp, &count, flags);
+	replyp->status = ret;
+	if (ret == 0)
+		replyp->count = count;
+	return;
+}
+
+/* BEGIN __db_cursor_proc */
+/*
+ * PUBLIC: void __db_cursor_proc __P((long, long, u_int32_t,
+ * PUBLIC:      __db_cursor_reply *));
+ */
+void
+__db_cursor_proc(dbpcl_id, txnpcl_id,
+		flags, replyp)
+	long dbpcl_id;
+	long txnpcl_id;
+	u_int32_t flags;
+	__db_cursor_reply *replyp;
+/* END __db_cursor_proc */
+{
+	DB *dbp;
+	DBC *dbc;
+	DB_TXN *txnp;
+	ct_entry *dbc_ctp, *env_ctp, *dbp_ctp, *txnp_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+	dbc_ctp = new_ct_ent(&replyp->status);
+	if (dbc_ctp == NULL)
+		return;
+
+	if (txnpcl_id != 0) {
+		ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN);
+		txnp = (DB_TXN *)txnp_ctp->ct_anyp;
+		dbc_ctp->ct_activep = txnp_ctp->ct_activep;
+	} else
+		txnp = NULL;
+
+	if ((ret = dbp->cursor(dbp, txnp, &dbc, flags)) == 0) {
+		dbc_ctp->ct_dbc = dbc;
+		dbc_ctp->ct_type = CT_CURSOR;
+		dbc_ctp->ct_parent = dbp_ctp;
+		env_ctp = dbp_ctp->ct_envparent;
+		dbc_ctp->ct_envparent = env_ctp;
+		__dbsrv_settimeout(dbc_ctp, env_ctp->ct_timeout);
+		__dbsrv_active(dbc_ctp);
+		replyp->dbcidcl_id = dbc_ctp->ct_id;
+	} else
+		__dbclear_ctp(dbc_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __db_join_proc */
+/*
+ * PUBLIC: void __db_join_proc __P((long, u_int32_t *, u_int32_t, u_int32_t,
+ * PUBLIC:      __db_join_reply *));
+ */
+void
+__db_join_proc(dbpcl_id, curs, curslen,
+		flags, replyp)
+	long dbpcl_id;
+	u_int32_t * curs;
+	u_int32_t curslen;
+	u_int32_t flags;
+	__db_join_reply *replyp;
+/* END __db_join_proc */
+{
+	DB *dbp;
+	DBC **jcurs, **c;
+	DBC *dbc;
+	ct_entry *dbc_ctp, *ctp, *dbp_ctp;
+	size_t size;
+	u_int32_t *cl, i;
+	int ret;
+
+	ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB);
+	dbp = (DB *)dbp_ctp->ct_anyp;
+
+	dbc_ctp = new_ct_ent(&replyp->status);
+	if (dbc_ctp == NULL)
+		return;
+
+	size = (curslen + 1) * sizeof(DBC *);
+	if ((ret = __os_calloc(dbp->dbenv,
+	    curslen + 1, sizeof(DBC *), &jcurs)) != 0) {
+		replyp->status = ret;
+		__dbclear_ctp(dbc_ctp);
+		return;
+	}
+	/*
+	 * If our curslist has a parent txn, we need to use it too
+	 * for the activity timeout.  All cursors must be part of
+	 * the same transaction, so just check the first.
+	 */
+	ctp = get_tableent(*curs);
+	DB_ASSERT(ctp->ct_type == CT_CURSOR);
+	/*
+	 * If we are using a transaction, set the join activity timer
+	 * to point to the parent transaction.
+	 */
+	if (ctp->ct_activep != &ctp->ct_active)
+		dbc_ctp->ct_activep = ctp->ct_activep;
+	for (i = 0, cl = curs, c = jcurs; i < curslen; i++, cl++, c++) {
+		ctp = get_tableent(*cl);
+		if (ctp == NULL) {
+			replyp->status = DB_NOSERVER_ID;
+			goto out;
+		}
+		/*
+		 * If we are using a txn, the join cursor points to the
+		 * transaction timeout.  If we are not using a transaction,
+		 * then all the curslist cursors must point to the join
+		 * cursor's timeout so that we do not timeout any of the
+		 * curlist cursors while the join cursor is active.
+		 * Change the type of the curslist ctps to CT_JOIN so that
+		 * we know they are part of a join list and we can distinguish
+		 * them and later restore them when the join cursor is closed.
+		 */
+		DB_ASSERT(ctp->ct_type == CT_CURSOR);
+		ctp->ct_type |= CT_JOIN;
+		ctp->ct_origp = ctp->ct_activep;
+		/*
+		 * Setting this to the ct_active field of the dbc_ctp is
+		 * really just a way to distinguish which join dbc this
+		 * cursor is part of.  The ct_activep of this cursor is
+		 * not used at all during its lifetime as part of a join
+		 * cursor.
+		 */
+		ctp->ct_activep = &dbc_ctp->ct_active;
+		*c = ctp->ct_dbc;
+	}
+	*c = NULL;
+	if ((ret = dbp->join(dbp, jcurs, &dbc, flags)) == 0) {
+		dbc_ctp->ct_dbc = dbc;
+		dbc_ctp->ct_type = (CT_JOINCUR | CT_CURSOR);
+		dbc_ctp->ct_parent = dbp_ctp;
+		dbc_ctp->ct_envparent = dbp_ctp->ct_envparent;
+		__dbsrv_settimeout(dbc_ctp, dbp_ctp->ct_envparent->ct_timeout);
+		__dbsrv_active(dbc_ctp);
+		replyp->dbcidcl_id = dbc_ctp->ct_id;
+	} else {
+		__dbclear_ctp(dbc_ctp);
+		/*
+		 * If we get an error, undo what we did above to any cursors.
+		 */
+		for (cl = curs; *cl != 0; cl++) {
+			ctp = get_tableent(*cl);
+			ctp->ct_type = CT_CURSOR;
+			ctp->ct_activep = ctp->ct_origp;
+		}
+	}
+
+	replyp->status = ret;
+out:
+	__os_free(dbp->dbenv, jcurs);
+	return;
+}
+
+/* BEGIN __dbc_close_proc */
+/*
+ * PUBLIC: void __dbc_close_proc __P((long, __dbc_close_reply *));
+ */
+void
+__dbc_close_proc(dbccl_id, replyp)
+	long dbccl_id;
+	__dbc_close_reply *replyp;
+/* END __dbc_close_proc */
+{
+	ct_entry *dbc_ctp;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	replyp->status = __dbc_close_int(dbc_ctp);
+	return;
+}
+
+/* BEGIN __dbc_count_proc */
+/*
+ * PUBLIC: void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));
+ */
+void
+__dbc_count_proc(dbccl_id, flags, replyp)
+	long dbccl_id;
+	u_int32_t flags;
+	__dbc_count_reply *replyp;
+/* END __dbc_count_proc */
+{
+	DBC *dbc;
+	ct_entry *dbc_ctp;
+	db_recno_t num;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+
+	ret = dbc->c_count(dbc, &num, flags);
+	replyp->status = ret;
+	if (ret == 0)
+		replyp->dupcount = num;
+	return;
+}
+
+/* BEGIN __dbc_del_proc */
+/*
+ * PUBLIC: void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));
+ */
+void
+__dbc_del_proc(dbccl_id, flags, replyp)
+	long dbccl_id;
+	u_int32_t flags;
+	__dbc_del_reply *replyp;
+/* END __dbc_del_proc */
+{
+	DBC *dbc;
+	ct_entry *dbc_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+
+	ret = dbc->c_del(dbc, flags);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __dbc_dup_proc */
+/*
+ * PUBLIC: void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));
+ */
+void
+__dbc_dup_proc(dbccl_id, flags, replyp)
+	long dbccl_id;
+	u_int32_t flags;
+	__dbc_dup_reply *replyp;
+/* END __dbc_dup_proc */
+{
+	DBC *dbc, *newdbc;
+	ct_entry *dbc_ctp, *new_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+
+	new_ctp = new_ct_ent(&replyp->status);
+	if (new_ctp == NULL)
+		return;
+
+	if ((ret = dbc->c_dup(dbc, &newdbc, flags)) == 0) {
+		new_ctp->ct_dbc = newdbc;
+		new_ctp->ct_type = CT_CURSOR;
+		new_ctp->ct_parent = dbc_ctp->ct_parent;
+		new_ctp->ct_envparent = dbc_ctp->ct_envparent;
+		/*
+		 * If our cursor has a parent txn, we need to use it too.
+		 */
+		if (dbc_ctp->ct_activep != &dbc_ctp->ct_active)
+			new_ctp->ct_activep = dbc_ctp->ct_activep;
+		__dbsrv_settimeout(new_ctp, dbc_ctp->ct_timeout);
+		__dbsrv_active(new_ctp);
+		replyp->dbcidcl_id = new_ctp->ct_id;
+	} else
+		__dbclear_ctp(new_ctp);
+
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __dbc_get_proc */
+/*
+ * PUBLIC: void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, __dbc_get_reply *, int *));
+ */
+void
+__dbc_get_proc(dbccl_id, keydlen, keydoff,
+		keyulen, keyflags, keydata, keysize,
+		datadlen, datadoff, dataulen, dataflags,
+		datadata, datasize, flags, replyp, freep)
+	long dbccl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__dbc_get_reply *replyp;
+	int * freep;
+/* END __dbc_get_proc */
+{
+	DBC *dbc;
+	DBT key, data;
+	DB_ENV *dbenv;
+	ct_entry *dbc_ctp;
+	int key_alloc, bulk_alloc, ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+	dbenv = dbc->dbp->dbenv;
+
+	*freep = 0;
+	bulk_alloc = 0;
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+
+	/* Set up key and data DBT */
+	key.dlen = keydlen;
+	key.ulen = keyulen;
+	key.doff = keydoff;
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	key.flags = DB_DBT_MALLOC;
+	if (keyflags & DB_DBT_PARTIAL)
+		key.flags |= DB_DBT_PARTIAL;
+	key.size = keysize;
+	key.data = keydata;
+
+	data.dlen = datadlen;
+	data.ulen = dataulen;
+	data.doff = datadoff;
+	data.size = datasize;
+	data.data = datadata;
+	if (flags & DB_MULTIPLE || flags & DB_MULTIPLE_KEY) {
+		if (data.data == 0) {
+			ret = __os_umalloc(dbenv, data.ulen, &data.data);
+			if (ret != 0)
+				goto err;
+			bulk_alloc = 1;
+		}
+		data.flags |= DB_DBT_USERMEM;
+	} else
+		data.flags |= DB_DBT_MALLOC;
+	if (dataflags & DB_DBT_PARTIAL)
+		data.flags |= DB_DBT_PARTIAL;
+
+	/* Got all our stuff, now do the get */
+	ret = dbc->c_get(dbc, &key, &data, flags);
+
+	/*
+	 * Otherwise just status.
+	 */
+	if (ret == 0) {
+		/*
+		 * XXX
+		 * We need to xdr_free whatever we are returning, next time.
+		 * However, DB does not allocate a new key if one was given
+		 * and we'd be free'ing up space allocated in the request.
+		 * So, allocate a new key/data pointer if it is the same one
+		 * as in the request.
+		 */
+		*freep = 1;
+		/*
+		 * Key
+		 */
+		key_alloc = 0;
+		if (key.data == keydata) {
+			ret = __os_umalloc(dbenv, key.size,
+			    &replyp->keydata.keydata_val);
+			if (ret != 0) {
+				__os_ufree(dbenv, key.data);
+				__os_ufree(dbenv, data.data);
+				goto err;
+			}
+			key_alloc = 1;
+			memcpy(replyp->keydata.keydata_val, key.data, key.size);
+		} else
+			replyp->keydata.keydata_val = key.data;
+
+		replyp->keydata.keydata_len = key.size;
+
+		/*
+		 * Data
+		 */
+		if (data.data == datadata) {
+			ret = __os_umalloc(dbenv, data.size,
+			    &replyp->datadata.datadata_val);
+			if (ret != 0) {
+				__os_ufree(dbenv, key.data);
+				__os_ufree(dbenv, data.data);
+				if (key_alloc)
+					__os_ufree(dbenv, replyp->keydata.keydata_val);
+				goto err;
+			}
+			memcpy(replyp->datadata.datadata_val, data.data,
+			    data.size);
+		} else
+			replyp->datadata.datadata_val = data.data;
+		replyp->datadata.datadata_len = data.size;
+	} else {
+err:		replyp->keydata.keydata_val = NULL;
+		replyp->keydata.keydata_len = 0;
+		replyp->datadata.datadata_val = NULL;
+		replyp->datadata.datadata_len = 0;
+		*freep = 0;
+		if (bulk_alloc)
+			__os_ufree(dbenv, data.data);
+	}
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __dbc_pget_proc */
+/*
+ * PUBLIC: void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t,
+ * PUBLIC:      u_int32_t, __dbc_pget_reply *, int *));
+ */
+void
+__dbc_pget_proc(dbccl_id, skeydlen, skeydoff,
+		skeyulen, skeyflags, skeydata, skeysize,
+		pkeydlen, pkeydoff, pkeyulen, pkeyflags,
+		pkeydata, pkeysize, datadlen, datadoff,
+		dataulen, dataflags, datadata, datasize,
+		flags, replyp, freep)
+	long dbccl_id;
+	u_int32_t skeydlen;
+	u_int32_t skeydoff;
+	u_int32_t skeyulen;
+	u_int32_t skeyflags;
+	void *skeydata;
+	u_int32_t skeysize;
+	u_int32_t pkeydlen;
+	u_int32_t pkeydoff;
+	u_int32_t pkeyulen;
+	u_int32_t pkeyflags;
+	void *pkeydata;
+	u_int32_t pkeysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__dbc_pget_reply *replyp;
+	int * freep;
+/* END __dbc_pget_proc */
+{
+	DBC *dbc;
+	DBT skey, pkey, data;
+	DB_ENV *dbenv;
+	ct_entry *dbc_ctp;
+	int key_alloc, ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+	dbenv = dbc->dbp->dbenv;
+
+	*freep = 0;
+	memset(&skey, 0, sizeof(skey));
+	memset(&pkey, 0, sizeof(pkey));
+	memset(&data, 0, sizeof(data));
+
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	/* Set up key and data DBT */
+	skey.flags = DB_DBT_MALLOC;
+	skey.dlen = skeydlen;
+	skey.ulen = skeyulen;
+	skey.doff = skeydoff;
+	if (skeyflags & DB_DBT_PARTIAL)
+		skey.flags |= DB_DBT_PARTIAL;
+	skey.size = skeysize;
+	skey.data = skeydata;
+
+	pkey.flags = DB_DBT_MALLOC;
+	pkey.dlen = pkeydlen;
+	pkey.ulen = pkeyulen;
+	pkey.doff = pkeydoff;
+	if (pkeyflags & DB_DBT_PARTIAL)
+		pkey.flags |= DB_DBT_PARTIAL;
+	pkey.size = pkeysize;
+	pkey.data = pkeydata;
+
+	data.flags = DB_DBT_MALLOC;
+	data.dlen = datadlen;
+	data.ulen = dataulen;
+	data.doff = datadoff;
+	if (dataflags & DB_DBT_PARTIAL)
+		data.flags |= DB_DBT_PARTIAL;
+	data.size = datasize;
+	data.data = datadata;
+
+	/* Got all our stuff, now do the get */
+	ret = dbc->c_pget(dbc, &skey, &pkey, &data, flags);
+	/*
+	 * Otherwise just status.
+	 */
+	if (ret == 0) {
+		/*
+		 * XXX
+		 * We need to xdr_free whatever we are returning, next time.
+		 * However, DB does not allocate a new key if one was given
+		 * and we'd be free'ing up space allocated in the request.
+		 * So, allocate a new key/data pointer if it is the same one
+		 * as in the request.
+		 */
+		*freep = 1;
+		/*
+		 * Key
+		 */
+		key_alloc = 0;
+		if (skey.data == skeydata) {
+			ret = __os_umalloc(dbenv,
+			    skey.size, &replyp->skeydata.skeydata_val);
+			if (ret != 0) {
+				__os_ufree(dbenv, skey.data);
+				__os_ufree(dbenv, pkey.data);
+				__os_ufree(dbenv, data.data);
+				goto err;
+			}
+			key_alloc = 1;
+			memcpy(replyp->skeydata.skeydata_val, skey.data,
+			    skey.size);
+		} else
+			replyp->skeydata.skeydata_val = skey.data;
+		replyp->skeydata.skeydata_len = skey.size;
+
+		/*
+		 * Primary key
+		 */
+		if (pkey.data == pkeydata) {
+			ret = __os_umalloc(dbenv,
+			     pkey.size, &replyp->pkeydata.pkeydata_val);
+			if (ret != 0) {
+				__os_ufree(dbenv, skey.data);
+				__os_ufree(dbenv, pkey.data);
+				__os_ufree(dbenv, data.data);
+				if (key_alloc)
+					__os_ufree(dbenv,
+					    replyp->skeydata.skeydata_val);
+				goto err;
+			}
+			/*
+			 * We can set it to 2, because they cannot send the
+			 * pkey over without sending the skey over too.
+			 * So if they did send a pkey, they must have sent
+			 * the skey as well.
+			 */
+			key_alloc = 2;
+			memcpy(replyp->pkeydata.pkeydata_val, pkey.data,
+			    pkey.size);
+		} else
+			replyp->pkeydata.pkeydata_val = pkey.data;
+		replyp->pkeydata.pkeydata_len = pkey.size;
+
+		/*
+		 * Data
+		 */
+		if (data.data == datadata) {
+			ret = __os_umalloc(dbenv,
+			     data.size, &replyp->datadata.datadata_val);
+			if (ret != 0) {
+				__os_ufree(dbenv, skey.data);
+				__os_ufree(dbenv, pkey.data);
+				__os_ufree(dbenv, data.data);
+				/*
+				 * If key_alloc is 1, just skey needs to be
+				 * freed, if key_alloc is 2, both skey and pkey
+				 * need to be freed.
+				 */
+				if (key_alloc--)
+					__os_ufree(dbenv,
+					    replyp->skeydata.skeydata_val);
+				if (key_alloc)
+					__os_ufree(dbenv,
+					    replyp->pkeydata.pkeydata_val);
+				goto err;
+			}
+			memcpy(replyp->datadata.datadata_val, data.data,
+			    data.size);
+		} else
+			replyp->datadata.datadata_val = data.data;
+		replyp->datadata.datadata_len = data.size;
+	} else {
+err:		replyp->skeydata.skeydata_val = NULL;
+		replyp->skeydata.skeydata_len = 0;
+		replyp->pkeydata.pkeydata_val = NULL;
+		replyp->pkeydata.pkeydata_len = 0;
+		replyp->datadata.datadata_val = NULL;
+		replyp->datadata.datadata_len = 0;
+		*freep = 0;
+	}
+	replyp->status = ret;
+	return;
+}
+
+/* BEGIN __dbc_put_proc */
+/*
+ * PUBLIC: void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t,
+ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,
+ * PUBLIC:      u_int32_t, u_int32_t, __dbc_put_reply *, int *));
+ */
+void
+__dbc_put_proc(dbccl_id, keydlen, keydoff,
+		keyulen, keyflags, keydata, keysize,
+		datadlen, datadoff, dataulen, dataflags,
+		datadata, datasize, flags, replyp, freep)
+	long dbccl_id;
+	u_int32_t keydlen;
+	u_int32_t keydoff;
+	u_int32_t keyulen;
+	u_int32_t keyflags;
+	void *keydata;
+	u_int32_t keysize;
+	u_int32_t datadlen;
+	u_int32_t datadoff;
+	u_int32_t dataulen;
+	u_int32_t dataflags;
+	void *datadata;
+	u_int32_t datasize;
+	u_int32_t flags;
+	__dbc_put_reply *replyp;
+	int * freep;
+/* END __dbc_put_proc */
+{
+	DB *dbp;
+	DBC *dbc;
+	DBT key, data;
+	ct_entry *dbc_ctp;
+	int ret;
+
+	ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR);
+	dbc = (DBC *)dbc_ctp->ct_anyp;
+	dbp = (DB *)dbc_ctp->ct_parent->ct_anyp;
+
+	memset(&key, 0, sizeof(key));
+	memset(&data, 0, sizeof(data));
+
+	/* Set up key and data DBT */
+	key.dlen = keydlen;
+	key.ulen = keyulen;
+	key.doff = keydoff;
+	/*
+	 * Ignore memory related flags on server.
+	 */
+	key.flags = 0;
+	if (keyflags & DB_DBT_PARTIAL)
+		key.flags |= DB_DBT_PARTIAL;
+	key.size = keysize;
+	key.data = keydata;
+
+	data.dlen = datadlen;
+	data.ulen = dataulen;
+	data.doff = datadoff;
+	data.flags = dataflags;
+	data.size = datasize;
+	data.data = datadata;
+
+	/* Got all our stuff, now do the put */
+	ret = dbc->c_put(dbc, &key, &data, flags);
+
+	*freep = 0;
+	if (ret == 0 && (flags == DB_AFTER || flags == DB_BEFORE) &&
+	    dbp->type == DB_RECNO) {
+		/*
+		 * We need to xdr_free whatever we are returning, next time.
+		 */
+		replyp->keydata.keydata_val = key.data;
+		replyp->keydata.keydata_len = key.size;
+	} else {
+		replyp->keydata.keydata_val = NULL;
+		replyp->keydata.keydata_len = 0;
+	}
+	replyp->status = ret;
+	return;
+}
+#endif /* HAVE_RPC */
diff --git a/bdb/rpc_server/c/db_server_proc.sed b/bdb/rpc_server/c/db_server_proc.sed
deleted file mode 100644
index e11b2c33cfe..00000000000
--- a/bdb/rpc_server/c/db_server_proc.sed
+++ /dev/null
@@ -1,772 +0,0 @@
-/^\/\* BEGIN __env_cachesize_proc/,/^\/\* END __env_cachesize_proc/c\
-/* BEGIN __env_cachesize_proc */\
-/*\
-\ * PUBLIC: void __env_cachesize_proc __P((long, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, __env_cachesize_reply *));\
-\ */\
-void\
-__env_cachesize_proc(dbenvcl_id, gbytes, bytes,\
-\	\	ncache, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t gbytes;\
-\	u_int32_t bytes;\
-\	u_int32_t ncache;\
-\	__env_cachesize_reply *replyp;\
-/* END __env_cachesize_proc */
-/^\/\* BEGIN __env_close_proc/,/^\/\* END __env_close_proc/c\
-/* BEGIN __env_close_proc */\
-/*\
-\ * PUBLIC: void __env_close_proc __P((long, u_int32_t, __env_close_reply *));\
-\ */\
-void\
-__env_close_proc(dbenvcl_id, flags, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t flags;\
-\	__env_close_reply *replyp;\
-/* END __env_close_proc */
-/^\/\* BEGIN __env_create_proc/,/^\/\* END __env_create_proc/c\
-/* BEGIN __env_create_proc */\
-/*\
-\ * PUBLIC: void __env_create_proc __P((u_int32_t, __env_create_reply *));\
-\ */\
-void\
-__env_create_proc(timeout, replyp)\
-\	u_int32_t timeout;\
-\	__env_create_reply *replyp;\
-/* END __env_create_proc */
-/^\/\* BEGIN __env_dbremove_proc/,/^\/\* END __env_dbremove_proc/c\
-/* BEGIN __env_dbremove_proc */\
-/*\
-\ * PUBLIC: void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t,\
-\ * PUBLIC:      __env_dbremove_reply *));\
-\ */\
-void\
-__env_dbremove_proc(dbenvcl_id, txnpcl_id, name,\
-\	\	subdb, flags, replyp)\
-\	long dbenvcl_id;\
-\	long txnpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	u_int32_t flags;\
-\	__env_dbremove_reply *replyp;\
-/* END __env_dbremove_proc */
-/^\/\* BEGIN __env_dbrename_proc/,/^\/\* END __env_dbrename_proc/c\
-/* BEGIN __env_dbrename_proc */\
-/*\
-\ * PUBLIC: void __env_dbrename_proc __P((long, long, char *, char *, char *,\
-\ * PUBLIC:      u_int32_t, __env_dbrename_reply *));\
-\ */\
-void\
-__env_dbrename_proc(dbenvcl_id, txnpcl_id, name,\
-\	\	subdb, newname, flags, replyp)\
-\	long dbenvcl_id;\
-\	long txnpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	char *newname;\
-\	u_int32_t flags;\
-\	__env_dbrename_reply *replyp;\
-/* END __env_dbrename_proc */
-/^\/\* BEGIN __env_encrypt_proc/,/^\/\* END __env_encrypt_proc/c\
-/* BEGIN __env_encrypt_proc */\
-/*\
-\ * PUBLIC: void __env_encrypt_proc __P((long, char *, u_int32_t,\
-\ * PUBLIC:      __env_encrypt_reply *));\
-\ */\
-void\
-__env_encrypt_proc(dbenvcl_id, passwd, flags, replyp)\
-\	long dbenvcl_id;\
-\	char *passwd;\
-\	u_int32_t flags;\
-\	__env_encrypt_reply *replyp;\
-/* END __env_encrypt_proc */
-/^\/\* BEGIN __env_flags_proc/,/^\/\* END __env_flags_proc/c\
-/* BEGIN __env_flags_proc */\
-/*\
-\ * PUBLIC: void __env_flags_proc __P((long, u_int32_t, u_int32_t,\
-\ * PUBLIC:      __env_flags_reply *));\
-\ */\
-void\
-__env_flags_proc(dbenvcl_id, flags, onoff, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t flags;\
-\	u_int32_t onoff;\
-\	__env_flags_reply *replyp;\
-/* END __env_flags_proc */
-/^\/\* BEGIN __env_open_proc/,/^\/\* END __env_open_proc/c\
-/* BEGIN __env_open_proc */\
-/*\
-\ * PUBLIC: void __env_open_proc __P((long, char *, u_int32_t, u_int32_t,\
-\ * PUBLIC:      __env_open_reply *));\
-\ */\
-void\
-__env_open_proc(dbenvcl_id, home, flags,\
-\	\	mode, replyp)\
-\	long dbenvcl_id;\
-\	char *home;\
-\	u_int32_t flags;\
-\	u_int32_t mode;\
-\	__env_open_reply *replyp;\
-/* END __env_open_proc */
-/^\/\* BEGIN __env_remove_proc/,/^\/\* END __env_remove_proc/c\
-/* BEGIN __env_remove_proc */\
-/*\
-\ * PUBLIC: void __env_remove_proc __P((long, char *, u_int32_t,\
-\ * PUBLIC:      __env_remove_reply *));\
-\ */\
-void\
-__env_remove_proc(dbenvcl_id, home, flags, replyp)\
-\	long dbenvcl_id;\
-\	char *home;\
-\	u_int32_t flags;\
-\	__env_remove_reply *replyp;\
-/* END __env_remove_proc */
-/^\/\* BEGIN __txn_abort_proc/,/^\/\* END __txn_abort_proc/c\
-/* BEGIN __txn_abort_proc */\
-/*\
-\ * PUBLIC: void __txn_abort_proc __P((long, __txn_abort_reply *));\
-\ */\
-void\
-__txn_abort_proc(txnpcl_id, replyp)\
-\	long txnpcl_id;\
-\	__txn_abort_reply *replyp;\
-/* END __txn_abort_proc */
-/^\/\* BEGIN __txn_begin_proc/,/^\/\* END __txn_begin_proc/c\
-/* BEGIN __txn_begin_proc */\
-/*\
-\ * PUBLIC: void __txn_begin_proc __P((long, long, u_int32_t,\
-\ * PUBLIC:      __txn_begin_reply *));\
-\ */\
-void\
-__txn_begin_proc(dbenvcl_id, parentcl_id,\
-\	\	flags, replyp)\
-\	long dbenvcl_id;\
-\	long parentcl_id;\
-\	u_int32_t flags;\
-\	__txn_begin_reply *replyp;\
-/* END __txn_begin_proc */
-/^\/\* BEGIN __txn_commit_proc/,/^\/\* END __txn_commit_proc/c\
-/* BEGIN __txn_commit_proc */\
-/*\
-\ * PUBLIC: void __txn_commit_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __txn_commit_reply *));\
-\ */\
-void\
-__txn_commit_proc(txnpcl_id, flags, replyp)\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__txn_commit_reply *replyp;\
-/* END __txn_commit_proc */
-/^\/\* BEGIN __txn_discard_proc/,/^\/\* END __txn_discard_proc/c\
-/* BEGIN __txn_discard_proc */\
-/*\
-\ * PUBLIC: void __txn_discard_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __txn_discard_reply *));\
-\ */\
-void\
-__txn_discard_proc(txnpcl_id, flags, replyp)\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__txn_discard_reply *replyp;\
-/* END __txn_discard_proc */
-/^\/\* BEGIN __txn_prepare_proc/,/^\/\* END __txn_prepare_proc/c\
-/* BEGIN __txn_prepare_proc */\
-/*\
-\ * PUBLIC: void __txn_prepare_proc __P((long, u_int8_t *,\
-\ * PUBLIC:      __txn_prepare_reply *));\
-\ */\
-void\
-__txn_prepare_proc(txnpcl_id, gid, replyp)\
-\	long txnpcl_id;\
-\	u_int8_t *gid;\
-\	__txn_prepare_reply *replyp;\
-/* END __txn_prepare_proc */
-/^\/\* BEGIN __txn_recover_proc/,/^\/\* END __txn_recover_proc/c\
-/* BEGIN __txn_recover_proc */\
-/*\
-\ * PUBLIC: void __txn_recover_proc __P((long, u_int32_t, u_int32_t,\
-\ * PUBLIC:      __txn_recover_reply *, int *));\
-\ */\
-void\
-__txn_recover_proc(dbenvcl_id, count,\
-\	\	flags, replyp, freep)\
-\	long dbenvcl_id;\
-\	u_int32_t count;\
-\	u_int32_t flags;\
-\	__txn_recover_reply *replyp;\
-\	int * freep;\
-/* END __txn_recover_proc */
-/^\/\* BEGIN __db_associate_proc/,/^\/\* END __db_associate_proc/c\
-/* BEGIN __db_associate_proc */\
-/*\
-\ * PUBLIC: void __db_associate_proc __P((long, long, long, u_int32_t,\
-\ * PUBLIC:      __db_associate_reply *));\
-\ */\
-void\
-__db_associate_proc(dbpcl_id, txnpcl_id, sdbpcl_id,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	long sdbpcl_id;\
-\	u_int32_t flags;\
-\	__db_associate_reply *replyp;\
-/* END __db_associate_proc */
-/^\/\* BEGIN __db_bt_maxkey_proc/,/^\/\* END __db_bt_maxkey_proc/c\
-/* BEGIN __db_bt_maxkey_proc */\
-/*\
-\ * PUBLIC: void __db_bt_maxkey_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_bt_maxkey_reply *));\
-\ */\
-void\
-__db_bt_maxkey_proc(dbpcl_id, maxkey, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t maxkey;\
-\	__db_bt_maxkey_reply *replyp;\
-/* END __db_bt_maxkey_proc */
-/^\/\* BEGIN __db_bt_minkey_proc/,/^\/\* END __db_bt_minkey_proc/c\
-/* BEGIN __db_bt_minkey_proc */\
-/*\
-\ * PUBLIC: void __db_bt_minkey_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_bt_minkey_reply *));\
-\ */\
-void\
-__db_bt_minkey_proc(dbpcl_id, minkey, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t minkey;\
-\	__db_bt_minkey_reply *replyp;\
-/* END __db_bt_minkey_proc */
-/^\/\* BEGIN __db_close_proc/,/^\/\* END __db_close_proc/c\
-/* BEGIN __db_close_proc */\
-/*\
-\ * PUBLIC: void __db_close_proc __P((long, u_int32_t, __db_close_reply *));\
-\ */\
-void\
-__db_close_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_close_reply *replyp;\
-/* END __db_close_proc */
-/^\/\* BEGIN __db_create_proc/,/^\/\* END __db_create_proc/c\
-/* BEGIN __db_create_proc */\
-/*\
-\ * PUBLIC: void __db_create_proc __P((long, u_int32_t, __db_create_reply *));\
-\ */\
-void\
-__db_create_proc(dbenvcl_id, flags, replyp)\
-\	long dbenvcl_id;\
-\	u_int32_t flags;\
-\	__db_create_reply *replyp;\
-/* END __db_create_proc */
-/^\/\* BEGIN __db_del_proc/,/^\/\* END __db_del_proc/c\
-/* BEGIN __db_del_proc */\
-/*\
-\ * PUBLIC: void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));\
-\ */\
-void\
-__db_del_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyulen, keyflags, keydata,\
-\	\	keysize, flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t flags;\
-\	__db_del_reply *replyp;\
-/* END __db_del_proc */
-/^\/\* BEGIN __db_encrypt_proc/,/^\/\* END __db_encrypt_proc/c\
-/* BEGIN __db_encrypt_proc */\
-/*\
-\ * PUBLIC: void __db_encrypt_proc __P((long, char *, u_int32_t,\
-\ * PUBLIC:      __db_encrypt_reply *));\
-\ */\
-void\
-__db_encrypt_proc(dbpcl_id, passwd, flags, replyp)\
-\	long dbpcl_id;\
-\	char *passwd;\
-\	u_int32_t flags;\
-\	__db_encrypt_reply *replyp;\
-/* END __db_encrypt_proc */
-/^\/\* BEGIN __db_extentsize_proc/,/^\/\* END __db_extentsize_proc/c\
-/* BEGIN __db_extentsize_proc */\
-/*\
-\ * PUBLIC: void __db_extentsize_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_extentsize_reply *));\
-\ */\
-void\
-__db_extentsize_proc(dbpcl_id, extentsize, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t extentsize;\
-\	__db_extentsize_reply *replyp;\
-/* END __db_extentsize_proc */
-/^\/\* BEGIN __db_flags_proc/,/^\/\* END __db_flags_proc/c\
-/* BEGIN __db_flags_proc */\
-/*\
-\ * PUBLIC: void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));\
-\ */\
-void\
-__db_flags_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_flags_reply *replyp;\
-/* END __db_flags_proc */
-/^\/\* BEGIN __db_get_proc/,/^\/\* END __db_get_proc/c\
-/* BEGIN __db_get_proc */\
-/*\
-\ * PUBLIC: void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __db_get_reply *, int *));\
-\ */\
-void\
-__db_get_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyulen, keyflags, keydata,\
-\	\	keysize, datadlen, datadoff, dataulen,\
-\	\	dataflags, datadata, datasize, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__db_get_reply *replyp;\
-\	int * freep;\
-/* END __db_get_proc */
-/^\/\* BEGIN __db_h_ffactor_proc/,/^\/\* END __db_h_ffactor_proc/c\
-/* BEGIN __db_h_ffactor_proc */\
-/*\
-\ * PUBLIC: void __db_h_ffactor_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_h_ffactor_reply *));\
-\ */\
-void\
-__db_h_ffactor_proc(dbpcl_id, ffactor, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t ffactor;\
-\	__db_h_ffactor_reply *replyp;\
-/* END __db_h_ffactor_proc */
-/^\/\* BEGIN __db_h_nelem_proc/,/^\/\* END __db_h_nelem_proc/c\
-/* BEGIN __db_h_nelem_proc */\
-/*\
-\ * PUBLIC: void __db_h_nelem_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_h_nelem_reply *));\
-\ */\
-void\
-__db_h_nelem_proc(dbpcl_id, nelem, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t nelem;\
-\	__db_h_nelem_reply *replyp;\
-/* END __db_h_nelem_proc */
-/^\/\* BEGIN __db_key_range_proc/,/^\/\* END __db_key_range_proc/c\
-/* BEGIN __db_key_range_proc */\
-/*\
-\ * PUBLIC: void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));\
-\ */\
-void\
-__db_key_range_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyulen, keyflags, keydata,\
-\	\	keysize, flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t flags;\
-\	__db_key_range_reply *replyp;\
-/* END __db_key_range_proc */
-/^\/\* BEGIN __db_lorder_proc/,/^\/\* END __db_lorder_proc/c\
-/* BEGIN __db_lorder_proc */\
-/*\
-\ * PUBLIC: void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));\
-\ */\
-void\
-__db_lorder_proc(dbpcl_id, lorder, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t lorder;\
-\	__db_lorder_reply *replyp;\
-/* END __db_lorder_proc */
-/^\/\* BEGIN __db_open_proc/,/^\/\* END __db_open_proc/c\
-/* BEGIN __db_open_proc */\
-/*\
-\ * PUBLIC: void __db_open_proc __P((long, long, char *, char *, u_int32_t,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __db_open_reply *));\
-\ */\
-void\
-__db_open_proc(dbpcl_id, txnpcl_id, name,\
-\	\	subdb, type, flags, mode, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	u_int32_t type;\
-\	u_int32_t flags;\
-\	u_int32_t mode;\
-\	__db_open_reply *replyp;\
-/* END __db_open_proc */
-/^\/\* BEGIN __db_pagesize_proc/,/^\/\* END __db_pagesize_proc/c\
-/* BEGIN __db_pagesize_proc */\
-/*\
-\ * PUBLIC: void __db_pagesize_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_pagesize_reply *));\
-\ */\
-void\
-__db_pagesize_proc(dbpcl_id, pagesize, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t pagesize;\
-\	__db_pagesize_reply *replyp;\
-/* END __db_pagesize_proc */
-/^\/\* BEGIN __db_pget_proc/,/^\/\* END __db_pget_proc/c\
-/* BEGIN __db_pget_proc */\
-/*\
-\ * PUBLIC: void __db_pget_proc __P((long, long, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __db_pget_reply *, int *));\
-\ */\
-void\
-__db_pget_proc(dbpcl_id, txnpcl_id, skeydlen,\
-\	\	skeydoff, skeyulen, skeyflags, skeydata,\
-\	\	skeysize, pkeydlen, pkeydoff, pkeyulen,\
-\	\	pkeyflags, pkeydata, pkeysize, datadlen,\
-\	\	datadoff, dataulen, dataflags, datadata,\
-\	\	datasize, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t skeydlen;\
-\	u_int32_t skeydoff;\
-\	u_int32_t skeyulen;\
-\	u_int32_t skeyflags;\
-\	void *skeydata;\
-\	u_int32_t skeysize;\
-\	u_int32_t pkeydlen;\
-\	u_int32_t pkeydoff;\
-\	u_int32_t pkeyulen;\
-\	u_int32_t pkeyflags;\
-\	void *pkeydata;\
-\	u_int32_t pkeysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__db_pget_reply *replyp;\
-\	int * freep;\
-/* END __db_pget_proc */
-/^\/\* BEGIN __db_put_proc/,/^\/\* END __db_put_proc/c\
-/* BEGIN __db_put_proc */\
-/*\
-\ * PUBLIC: void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __db_put_reply *, int *));\
-\ */\
-void\
-__db_put_proc(dbpcl_id, txnpcl_id, keydlen,\
-\	\	keydoff, keyulen, keyflags, keydata,\
-\	\	keysize, datadlen, datadoff, dataulen,\
-\	\	dataflags, datadata, datasize, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__db_put_reply *replyp;\
-\	int * freep;\
-/* END __db_put_proc */
-/^\/\* BEGIN __db_re_delim_proc/,/^\/\* END __db_re_delim_proc/c\
-/* BEGIN __db_re_delim_proc */\
-/*\
-\ * PUBLIC: void __db_re_delim_proc __P((long, u_int32_t,\
-\ * PUBLIC:      __db_re_delim_reply *));\
-\ */\
-void\
-__db_re_delim_proc(dbpcl_id, delim, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t delim;\
-\	__db_re_delim_reply *replyp;\
-/* END __db_re_delim_proc */
-/^\/\* BEGIN __db_re_len_proc/,/^\/\* END __db_re_len_proc/c\
-/* BEGIN __db_re_len_proc */\
-/*\
-\ * PUBLIC: void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));\
-\ */\
-void\
-__db_re_len_proc(dbpcl_id, len, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t len;\
-\	__db_re_len_reply *replyp;\
-/* END __db_re_len_proc */
-/^\/\* BEGIN __db_re_pad_proc/,/^\/\* END __db_re_pad_proc/c\
-/* BEGIN __db_re_pad_proc */\
-/*\
-\ * PUBLIC: void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));\
-\ */\
-void\
-__db_re_pad_proc(dbpcl_id, pad, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t pad;\
-\	__db_re_pad_reply *replyp;\
-/* END __db_re_pad_proc */
-/^\/\* BEGIN __db_remove_proc/,/^\/\* END __db_remove_proc/c\
-/* BEGIN __db_remove_proc */\
-/*\
-\ * PUBLIC: void __db_remove_proc __P((long, char *, char *, u_int32_t,\
-\ * PUBLIC:      __db_remove_reply *));\
-\ */\
-void\
-__db_remove_proc(dbpcl_id, name, subdb,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	u_int32_t flags;\
-\	__db_remove_reply *replyp;\
-/* END __db_remove_proc */
-/^\/\* BEGIN __db_rename_proc/,/^\/\* END __db_rename_proc/c\
-/* BEGIN __db_rename_proc */\
-/*\
-\ * PUBLIC: void __db_rename_proc __P((long, char *, char *, char *, u_int32_t,\
-\ * PUBLIC:      __db_rename_reply *));\
-\ */\
-void\
-__db_rename_proc(dbpcl_id, name, subdb,\
-\	\	newname, flags, replyp)\
-\	long dbpcl_id;\
-\	char *name;\
-\	char *subdb;\
-\	char *newname;\
-\	u_int32_t flags;\
-\	__db_rename_reply *replyp;\
-/* END __db_rename_proc */
-/^\/\* BEGIN __db_stat_proc/,/^\/\* END __db_stat_proc/c\
-/* BEGIN __db_stat_proc */\
-/*\
-\ * PUBLIC: void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *,\
-\ * PUBLIC:      int *));\
-\ */\
-void\
-__db_stat_proc(dbpcl_id, flags, replyp, freep)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_stat_reply *replyp;\
-\	int * freep;\
-/* END __db_stat_proc */
-/^\/\* BEGIN __db_sync_proc/,/^\/\* END __db_sync_proc/c\
-/* BEGIN __db_sync_proc */\
-/*\
-\ * PUBLIC: void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));\
-\ */\
-void\
-__db_sync_proc(dbpcl_id, flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t flags;\
-\	__db_sync_reply *replyp;\
-/* END __db_sync_proc */
-/^\/\* BEGIN __db_truncate_proc/,/^\/\* END __db_truncate_proc/c\
-/* BEGIN __db_truncate_proc */\
-/*\
-\ * PUBLIC: void __db_truncate_proc __P((long, long, u_int32_t,\
-\ * PUBLIC:      __db_truncate_reply *));\
-\ */\
-void\
-__db_truncate_proc(dbpcl_id, txnpcl_id,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__db_truncate_reply *replyp;\
-/* END __db_truncate_proc */
-/^\/\* BEGIN __db_cursor_proc/,/^\/\* END __db_cursor_proc/c\
-/* BEGIN __db_cursor_proc */\
-/*\
-\ * PUBLIC: void __db_cursor_proc __P((long, long, u_int32_t,\
-\ * PUBLIC:      __db_cursor_reply *));\
-\ */\
-void\
-__db_cursor_proc(dbpcl_id, txnpcl_id,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	long txnpcl_id;\
-\	u_int32_t flags;\
-\	__db_cursor_reply *replyp;\
-/* END __db_cursor_proc */
-/^\/\* BEGIN __db_join_proc/,/^\/\* END __db_join_proc/c\
-/* BEGIN __db_join_proc */\
-/*\
-\ * PUBLIC: void __db_join_proc __P((long, u_int32_t *, u_int32_t, u_int32_t,\
-\ * PUBLIC:      __db_join_reply *));\
-\ */\
-void\
-__db_join_proc(dbpcl_id, curs, curslen,\
-\	\	flags, replyp)\
-\	long dbpcl_id;\
-\	u_int32_t * curs;\
-\	u_int32_t curslen;\
-\	u_int32_t flags;\
-\	__db_join_reply *replyp;\
-/* END __db_join_proc */
-/^\/\* BEGIN __dbc_close_proc/,/^\/\* END __dbc_close_proc/c\
-/* BEGIN __dbc_close_proc */\
-/*\
-\ * PUBLIC: void __dbc_close_proc __P((long, __dbc_close_reply *));\
-\ */\
-void\
-__dbc_close_proc(dbccl_id, replyp)\
-\	long dbccl_id;\
-\	__dbc_close_reply *replyp;\
-/* END __dbc_close_proc */
-/^\/\* BEGIN __dbc_count_proc/,/^\/\* END __dbc_count_proc/c\
-/* BEGIN __dbc_count_proc */\
-/*\
-\ * PUBLIC: void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));\
-\ */\
-void\
-__dbc_count_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_count_reply *replyp;\
-/* END __dbc_count_proc */
-/^\/\* BEGIN __dbc_del_proc/,/^\/\* END __dbc_del_proc/c\
-/* BEGIN __dbc_del_proc */\
-/*\
-\ * PUBLIC: void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));\
-\ */\
-void\
-__dbc_del_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_del_reply *replyp;\
-/* END __dbc_del_proc */
-/^\/\* BEGIN __dbc_dup_proc/,/^\/\* END __dbc_dup_proc/c\
-/* BEGIN __dbc_dup_proc */\
-/*\
-\ * PUBLIC: void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));\
-\ */\
-void\
-__dbc_dup_proc(dbccl_id, flags, replyp)\
-\	long dbccl_id;\
-\	u_int32_t flags;\
-\	__dbc_dup_reply *replyp;\
-/* END __dbc_dup_proc */
-/^\/\* BEGIN __dbc_get_proc/,/^\/\* END __dbc_get_proc/c\
-/* BEGIN __dbc_get_proc */\
-/*\
-\ * PUBLIC: void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __dbc_get_reply *, int *));\
-\ */\
-void\
-__dbc_get_proc(dbccl_id, keydlen, keydoff,\
-\	\	keyulen, keyflags, keydata, keysize,\
-\	\	datadlen, datadoff, dataulen, dataflags,\
-\	\	datadata, datasize, flags, replyp, freep)\
-\	long dbccl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__dbc_get_reply *replyp;\
-\	int * freep;\
-/* END __dbc_get_proc */
-/^\/\* BEGIN __dbc_pget_proc/,/^\/\* END __dbc_pget_proc/c\
-/* BEGIN __dbc_pget_proc */\
-/*\
-\ * PUBLIC: void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t,\
-\ * PUBLIC:      u_int32_t, __dbc_pget_reply *, int *));\
-\ */\
-void\
-__dbc_pget_proc(dbccl_id, skeydlen, skeydoff,\
-\	\	skeyulen, skeyflags, skeydata, skeysize,\
-\	\	pkeydlen, pkeydoff, pkeyulen, pkeyflags,\
-\	\	pkeydata, pkeysize, datadlen, datadoff,\
-\	\	dataulen, dataflags, datadata, datasize,\
-\	\	flags, replyp, freep)\
-\	long dbccl_id;\
-\	u_int32_t skeydlen;\
-\	u_int32_t skeydoff;\
-\	u_int32_t skeyulen;\
-\	u_int32_t skeyflags;\
-\	void *skeydata;\
-\	u_int32_t skeysize;\
-\	u_int32_t pkeydlen;\
-\	u_int32_t pkeydoff;\
-\	u_int32_t pkeyulen;\
-\	u_int32_t pkeyflags;\
-\	void *pkeydata;\
-\	u_int32_t pkeysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__dbc_pget_reply *replyp;\
-\	int * freep;\
-/* END __dbc_pget_proc */
-/^\/\* BEGIN __dbc_put_proc/,/^\/\* END __dbc_put_proc/c\
-/* BEGIN __dbc_put_proc */\
-/*\
-\ * PUBLIC: void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t,\
-\ * PUBLIC:      u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *,\
-\ * PUBLIC:      u_int32_t, u_int32_t, __dbc_put_reply *, int *));\
-\ */\
-void\
-__dbc_put_proc(dbccl_id, keydlen, keydoff,\
-\	\	keyulen, keyflags, keydata, keysize,\
-\	\	datadlen, datadoff, dataulen, dataflags,\
-\	\	datadata, datasize, flags, replyp, freep)\
-\	long dbccl_id;\
-\	u_int32_t keydlen;\
-\	u_int32_t keydoff;\
-\	u_int32_t keyulen;\
-\	u_int32_t keyflags;\
-\	void *keydata;\
-\	u_int32_t keysize;\
-\	u_int32_t datadlen;\
-\	u_int32_t datadoff;\
-\	u_int32_t dataulen;\
-\	u_int32_t dataflags;\
-\	void *datadata;\
-\	u_int32_t datasize;\
-\	u_int32_t flags;\
-\	__dbc_put_reply *replyp;\
-\	int * freep;\
-/* END __dbc_put_proc */
diff --git a/bdb/rpc_server/c/db_server_svc.c b/bdb/rpc_server/c/db_server_svc.c
deleted file mode 100644
index 96dd959ec8c..00000000000
--- a/bdb/rpc_server/c/db_server_svc.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <stdio.h>
-#include <stdlib.h> /* getenv, exit */
-#include <memory.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc_auto/db_server.h"
-#include "dbinc/db_server_int.h"
-#include "dbinc_auto/rpc_server_ext.h"
-
-#ifdef DEBUG
-#define	RPC_SVC_FG
-#endif
-
-static void
-db_rpc_serverprog_4001(rqstp, transp)
-	struct svc_req *rqstp;
-	register SVCXPRT *transp;
-{
-	union {
-		__env_cachesize_msg __db_env_cachesize_4001_arg;
-		__env_close_msg __db_env_close_4001_arg;
-		__env_create_msg __db_env_create_4001_arg;
-		__env_dbremove_msg __db_env_dbremove_4001_arg;
-		__env_dbrename_msg __db_env_dbrename_4001_arg;
-		__env_encrypt_msg __db_env_encrypt_4001_arg;
-		__env_flags_msg __db_env_flags_4001_arg;
-		__env_open_msg __db_env_open_4001_arg;
-		__env_remove_msg __db_env_remove_4001_arg;
-		__txn_abort_msg __db_txn_abort_4001_arg;
-		__txn_begin_msg __db_txn_begin_4001_arg;
-		__txn_commit_msg __db_txn_commit_4001_arg;
-		__txn_discard_msg __db_txn_discard_4001_arg;
-		__txn_prepare_msg __db_txn_prepare_4001_arg;
-		__txn_recover_msg __db_txn_recover_4001_arg;
-		__db_associate_msg __db_db_associate_4001_arg;
-		__db_bt_maxkey_msg __db_db_bt_maxkey_4001_arg;
-		__db_bt_minkey_msg __db_db_bt_minkey_4001_arg;
-		__db_close_msg __db_db_close_4001_arg;
-		__db_create_msg __db_db_create_4001_arg;
-		__db_del_msg __db_db_del_4001_arg;
-		__db_encrypt_msg __db_db_encrypt_4001_arg;
-		__db_extentsize_msg __db_db_extentsize_4001_arg;
-		__db_flags_msg __db_db_flags_4001_arg;
-		__db_get_msg __db_db_get_4001_arg;
-		__db_h_ffactor_msg __db_db_h_ffactor_4001_arg;
-		__db_h_nelem_msg __db_db_h_nelem_4001_arg;
-		__db_key_range_msg __db_db_key_range_4001_arg;
-		__db_lorder_msg __db_db_lorder_4001_arg;
-		__db_open_msg __db_db_open_4001_arg;
-		__db_pagesize_msg __db_db_pagesize_4001_arg;
-		__db_pget_msg __db_db_pget_4001_arg;
-		__db_put_msg __db_db_put_4001_arg;
-		__db_re_delim_msg __db_db_re_delim_4001_arg;
-		__db_re_len_msg __db_db_re_len_4001_arg;
-		__db_re_pad_msg __db_db_re_pad_4001_arg;
-		__db_remove_msg __db_db_remove_4001_arg;
-		__db_rename_msg __db_db_rename_4001_arg;
-		__db_stat_msg __db_db_stat_4001_arg;
-		__db_sync_msg __db_db_sync_4001_arg;
-		__db_truncate_msg __db_db_truncate_4001_arg;
-		__db_cursor_msg __db_db_cursor_4001_arg;
-		__db_join_msg __db_db_join_4001_arg;
-		__dbc_close_msg __db_dbc_close_4001_arg;
-		__dbc_count_msg __db_dbc_count_4001_arg;
-		__dbc_del_msg __db_dbc_del_4001_arg;
-		__dbc_dup_msg __db_dbc_dup_4001_arg;
-		__dbc_get_msg __db_dbc_get_4001_arg;
-		__dbc_pget_msg __db_dbc_pget_4001_arg;
-		__dbc_put_msg __db_dbc_put_4001_arg;
-	} argument;
-	char *result;
-	bool_t (*xdr_argument)(), (*xdr_result)();
-	char *(*local)();
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		(void) svc_sendreply(transp, (xdrproc_t)xdr_void,
-			(char *)NULL);
-		return;
-
-	case __DB_env_cachesize:
-		xdr_argument = xdr___env_cachesize_msg;
-		xdr_result = xdr___env_cachesize_reply;
-		local = (char *(*)()) __db_env_cachesize_4001;
-		break;
-
-	case __DB_env_close:
-		xdr_argument = xdr___env_close_msg;
-		xdr_result = xdr___env_close_reply;
-		local = (char *(*)()) __db_env_close_4001;
-		break;
-
-	case __DB_env_create:
-		xdr_argument = xdr___env_create_msg;
-		xdr_result = xdr___env_create_reply;
-		local = (char *(*)()) __db_env_create_4001;
-		break;
-
-	case __DB_env_dbremove:
-		xdr_argument = xdr___env_dbremove_msg;
-		xdr_result = xdr___env_dbremove_reply;
-		local = (char *(*)()) __db_env_dbremove_4001;
-		break;
-
-	case __DB_env_dbrename:
-		xdr_argument = xdr___env_dbrename_msg;
-		xdr_result = xdr___env_dbrename_reply;
-		local = (char *(*)()) __db_env_dbrename_4001;
-		break;
-
-	case __DB_env_encrypt:
-		xdr_argument = xdr___env_encrypt_msg;
-		xdr_result = xdr___env_encrypt_reply;
-		local = (char *(*)()) __db_env_encrypt_4001;
-		break;
-
-	case __DB_env_flags:
-		xdr_argument = xdr___env_flags_msg;
-		xdr_result = xdr___env_flags_reply;
-		local = (char *(*)()) __db_env_flags_4001;
-		break;
-
-	case __DB_env_open:
-		xdr_argument = xdr___env_open_msg;
-		xdr_result = xdr___env_open_reply;
-		local = (char *(*)()) __db_env_open_4001;
-		break;
-
-	case __DB_env_remove:
-		xdr_argument = xdr___env_remove_msg;
-		xdr_result = xdr___env_remove_reply;
-		local = (char *(*)()) __db_env_remove_4001;
-		break;
-
-	case __DB_txn_abort:
-		xdr_argument = xdr___txn_abort_msg;
-		xdr_result = xdr___txn_abort_reply;
-		local = (char *(*)()) __db_txn_abort_4001;
-		break;
-
-	case __DB_txn_begin:
-		xdr_argument = xdr___txn_begin_msg;
-		xdr_result = xdr___txn_begin_reply;
-		local = (char *(*)()) __db_txn_begin_4001;
-		break;
-
-	case __DB_txn_commit:
-		xdr_argument = xdr___txn_commit_msg;
-		xdr_result = xdr___txn_commit_reply;
-		local = (char *(*)()) __db_txn_commit_4001;
-		break;
-
-	case __DB_txn_discard:
-		xdr_argument = xdr___txn_discard_msg;
-		xdr_result = xdr___txn_discard_reply;
-		local = (char *(*)()) __db_txn_discard_4001;
-		break;
-
-	case __DB_txn_prepare:
-		xdr_argument = xdr___txn_prepare_msg;
-		xdr_result = xdr___txn_prepare_reply;
-		local = (char *(*)()) __db_txn_prepare_4001;
-		break;
-
-	case __DB_txn_recover:
-		xdr_argument = xdr___txn_recover_msg;
-		xdr_result = xdr___txn_recover_reply;
-		local = (char *(*)()) __db_txn_recover_4001;
-		break;
-
-	case __DB_db_associate:
-		xdr_argument = xdr___db_associate_msg;
-		xdr_result = xdr___db_associate_reply;
-		local = (char *(*)()) __db_db_associate_4001;
-		break;
-
-	case __DB_db_bt_maxkey:
-		xdr_argument = xdr___db_bt_maxkey_msg;
-		xdr_result = xdr___db_bt_maxkey_reply;
-		local = (char *(*)()) __db_db_bt_maxkey_4001;
-		break;
-
-	case __DB_db_bt_minkey:
-		xdr_argument = xdr___db_bt_minkey_msg;
-		xdr_result = xdr___db_bt_minkey_reply;
-		local = (char *(*)()) __db_db_bt_minkey_4001;
-		break;
-
-	case __DB_db_close:
-		xdr_argument = xdr___db_close_msg;
-		xdr_result = xdr___db_close_reply;
-		local = (char *(*)()) __db_db_close_4001;
-		break;
-
-	case __DB_db_create:
-		xdr_argument = xdr___db_create_msg;
-		xdr_result = xdr___db_create_reply;
-		local = (char *(*)()) __db_db_create_4001;
-		break;
-
-	case __DB_db_del:
-		xdr_argument = xdr___db_del_msg;
-		xdr_result = xdr___db_del_reply;
-		local = (char *(*)()) __db_db_del_4001;
-		break;
-
-	case __DB_db_encrypt:
-		xdr_argument = xdr___db_encrypt_msg;
-		xdr_result = xdr___db_encrypt_reply;
-		local = (char *(*)()) __db_db_encrypt_4001;
-		break;
-
-	case __DB_db_extentsize:
-		xdr_argument = xdr___db_extentsize_msg;
-		xdr_result = xdr___db_extentsize_reply;
-		local = (char *(*)()) __db_db_extentsize_4001;
-		break;
-
-	case __DB_db_flags:
-		xdr_argument = xdr___db_flags_msg;
-		xdr_result = xdr___db_flags_reply;
-		local = (char *(*)()) __db_db_flags_4001;
-		break;
-
-	case __DB_db_get:
-		xdr_argument = xdr___db_get_msg;
-		xdr_result = xdr___db_get_reply;
-		local = (char *(*)()) __db_db_get_4001;
-		break;
-
-	case __DB_db_h_ffactor:
-		xdr_argument = xdr___db_h_ffactor_msg;
-		xdr_result = xdr___db_h_ffactor_reply;
-		local = (char *(*)()) __db_db_h_ffactor_4001;
-		break;
-
-	case __DB_db_h_nelem:
-		xdr_argument = xdr___db_h_nelem_msg;
-		xdr_result = xdr___db_h_nelem_reply;
-		local = (char *(*)()) __db_db_h_nelem_4001;
-		break;
-
-	case __DB_db_key_range:
-		xdr_argument = xdr___db_key_range_msg;
-		xdr_result = xdr___db_key_range_reply;
-		local = (char *(*)()) __db_db_key_range_4001;
-		break;
-
-	case __DB_db_lorder:
-		xdr_argument = xdr___db_lorder_msg;
-		xdr_result = xdr___db_lorder_reply;
-		local = (char *(*)()) __db_db_lorder_4001;
-		break;
-
-	case __DB_db_open:
-		xdr_argument = xdr___db_open_msg;
-		xdr_result = xdr___db_open_reply;
-		local = (char *(*)()) __db_db_open_4001;
-		break;
-
-	case __DB_db_pagesize:
-		xdr_argument = xdr___db_pagesize_msg;
-		xdr_result = xdr___db_pagesize_reply;
-		local = (char *(*)()) __db_db_pagesize_4001;
-		break;
-
-	case __DB_db_pget:
-		xdr_argument = xdr___db_pget_msg;
-		xdr_result = xdr___db_pget_reply;
-		local = (char *(*)()) __db_db_pget_4001;
-		break;
-
-	case __DB_db_put:
-		xdr_argument = xdr___db_put_msg;
-		xdr_result = xdr___db_put_reply;
-		local = (char *(*)()) __db_db_put_4001;
-		break;
-
-	case __DB_db_re_delim:
-		xdr_argument = xdr___db_re_delim_msg;
-		xdr_result = xdr___db_re_delim_reply;
-		local = (char *(*)()) __db_db_re_delim_4001;
-		break;
-
-	case __DB_db_re_len:
-		xdr_argument = xdr___db_re_len_msg;
-		xdr_result = xdr___db_re_len_reply;
-		local = (char *(*)()) __db_db_re_len_4001;
-		break;
-
-	case __DB_db_re_pad:
-		xdr_argument = xdr___db_re_pad_msg;
-		xdr_result = xdr___db_re_pad_reply;
-		local = (char *(*)()) __db_db_re_pad_4001;
-		break;
-
-	case __DB_db_remove:
-		xdr_argument = xdr___db_remove_msg;
-		xdr_result = xdr___db_remove_reply;
-		local = (char *(*)()) __db_db_remove_4001;
-		break;
-
-	case __DB_db_rename:
-		xdr_argument = xdr___db_rename_msg;
-		xdr_result = xdr___db_rename_reply;
-		local = (char *(*)()) __db_db_rename_4001;
-		break;
-
-	case __DB_db_stat:
-		xdr_argument = xdr___db_stat_msg;
-		xdr_result = xdr___db_stat_reply;
-		local = (char *(*)()) __db_db_stat_4001;
-		break;
-
-	case __DB_db_sync:
-		xdr_argument = xdr___db_sync_msg;
-		xdr_result = xdr___db_sync_reply;
-		local = (char *(*)()) __db_db_sync_4001;
-		break;
-
-	case __DB_db_truncate:
-		xdr_argument = xdr___db_truncate_msg;
-		xdr_result = xdr___db_truncate_reply;
-		local = (char *(*)()) __db_db_truncate_4001;
-		break;
-
-	case __DB_db_cursor:
-		xdr_argument = xdr___db_cursor_msg;
-		xdr_result = xdr___db_cursor_reply;
-		local = (char *(*)()) __db_db_cursor_4001;
-		break;
-
-	case __DB_db_join:
-		xdr_argument = xdr___db_join_msg;
-		xdr_result = xdr___db_join_reply;
-		local = (char *(*)()) __db_db_join_4001;
-		break;
-
-	case __DB_dbc_close:
-		xdr_argument = xdr___dbc_close_msg;
-		xdr_result = xdr___dbc_close_reply;
-		local = (char *(*)()) __db_dbc_close_4001;
-		break;
-
-	case __DB_dbc_count:
-		xdr_argument = xdr___dbc_count_msg;
-		xdr_result = xdr___dbc_count_reply;
-		local = (char *(*)()) __db_dbc_count_4001;
-		break;
-
-	case __DB_dbc_del:
-		xdr_argument = xdr___dbc_del_msg;
-		xdr_result = xdr___dbc_del_reply;
-		local = (char *(*)()) __db_dbc_del_4001;
-		break;
-
-	case __DB_dbc_dup:
-		xdr_argument = xdr___dbc_dup_msg;
-		xdr_result = xdr___dbc_dup_reply;
-		local = (char *(*)()) __db_dbc_dup_4001;
-		break;
-
-	case __DB_dbc_get:
-		xdr_argument = xdr___dbc_get_msg;
-		xdr_result = xdr___dbc_get_reply;
-		local = (char *(*)()) __db_dbc_get_4001;
-		break;
-
-	case __DB_dbc_pget:
-		xdr_argument = xdr___dbc_pget_msg;
-		xdr_result = xdr___dbc_pget_reply;
-		local = (char *(*)()) __db_dbc_pget_4001;
-		break;
-
-	case __DB_dbc_put:
-		xdr_argument = xdr___dbc_put_msg;
-		xdr_result = xdr___dbc_put_reply;
-		local = (char *(*)()) __db_dbc_put_4001;
-		break;
-
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-	(void) memset((char *)&argument, 0, sizeof (argument));
-	if (!svc_getargs(transp, (xdrproc_t)xdr_argument, (char *)&argument)) {
-		svcerr_decode(transp);
-		return;
-	}
-	result = (*local)(&argument, rqstp);
-	if (result != NULL && !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) {
-		svcerr_systemerr(transp);
-	}
-	if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, (char *)&argument)) {
-		fprintf(stderr, "unable to free arguments");
-		exit(1);
-	}
-	__dbsrv_timeout(0);
-	return;
-}
-
-void __dbsrv_main()
-{
-	register SVCXPRT *transp;
-
-	(void) pmap_unset(DB_RPC_SERVERPROG, DB_RPC_SERVERVERS);
-
-	transp = svctcp_create(RPC_ANYSOCK, 0, 0);
-	if (transp == NULL) {
-		fprintf(stderr, "cannot create tcp service.");
-		exit(1);
-	}
-	if (!svc_register(transp, DB_RPC_SERVERPROG, DB_RPC_SERVERVERS, db_rpc_serverprog_4001, IPPROTO_TCP)) {
-		fprintf(stderr, "unable to register (DB_RPC_SERVERPROG, DB_RPC_SERVERVERS, tcp).");
-		exit(1);
-	}
-
-	svc_run();
-	fprintf(stderr, "svc_run returned");
-	exit(1);
-	/* NOTREACHED */
-}
diff --git a/bdb/rpc_server/c/db_server_xdr.c b/bdb/rpc_server/c/db_server_xdr.c
deleted file mode 100644
index bfe2b6c09c7..00000000000
--- a/bdb/rpc_server/c/db_server_xdr.c
+++ /dev/null
@@ -1,1512 +0,0 @@
-#include "db_config.h"
-
-#ifdef HAVE_RPC
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <rpc/rpc.h>
-
-#include <strings.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc_auto/db_server.h"
-
-bool_t
-xdr___env_cachesize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_cachesize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->gbytes))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->bytes))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ncache))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_cachesize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_cachesize_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_close_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_create_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_create_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->timeout))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_create_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_create_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->envcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_dbremove_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_dbremove_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_dbremove_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_dbremove_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_dbrename_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_dbrename_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->newname, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_dbrename_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_dbrename_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_encrypt_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_encrypt_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->passwd, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_encrypt_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_encrypt_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_flags_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_flags_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->onoff))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_flags_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_flags_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_open_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_open_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->home, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->mode))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_open_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_open_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->envcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_remove_msg(xdrs, objp)
-	register XDR *xdrs;
-	__env_remove_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->home, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___env_remove_reply(xdrs, objp)
-	register XDR *xdrs;
-	__env_remove_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_abort_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_abort_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_abort_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_abort_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_begin_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_begin_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->parentcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_begin_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_begin_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_commit_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_commit_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_commit_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_commit_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_discard_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_discard_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_discard_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_discard_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_prepare_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_prepare_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_opaque(xdrs, objp->gid, 128))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_prepare_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_prepare_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_recover_msg(xdrs, objp)
-	register XDR *xdrs;
-	__txn_recover_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->count))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___txn_recover_reply(xdrs, objp)
-	register XDR *xdrs;
-	__txn_recover_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_array(xdrs, (char **)&objp->txn.txn_val, (u_int *) &objp->txn.txn_len, ~0,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->gid.gid_val, (u_int *) &objp->gid.gid_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->retcount))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_associate_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_associate_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->sdbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_associate_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_associate_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_maxkey_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_maxkey_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->maxkey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_maxkey_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_maxkey_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_minkey_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_minkey_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->minkey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_bt_minkey_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_bt_minkey_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_close_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_create_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_create_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbenvcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_create_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_create_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_del_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_del_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_del_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_del_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_encrypt_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_encrypt_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->passwd, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_encrypt_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_encrypt_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_extentsize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_extentsize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->extentsize))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_extentsize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_extentsize_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_flags_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_flags_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_flags_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_flags_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_get_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_get_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_get_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_get_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_ffactor_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_ffactor_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ffactor))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_ffactor_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_ffactor_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_nelem_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_nelem_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->nelem))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_h_nelem_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_h_nelem_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_key_range_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_key_range_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_key_range_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_key_range_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->less))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->equal))
-		return (FALSE);
-	if (!xdr_double(xdrs, &objp->greater))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_lorder_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_lorder_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->lorder))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_lorder_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_lorder_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_open_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_open_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->type))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->mode))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_open_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_open_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->type))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbflags))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->lorder))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pagesize_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_pagesize_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pagesize))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pagesize_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_pagesize_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pget_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_pget_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_pget_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_pget_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_put_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_put_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_put_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_put_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_delim_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_delim_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->delim))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_delim_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_delim_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_len_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_len_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->len))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_len_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_len_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_pad_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_pad_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pad))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_re_pad_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_re_pad_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_remove_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_remove_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_remove_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_remove_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_rename_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_rename_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->name, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->subdb, ~0))
-		return (FALSE);
-	if (!xdr_string(xdrs, &objp->newname, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_rename_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_rename_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_stat_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_stat_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_stat_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_stat_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_array(xdrs, (char **)&objp->stats.stats_val, (u_int *) &objp->stats.stats_len, ~0,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_sync_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_sync_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_sync_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_sync_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_truncate_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_truncate_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_truncate_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_truncate_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->count))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_cursor_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_cursor_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->txnpcl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_cursor_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_cursor_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_join_msg(xdrs, objp)
-	register XDR *xdrs;
-	__db_join_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbpcl_id))
-		return (FALSE);
-	if (!xdr_array(xdrs, (char **)&objp->curs.curs_val, (u_int *) &objp->curs.curs_len, ~0,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___db_join_reply(xdrs, objp)
-	register XDR *xdrs;
-	__db_join_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_close_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_close_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_close_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_close_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_count_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_count_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_count_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_count_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dupcount))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_del_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_del_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_del_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_del_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_dup_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_dup_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_dup_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_dup_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dbcidcl_id))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_get_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_get_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_get_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_get_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_pget_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_pget_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->skeyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->pkeyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_pget_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_pget_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->skeydata.skeydata_val, (u_int *) &objp->skeydata.skeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->pkeydata.pkeydata_val, (u_int *) &objp->pkeydata.pkeydata_len, ~0))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_put_msg(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_put_msg *objp;
-{
-
-	if (!xdr_u_int(xdrs, &objp->dbccl_id))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keydoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->keyflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadlen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->datadoff))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataulen))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->dataflags))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->datadata.datadata_val, (u_int *) &objp->datadata.datadata_len, ~0))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->flags))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr___dbc_put_reply(xdrs, objp)
-	register XDR *xdrs;
-	__dbc_put_reply *objp;
-{
-
-	if (!xdr_int(xdrs, &objp->status))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->keydata.keydata_val, (u_int *) &objp->keydata.keydata_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-#endif /* HAVE_RPC */
diff --git a/bdb/rpc_server/c/gen_db_server.c b/bdb/rpc_server/c/gen_db_server.c
deleted file mode 100644
index 0181fb06dce..00000000000
--- a/bdb/rpc_server/c/gen_db_server.c
+++ /dev/null
@@ -1,1169 +0,0 @@
-/* Do not edit: automatically built by gen_rpc.awk. */
-#include "db_config.h"
-
-#ifndef NO_SYSTEM_INCLUDES
-#include <sys/types.h>
-
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-
-#include <string.h>
-#endif
-
-#include "db_int.h"
-#include "dbinc_auto/db_server.h"
-#include "dbinc/db_server_int.h"
-#include "dbinc_auto/rpc_server_ext.h"
-
-/*
- * PUBLIC: __env_cachesize_reply *__db_env_cachesize_4001 
- * PUBLIC:     __P((__env_cachesize_msg *, struct svc_req *));
- */
-__env_cachesize_reply *
-__db_env_cachesize_4001(msg, req)
-	__env_cachesize_msg *msg;
-	struct svc_req *req;
-{
-	static __env_cachesize_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_cachesize_proc(msg->dbenvcl_id,
-	    msg->gbytes,
-	    msg->bytes,
-	    msg->ncache,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_close_reply *__db_env_close_4001 __P((__env_close_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__env_close_reply *
-__db_env_close_4001(msg, req)
-	__env_close_msg *msg;
-	struct svc_req *req;
-{
-	static __env_close_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_close_proc(msg->dbenvcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_create_reply *__db_env_create_4001 __P((__env_create_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__env_create_reply *
-__db_env_create_4001(msg, req)
-	__env_create_msg *msg;
-	struct svc_req *req;
-{
-	static __env_create_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_create_proc(msg->timeout,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_dbremove_reply *__db_env_dbremove_4001 
- * PUBLIC:     __P((__env_dbremove_msg *, struct svc_req *));
- */
-__env_dbremove_reply *
-__db_env_dbremove_4001(msg, req)
-	__env_dbremove_msg *msg;
-	struct svc_req *req;
-{
-	static __env_dbremove_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_dbremove_proc(msg->dbenvcl_id,
-	    msg->txnpcl_id,
-	    (*msg->name == '\0') ? NULL : msg->name,
-	    (*msg->subdb == '\0') ? NULL : msg->subdb,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_dbrename_reply *__db_env_dbrename_4001 
- * PUBLIC:     __P((__env_dbrename_msg *, struct svc_req *));
- */
-__env_dbrename_reply *
-__db_env_dbrename_4001(msg, req)
-	__env_dbrename_msg *msg;
-	struct svc_req *req;
-{
-	static __env_dbrename_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_dbrename_proc(msg->dbenvcl_id,
-	    msg->txnpcl_id,
-	    (*msg->name == '\0') ? NULL : msg->name,
-	    (*msg->subdb == '\0') ? NULL : msg->subdb,
-	    (*msg->newname == '\0') ? NULL : msg->newname,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_encrypt_reply *__db_env_encrypt_4001 
- * PUBLIC:     __P((__env_encrypt_msg *, struct svc_req *));
- */
-__env_encrypt_reply *
-__db_env_encrypt_4001(msg, req)
-	__env_encrypt_msg *msg;
-	struct svc_req *req;
-{
-	static __env_encrypt_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_encrypt_proc(msg->dbenvcl_id,
-	    (*msg->passwd == '\0') ? NULL : msg->passwd,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_flags_reply *__db_env_flags_4001 __P((__env_flags_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__env_flags_reply *
-__db_env_flags_4001(msg, req)
-	__env_flags_msg *msg;
-	struct svc_req *req;
-{
-	static __env_flags_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_flags_proc(msg->dbenvcl_id,
-	    msg->flags,
-	    msg->onoff,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_open_reply *__db_env_open_4001 __P((__env_open_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__env_open_reply *
-__db_env_open_4001(msg, req)
-	__env_open_msg *msg;
-	struct svc_req *req;
-{
-	static __env_open_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_open_proc(msg->dbenvcl_id,
-	    (*msg->home == '\0') ? NULL : msg->home,
-	    msg->flags,
-	    msg->mode,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __env_remove_reply *__db_env_remove_4001 __P((__env_remove_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__env_remove_reply *
-__db_env_remove_4001(msg, req)
-	__env_remove_msg *msg;
-	struct svc_req *req;
-{
-	static __env_remove_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__env_remove_proc(msg->dbenvcl_id,
-	    (*msg->home == '\0') ? NULL : msg->home,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_abort_reply *__db_txn_abort_4001 __P((__txn_abort_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__txn_abort_reply *
-__db_txn_abort_4001(msg, req)
-	__txn_abort_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_abort_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__txn_abort_proc(msg->txnpcl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_begin_reply *__db_txn_begin_4001 __P((__txn_begin_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__txn_begin_reply *
-__db_txn_begin_4001(msg, req)
-	__txn_begin_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_begin_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__txn_begin_proc(msg->dbenvcl_id,
-	    msg->parentcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_commit_reply *__db_txn_commit_4001 __P((__txn_commit_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__txn_commit_reply *
-__db_txn_commit_4001(msg, req)
-	__txn_commit_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_commit_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__txn_commit_proc(msg->txnpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_discard_reply *__db_txn_discard_4001 
- * PUBLIC:     __P((__txn_discard_msg *, struct svc_req *));
- */
-__txn_discard_reply *
-__db_txn_discard_4001(msg, req)
-	__txn_discard_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_discard_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__txn_discard_proc(msg->txnpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_prepare_reply *__db_txn_prepare_4001 
- * PUBLIC:     __P((__txn_prepare_msg *, struct svc_req *));
- */
-__txn_prepare_reply *
-__db_txn_prepare_4001(msg, req)
-	__txn_prepare_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_prepare_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__txn_prepare_proc(msg->txnpcl_id,
-	    msg->gid,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __txn_recover_reply *__db_txn_recover_4001 
- * PUBLIC:     __P((__txn_recover_msg *, struct svc_req *));
- */
-__txn_recover_reply *
-__db_txn_recover_4001(msg, req)
-	__txn_recover_msg *msg;
-	struct svc_req *req;
-{
-	static __txn_recover_reply reply; /* must be static */
-	static int __txn_recover_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__txn_recover_free)
-		xdr_free((xdrproc_t)xdr___txn_recover_reply, (void *)&reply);
-	__txn_recover_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.txn.txn_val = NULL;
-	reply.gid.gid_val = NULL;
-
-	__txn_recover_proc(msg->dbenvcl_id,
-	    msg->count,
-	    msg->flags,
-	    &reply,
-	    &__txn_recover_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_associate_reply *__db_db_associate_4001 
- * PUBLIC:     __P((__db_associate_msg *, struct svc_req *));
- */
-__db_associate_reply *
-__db_db_associate_4001(msg, req)
-	__db_associate_msg *msg;
-	struct svc_req *req;
-{
-	static __db_associate_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_associate_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->sdbpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_bt_maxkey_reply *__db_db_bt_maxkey_4001 
- * PUBLIC:     __P((__db_bt_maxkey_msg *, struct svc_req *));
- */
-__db_bt_maxkey_reply *
-__db_db_bt_maxkey_4001(msg, req)
-	__db_bt_maxkey_msg *msg;
-	struct svc_req *req;
-{
-	static __db_bt_maxkey_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_bt_maxkey_proc(msg->dbpcl_id,
-	    msg->maxkey,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_bt_minkey_reply *__db_db_bt_minkey_4001 
- * PUBLIC:     __P((__db_bt_minkey_msg *, struct svc_req *));
- */
-__db_bt_minkey_reply *
-__db_db_bt_minkey_4001(msg, req)
-	__db_bt_minkey_msg *msg;
-	struct svc_req *req;
-{
-	static __db_bt_minkey_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_bt_minkey_proc(msg->dbpcl_id,
-	    msg->minkey,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_close_reply *__db_db_close_4001 __P((__db_close_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_close_reply *
-__db_db_close_4001(msg, req)
-	__db_close_msg *msg;
-	struct svc_req *req;
-{
-	static __db_close_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_close_proc(msg->dbpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_create_reply *__db_db_create_4001 __P((__db_create_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_create_reply *
-__db_db_create_4001(msg, req)
-	__db_create_msg *msg;
-	struct svc_req *req;
-{
-	static __db_create_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_create_proc(msg->dbenvcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_del_reply *__db_db_del_4001 __P((__db_del_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_del_reply *
-__db_db_del_4001(msg, req)
-	__db_del_msg *msg;
-	struct svc_req *req;
-{
-	static __db_del_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_del_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_encrypt_reply *__db_db_encrypt_4001 __P((__db_encrypt_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_encrypt_reply *
-__db_db_encrypt_4001(msg, req)
-	__db_encrypt_msg *msg;
-	struct svc_req *req;
-{
-	static __db_encrypt_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_encrypt_proc(msg->dbpcl_id,
-	    (*msg->passwd == '\0') ? NULL : msg->passwd,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_extentsize_reply *__db_db_extentsize_4001 
- * PUBLIC:     __P((__db_extentsize_msg *, struct svc_req *));
- */
-__db_extentsize_reply *
-__db_db_extentsize_4001(msg, req)
-	__db_extentsize_msg *msg;
-	struct svc_req *req;
-{
-	static __db_extentsize_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_extentsize_proc(msg->dbpcl_id,
-	    msg->extentsize,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_flags_reply *__db_db_flags_4001 __P((__db_flags_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_flags_reply *
-__db_db_flags_4001(msg, req)
-	__db_flags_msg *msg;
-	struct svc_req *req;
-{
-	static __db_flags_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_flags_proc(msg->dbpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_get_reply *__db_db_get_4001 __P((__db_get_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_get_reply *
-__db_db_get_4001(msg, req)
-	__db_get_msg *msg;
-	struct svc_req *req;
-{
-	static __db_get_reply reply; /* must be static */
-	static int __db_get_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__db_get_free)
-		xdr_free((xdrproc_t)xdr___db_get_reply, (void *)&reply);
-	__db_get_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__db_get_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__db_get_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_h_ffactor_reply *__db_db_h_ffactor_4001 
- * PUBLIC:     __P((__db_h_ffactor_msg *, struct svc_req *));
- */
-__db_h_ffactor_reply *
-__db_db_h_ffactor_4001(msg, req)
-	__db_h_ffactor_msg *msg;
-	struct svc_req *req;
-{
-	static __db_h_ffactor_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_h_ffactor_proc(msg->dbpcl_id,
-	    msg->ffactor,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_h_nelem_reply *__db_db_h_nelem_4001 __P((__db_h_nelem_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_h_nelem_reply *
-__db_db_h_nelem_4001(msg, req)
-	__db_h_nelem_msg *msg;
-	struct svc_req *req;
-{
-	static __db_h_nelem_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_h_nelem_proc(msg->dbpcl_id,
-	    msg->nelem,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_key_range_reply *__db_db_key_range_4001 
- * PUBLIC:     __P((__db_key_range_msg *, struct svc_req *));
- */
-__db_key_range_reply *
-__db_db_key_range_4001(msg, req)
-	__db_key_range_msg *msg;
-	struct svc_req *req;
-{
-	static __db_key_range_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_key_range_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_lorder_reply *__db_db_lorder_4001 __P((__db_lorder_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_lorder_reply *
-__db_db_lorder_4001(msg, req)
-	__db_lorder_msg *msg;
-	struct svc_req *req;
-{
-	static __db_lorder_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_lorder_proc(msg->dbpcl_id,
-	    msg->lorder,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_open_reply *__db_db_open_4001 __P((__db_open_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_open_reply *
-__db_db_open_4001(msg, req)
-	__db_open_msg *msg;
-	struct svc_req *req;
-{
-	static __db_open_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_open_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    (*msg->name == '\0') ? NULL : msg->name,
-	    (*msg->subdb == '\0') ? NULL : msg->subdb,
-	    msg->type,
-	    msg->flags,
-	    msg->mode,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_pagesize_reply *__db_db_pagesize_4001 
- * PUBLIC:     __P((__db_pagesize_msg *, struct svc_req *));
- */
-__db_pagesize_reply *
-__db_db_pagesize_4001(msg, req)
-	__db_pagesize_msg *msg;
-	struct svc_req *req;
-{
-	static __db_pagesize_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_pagesize_proc(msg->dbpcl_id,
-	    msg->pagesize,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_pget_reply *__db_db_pget_4001 __P((__db_pget_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_pget_reply *
-__db_db_pget_4001(msg, req)
-	__db_pget_msg *msg;
-	struct svc_req *req;
-{
-	static __db_pget_reply reply; /* must be static */
-	static int __db_pget_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__db_pget_free)
-		xdr_free((xdrproc_t)xdr___db_pget_reply, (void *)&reply);
-	__db_pget_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.skeydata.skeydata_val = NULL;
-	reply.pkeydata.pkeydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__db_pget_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->skeydlen,
-	    msg->skeydoff,
-	    msg->skeyulen,
-	    msg->skeyflags,
-	    msg->skeydata.skeydata_val,
-	    msg->skeydata.skeydata_len,
-	    msg->pkeydlen,
-	    msg->pkeydoff,
-	    msg->pkeyulen,
-	    msg->pkeyflags,
-	    msg->pkeydata.pkeydata_val,
-	    msg->pkeydata.pkeydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__db_pget_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_put_reply *__db_db_put_4001 __P((__db_put_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_put_reply *
-__db_db_put_4001(msg, req)
-	__db_put_msg *msg;
-	struct svc_req *req;
-{
-	static __db_put_reply reply; /* must be static */
-	static int __db_put_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__db_put_free)
-		xdr_free((xdrproc_t)xdr___db_put_reply, (void *)&reply);
-	__db_put_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-
-	__db_put_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__db_put_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_re_delim_reply *__db_db_re_delim_4001 
- * PUBLIC:     __P((__db_re_delim_msg *, struct svc_req *));
- */
-__db_re_delim_reply *
-__db_db_re_delim_4001(msg, req)
-	__db_re_delim_msg *msg;
-	struct svc_req *req;
-{
-	static __db_re_delim_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_re_delim_proc(msg->dbpcl_id,
-	    msg->delim,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_re_len_reply *__db_db_re_len_4001 __P((__db_re_len_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_re_len_reply *
-__db_db_re_len_4001(msg, req)
-	__db_re_len_msg *msg;
-	struct svc_req *req;
-{
-	static __db_re_len_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_re_len_proc(msg->dbpcl_id,
-	    msg->len,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_re_pad_reply *__db_db_re_pad_4001 __P((__db_re_pad_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_re_pad_reply *
-__db_db_re_pad_4001(msg, req)
-	__db_re_pad_msg *msg;
-	struct svc_req *req;
-{
-	static __db_re_pad_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_re_pad_proc(msg->dbpcl_id,
-	    msg->pad,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_remove_reply *__db_db_remove_4001 __P((__db_remove_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_remove_reply *
-__db_db_remove_4001(msg, req)
-	__db_remove_msg *msg;
-	struct svc_req *req;
-{
-	static __db_remove_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_remove_proc(msg->dbpcl_id,
-	    (*msg->name == '\0') ? NULL : msg->name,
-	    (*msg->subdb == '\0') ? NULL : msg->subdb,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_rename_reply *__db_db_rename_4001 __P((__db_rename_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_rename_reply *
-__db_db_rename_4001(msg, req)
-	__db_rename_msg *msg;
-	struct svc_req *req;
-{
-	static __db_rename_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_rename_proc(msg->dbpcl_id,
-	    (*msg->name == '\0') ? NULL : msg->name,
-	    (*msg->subdb == '\0') ? NULL : msg->subdb,
-	    (*msg->newname == '\0') ? NULL : msg->newname,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_stat_reply *__db_db_stat_4001 __P((__db_stat_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_stat_reply *
-__db_db_stat_4001(msg, req)
-	__db_stat_msg *msg;
-	struct svc_req *req;
-{
-	static __db_stat_reply reply; /* must be static */
-	static int __db_stat_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__db_stat_free)
-		xdr_free((xdrproc_t)xdr___db_stat_reply, (void *)&reply);
-	__db_stat_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.stats.stats_val = NULL;
-
-	__db_stat_proc(msg->dbpcl_id,
-	    msg->flags,
-	    &reply,
-	    &__db_stat_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_sync_reply *__db_db_sync_4001 __P((__db_sync_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_sync_reply *
-__db_db_sync_4001(msg, req)
-	__db_sync_msg *msg;
-	struct svc_req *req;
-{
-	static __db_sync_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_sync_proc(msg->dbpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_truncate_reply *__db_db_truncate_4001 
- * PUBLIC:     __P((__db_truncate_msg *, struct svc_req *));
- */
-__db_truncate_reply *
-__db_db_truncate_4001(msg, req)
-	__db_truncate_msg *msg;
-	struct svc_req *req;
-{
-	static __db_truncate_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_truncate_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_cursor_reply *__db_db_cursor_4001 __P((__db_cursor_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_cursor_reply *
-__db_db_cursor_4001(msg, req)
-	__db_cursor_msg *msg;
-	struct svc_req *req;
-{
-	static __db_cursor_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_cursor_proc(msg->dbpcl_id,
-	    msg->txnpcl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __db_join_reply *__db_db_join_4001 __P((__db_join_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__db_join_reply *
-__db_db_join_4001(msg, req)
-	__db_join_msg *msg;
-	struct svc_req *req;
-{
-	static __db_join_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__db_join_proc(msg->dbpcl_id,
-	    msg->curs.curs_val,
-	    msg->curs.curs_len,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_close_reply *__db_dbc_close_4001 __P((__dbc_close_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_close_reply *
-__db_dbc_close_4001(msg, req)
-	__dbc_close_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_close_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__dbc_close_proc(msg->dbccl_id,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_count_reply *__db_dbc_count_4001 __P((__dbc_count_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_count_reply *
-__db_dbc_count_4001(msg, req)
-	__dbc_count_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_count_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__dbc_count_proc(msg->dbccl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_del_reply *__db_dbc_del_4001 __P((__dbc_del_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_del_reply *
-__db_dbc_del_4001(msg, req)
-	__dbc_del_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_del_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__dbc_del_proc(msg->dbccl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_dup_reply *__db_dbc_dup_4001 __P((__dbc_dup_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_dup_reply *
-__db_dbc_dup_4001(msg, req)
-	__dbc_dup_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_dup_reply reply; /* must be static */
-	COMPQUIET(req, NULL);
-
-	__dbc_dup_proc(msg->dbccl_id,
-	    msg->flags,
-	    &reply);
-
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_get_reply *__db_dbc_get_4001 __P((__dbc_get_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_get_reply *
-__db_dbc_get_4001(msg, req)
-	__dbc_get_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_get_reply reply; /* must be static */
-	static int __dbc_get_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__dbc_get_free)
-		xdr_free((xdrproc_t)xdr___dbc_get_reply, (void *)&reply);
-	__dbc_get_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__dbc_get_proc(msg->dbccl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__dbc_get_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_pget_reply *__db_dbc_pget_4001 __P((__dbc_pget_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_pget_reply *
-__db_dbc_pget_4001(msg, req)
-	__dbc_pget_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_pget_reply reply; /* must be static */
-	static int __dbc_pget_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__dbc_pget_free)
-		xdr_free((xdrproc_t)xdr___dbc_pget_reply, (void *)&reply);
-	__dbc_pget_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.skeydata.skeydata_val = NULL;
-	reply.pkeydata.pkeydata_val = NULL;
-	reply.datadata.datadata_val = NULL;
-
-	__dbc_pget_proc(msg->dbccl_id,
-	    msg->skeydlen,
-	    msg->skeydoff,
-	    msg->skeyulen,
-	    msg->skeyflags,
-	    msg->skeydata.skeydata_val,
-	    msg->skeydata.skeydata_len,
-	    msg->pkeydlen,
-	    msg->pkeydoff,
-	    msg->pkeyulen,
-	    msg->pkeyflags,
-	    msg->pkeydata.pkeydata_val,
-	    msg->pkeydata.pkeydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__dbc_pget_free);
-	return (&reply);
-}
-
-/*
- * PUBLIC: __dbc_put_reply *__db_dbc_put_4001 __P((__dbc_put_msg *,
- * PUBLIC:      struct svc_req *));
- */
-__dbc_put_reply *
-__db_dbc_put_4001(msg, req)
-	__dbc_put_msg *msg;
-	struct svc_req *req;
-{
-	static __dbc_put_reply reply; /* must be static */
-	static int __dbc_put_free = 0; /* must be static */
-
-	COMPQUIET(req, NULL);
-	if (__dbc_put_free)
-		xdr_free((xdrproc_t)xdr___dbc_put_reply, (void *)&reply);
-	__dbc_put_free = 0;
-
-	/* Reinitialize allocated fields */
-	reply.keydata.keydata_val = NULL;
-
-	__dbc_put_proc(msg->dbccl_id,
-	    msg->keydlen,
-	    msg->keydoff,
-	    msg->keyulen,
-	    msg->keyflags,
-	    msg->keydata.keydata_val,
-	    msg->keydata.keydata_len,
-	    msg->datadlen,
-	    msg->datadoff,
-	    msg->dataulen,
-	    msg->dataflags,
-	    msg->datadata.datadata_val,
-	    msg->datadata.datadata_len,
-	    msg->flags,
-	    &reply,
-	    &__dbc_put_free);
-	return (&reply);
-}
-
-- 
cgit v1.2.1


From dbbcc4223bf1388631fa9dea555c5e39b0fd81ed Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mysql.com>
Date: Mon, 11 Nov 2002 17:17:28 +0100
Subject: removed auto-generated files, some fixups

BitKeeper/deleted/.del-rpc_server_ext.h~7c955499fca6dc77:
  Delete: bdb/dbinc_auto/rpc_server_ext.h
BitKeeper/deleted/.del-btree_ext.h~35de1585d63d72ff:
  Delete: bdb/dbinc_auto/btree_ext.h
BitKeeper/deleted/.del-clib_ext.h~f279b5b64b6b5ade:
  Delete: bdb/dbinc_auto/clib_ext.h
BitKeeper/deleted/.del-common_ext.h~d8ab025e1be030ae:
  Delete: bdb/dbinc_auto/common_ext.h
BitKeeper/deleted/.del-db_ext.h~a62714b06359a95e:
  Delete: bdb/dbinc_auto/db_ext.h
BitKeeper/deleted/.del-dbreg_ext.h~4d2ca3859b11d8c2:
  Delete: bdb/dbinc_auto/dbreg_ext.h
BitKeeper/deleted/.del-env_ext.h~6f604f4533cc5427:
  Delete: bdb/dbinc_auto/env_ext.h
BitKeeper/deleted/.del-ext_185_def.in~a6545f6dd455a6bd:
  Delete: bdb/dbinc_auto/ext_185_def.in
BitKeeper/deleted/.del-ext_185_prot.in~51f8b1efdc79204c:
  Delete: bdb/dbinc_auto/ext_185_prot.in
BitKeeper/deleted/.del-ext_def.in~eb85579468346302:
  Delete: bdb/dbinc_auto/ext_def.in
BitKeeper/deleted/.del-ext_prot.in~1123bab8d321561d:
  Delete: bdb/dbinc_auto/ext_prot.in
BitKeeper/deleted/.del-fileops_ext.h~cb8ee1d24c011cac:
  Delete: bdb/dbinc_auto/fileops_ext.h
BitKeeper/deleted/.del-hash_ext.h~9cc6cefb2d5cdee:
  Delete: bdb/dbinc_auto/hash_ext.h
BitKeeper/deleted/.del-hmac_ext.h~da1552dc3f7b9f46:
  Delete: bdb/dbinc_auto/hmac_ext.h
BitKeeper/deleted/.del-lock_ext.h~f9ce9b184d784d74:
  Delete: bdb/dbinc_auto/lock_ext.h
BitKeeper/deleted/.del-log_ext.h~f1309f8f47b5e812:
  Delete: bdb/dbinc_auto/log_ext.h
BitKeeper/deleted/.del-mp_ext.h~863c07eb97ff21fb:
  Delete: bdb/dbinc_auto/mp_ext.h
BitKeeper/deleted/.del-mutex_ext.h~f0c6b65f493723e6:
  Delete: bdb/dbinc_auto/mutex_ext.h
BitKeeper/deleted/.del-os_ext.h~6f51a66237a20ca3:
  Delete: bdb/dbinc_auto/os_ext.h
BitKeeper/deleted/.del-qam_ext.h~a0e8f87ead2e3846:
  Delete: bdb/dbinc_auto/qam_ext.h
BitKeeper/deleted/.del-rep_ext.h~94f25917d5d2623:
  Delete: bdb/dbinc_auto/rep_ext.h
BitKeeper/deleted/.del-rpc_client_ext.h~8fb31274cb4dc50:
  Delete: bdb/dbinc_auto/rpc_client_ext.h
BitKeeper/deleted/.del-tcl_ext.h~6004cb009c5424ee:
  Delete: bdb/dbinc_auto/tcl_ext.h
BitKeeper/deleted/.del-txn_ext.h~c30807d88c7b11ea:
  Delete: bdb/dbinc_auto/txn_ext.h
BitKeeper/deleted/.del-xa_ext.h~3f131d16d9cc5e:
  Delete: bdb/dbinc_auto/xa_ext.h
bdb/java/src/com/sleepycat/db/Db.java.in:
  Rename: bdb/java/src/com/sleepycat/db/Db.java -> bdb/java/src/com/sleepycat/db/Db.java.in
bdb/dist/s_java:
  avoid in-place editing
bdb/dist/s_rpc:
  be consistent
---
 bdb/dbinc_auto/btree_ext.h               | 132 ------
 bdb/dbinc_auto/clib_ext.h                |  49 --
 bdb/dbinc_auto/common_ext.h              |  44 --
 bdb/dbinc_auto/db_ext.h                  | 224 ---------
 bdb/dbinc_auto/dbreg_ext.h               |  43 --
 bdb/dbinc_auto/env_ext.h                 |  39 --
 bdb/dbinc_auto/ext_185_def.in            |  12 -
 bdb/dbinc_auto/ext_185_prot.in           |  19 -
 bdb/dbinc_auto/ext_def.in                |  61 ---
 bdb/dbinc_auto/ext_prot.in               |  70 ---
 bdb/dbinc_auto/fileops_ext.h             |  52 ---
 bdb/dbinc_auto/hash_ext.h                | 125 -----
 bdb/dbinc_auto/hmac_ext.h                |  20 -
 bdb/dbinc_auto/lock_ext.h                |  41 --
 bdb/dbinc_auto/log_ext.h                 |  32 --
 bdb/dbinc_auto/mp_ext.h                  |  44 --
 bdb/dbinc_auto/mutex_ext.h               |  35 --
 bdb/dbinc_auto/os_ext.h                  |  74 ---
 bdb/dbinc_auto/qam_ext.h                 |  70 ---
 bdb/dbinc_auto/rep_ext.h                 |  30 --
 bdb/dbinc_auto/rpc_client_ext.h          | 167 -------
 bdb/dbinc_auto/rpc_server_ext.h          | 126 -----
 bdb/dbinc_auto/tcl_ext.h                 |  82 ----
 bdb/dbinc_auto/txn_ext.h                 |  70 ---
 bdb/dbinc_auto/xa_ext.h                  |  20 -
 bdb/dist/s_java                          |   2 +-
 bdb/dist/s_rpc                           |   1 +
 bdb/java/src/com/sleepycat/db/Db.java    | 761 -------------------------------
 bdb/java/src/com/sleepycat/db/Db.java.in | 761 +++++++++++++++++++++++++++++++
 29 files changed, 763 insertions(+), 2443 deletions(-)
 delete mode 100644 bdb/dbinc_auto/btree_ext.h
 delete mode 100644 bdb/dbinc_auto/clib_ext.h
 delete mode 100644 bdb/dbinc_auto/common_ext.h
 delete mode 100644 bdb/dbinc_auto/db_ext.h
 delete mode 100644 bdb/dbinc_auto/dbreg_ext.h
 delete mode 100644 bdb/dbinc_auto/env_ext.h
 delete mode 100644 bdb/dbinc_auto/ext_185_def.in
 delete mode 100644 bdb/dbinc_auto/ext_185_prot.in
 delete mode 100644 bdb/dbinc_auto/ext_def.in
 delete mode 100644 bdb/dbinc_auto/ext_prot.in
 delete mode 100644 bdb/dbinc_auto/fileops_ext.h
 delete mode 100644 bdb/dbinc_auto/hash_ext.h
 delete mode 100644 bdb/dbinc_auto/hmac_ext.h
 delete mode 100644 bdb/dbinc_auto/lock_ext.h
 delete mode 100644 bdb/dbinc_auto/log_ext.h
 delete mode 100644 bdb/dbinc_auto/mp_ext.h
 delete mode 100644 bdb/dbinc_auto/mutex_ext.h
 delete mode 100644 bdb/dbinc_auto/os_ext.h
 delete mode 100644 bdb/dbinc_auto/qam_ext.h
 delete mode 100644 bdb/dbinc_auto/rep_ext.h
 delete mode 100644 bdb/dbinc_auto/rpc_client_ext.h
 delete mode 100644 bdb/dbinc_auto/rpc_server_ext.h
 delete mode 100644 bdb/dbinc_auto/tcl_ext.h
 delete mode 100644 bdb/dbinc_auto/txn_ext.h
 delete mode 100644 bdb/dbinc_auto/xa_ext.h
 delete mode 100644 bdb/java/src/com/sleepycat/db/Db.java
 create mode 100644 bdb/java/src/com/sleepycat/db/Db.java.in

diff --git a/bdb/dbinc_auto/btree_ext.h b/bdb/dbinc_auto/btree_ext.h
deleted file mode 100644
index ec5468acf1c..00000000000
--- a/bdb/dbinc_auto/btree_ext.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_btree_ext_h_
-#define	_btree_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __bam_cmp __P((DB *, const DBT *, PAGE *, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
-int __bam_defcmp __P((DB *, const DBT *, const DBT *));
-size_t __bam_defpfx __P((DB *, const DBT *, const DBT *));
-int __bam_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __bam_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __bam_mswap __P((PAGE *));
-void __bam_cprint __P((DBC *));
-int __bam_ca_delete __P((DB *, db_pgno_t, u_int32_t, int));
-int __ram_ca_delete __P((DB *, db_pgno_t));
-int __bam_ca_di __P((DBC *, db_pgno_t, u_int32_t, int));
-int __bam_ca_dup __P((DBC *, u_int32_t, db_pgno_t, u_int32_t, db_pgno_t, u_int32_t));
-int __bam_ca_undodup __P((DB *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t));
-int __bam_ca_rsplit __P((DBC *, db_pgno_t, db_pgno_t));
-int __bam_ca_split __P((DBC *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, int));
-void __bam_ca_undosplit __P((DB *, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t));
-int __bam_c_init __P((DBC *, DBTYPE));
-int __bam_c_refresh __P((DBC *));
-int __bam_c_count __P((DBC *, db_recno_t *));
-int __bam_c_dup __P((DBC *, DBC *));
-int __bam_bulk_overflow __P((DBC *, u_int32_t, db_pgno_t, u_int8_t *));
-int __bam_bulk_duplicates __P((DBC *, db_pgno_t, u_int8_t *, int32_t *, int32_t **, u_int8_t **, u_int32_t *, int));
-int __bam_c_rget __P((DBC *, DBT *));
-int __bam_ditem __P((DBC *, PAGE *, u_int32_t));
-int __bam_adjindx __P((DBC *, PAGE *, u_int32_t, u_int32_t, int));
-int __bam_dpages __P((DBC *, EPG *));
-int __bam_db_create __P((DB *));
-int __bam_db_close __P((DB *));
-int __bam_set_flags __P((DB *, u_int32_t *flagsp));
-int __ram_set_flags __P((DB *, u_int32_t *flagsp));
-int __bam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
-int __bam_metachk __P((DB *, const char *, BTMETA *));
-int __bam_read_root __P((DB *, DB_TXN *, db_pgno_t, u_int32_t));
-int __bam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __bam_new_subdb __P((DB *, DB *, DB_TXN *));
-int __bam_iitem __P((DBC *, DBT *, DBT *, u_int32_t, u_int32_t));
-int __bam_ritem __P((DBC *, PAGE *, u_int32_t, DBT *));
-int __bam_split_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_reclaim __P((DB *, DB_TXN *));
-int __bam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-int __ram_open __P((DB *, DB_TXN *, const char *, db_pgno_t, u_int32_t));
-int __ram_append __P((DBC *, DBT *, DBT *));
-int __ram_c_del __P((DBC *));
-int __ram_c_get __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-int __ram_c_put __P((DBC *, DBT *, DBT *, u_int32_t, db_pgno_t *));
-int __ram_ca __P((DBC *, ca_recno_arg));
-int __ram_getno __P((DBC *, const DBT *, db_recno_t *, int));
-int __ram_writeback __P((DB *));
-int __bam_rsearch __P((DBC *, db_recno_t *, u_int32_t, int, int *));
-int __bam_adjust __P((DBC *, int32_t));
-int __bam_nrecs __P((DBC *, db_recno_t *));
-db_recno_t __bam_total __P((DB *, PAGE *));
-int __bam_search __P((DBC *, db_pgno_t, const DBT *, u_int32_t, int, db_recno_t *, int *));
-int __bam_stkrel __P((DBC *, u_int32_t));
-int __bam_stkgrow __P((DB_ENV *, BTREE_CURSOR *));
-int __bam_split __P((DBC *, void *, db_pgno_t *));
-int __bam_copy __P((DB *, PAGE *, PAGE *, u_int32_t, u_int32_t));
-int __bam_stat __P((DB *, void *, u_int32_t));
-int __bam_traverse __P((DBC *, db_lockmode_t, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
-int __bam_stat_callback __P((DB *, PAGE *, void *, int *));
-int __bam_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-int __bam_30_btreemeta __P((DB *, char *, u_int8_t *));
-int __bam_31_btreemeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __bam_31_lbtree __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __bam_vrfy_meta __P((DB *, VRFY_DBINFO *, BTMETA *, db_pgno_t, u_int32_t));
-int __ram_vrfy_leaf __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __bam_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __bam_vrfy_itemorder __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t, int, int, u_int32_t));
-int __bam_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __bam_vrfy_subtree __P((DB *, VRFY_DBINFO *, db_pgno_t, void *, void *, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *));
-int __bam_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, PAGE *, void *, int (*)(void *, const void *), DBT *, u_int32_t));
-int __bam_salvage_walkdupint __P((DB *, VRFY_DBINFO *, PAGE *, DBT *, void *, int (*)(void *, const void *), u_int32_t));
-int __bam_meta2pgset __P((DB *, VRFY_DBINFO *, BTMETA *, u_int32_t, DB *));
-int __bam_split_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, u_int32_t));
-int __bam_split_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_split_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_split_read __P((DB_ENV *, void *, __bam_split_args **));
-int __bam_rsplit_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *));
-int __bam_rsplit_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rsplit_read __P((DB_ENV *, void *, __bam_rsplit_args **));
-int __bam_adj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-int __bam_adj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_adj_read __P((DB_ENV *, void *, __bam_adj_args **));
-int __bam_cadjust_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, int32_t, u_int32_t));
-int __bam_cadjust_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cadjust_read __P((DB_ENV *, void *, __bam_cadjust_args **));
-int __bam_cdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t));
-int __bam_cdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_cdel_read __P((DB_ENV *, void *, __bam_cdel_args **));
-int __bam_repl_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, u_int32_t, u_int32_t));
-int __bam_repl_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_repl_read __P((DB_ENV *, void *, __bam_repl_args **));
-int __bam_root_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, db_pgno_t, DB_LSN *));
-int __bam_root_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_root_read __P((DB_ENV *, void *, __bam_root_args **));
-int __bam_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ca_mode, db_pgno_t, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t));
-int __bam_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_curadj_read __P((DB_ENV *, void *, __bam_curadj_args **));
-int __bam_rcuradj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, ca_recno_arg, db_pgno_t, db_recno_t, u_int32_t));
-int __bam_rcuradj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __bam_rcuradj_read __P((DB_ENV *, void *, __bam_rcuradj_args **));
-int __bam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __bam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __bam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_btree_ext_h_ */
diff --git a/bdb/dbinc_auto/clib_ext.h b/bdb/dbinc_auto/clib_ext.h
deleted file mode 100644
index 7e2817d620e..00000000000
--- a/bdb/dbinc_auto/clib_ext.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_clib_ext_h_
-#define	_clib_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef HAVE_GETCWD
-char *getcwd __P((char *, size_t));
-#endif
-#ifndef HAVE_GETOPT
-int getopt __P((int, char * const *, const char *));
-#endif
-#ifndef HAVE_MEMCMP
-int memcmp __P((const void *, const void *, size_t));
-#endif
-#ifndef HAVE_MEMCPY
-void *memcpy __P((void *, const void *, size_t));
-#endif
-#ifndef HAVE_MEMMOVE
-void *memmove __P((void *, const void *, size_t));
-#endif
-#ifndef HAVE_RAISE
-int raise __P((int));
-#endif
-#ifndef HAVE_SNPRINTF
-int snprintf __P((char *, size_t, const char *, ...));
-#endif
-#ifndef HAVE_STRCASECMP
-int strcasecmp __P((const char *, const char *));
-#endif
-#ifndef HAVE_STRCASECMP
-int strncasecmp __P((const char *, const char *, size_t));
-#endif
-#ifndef HAVE_STRDUP
-char *strdup __P((const char *));
-#endif
-#ifndef HAVE_STRERROR
-char *strerror __P((int));
-#endif
-#ifndef HAVE_VSNPRINTF
-int vsnprintf __P((char *, size_t, const char *, va_list));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_clib_ext_h_ */
diff --git a/bdb/dbinc_auto/common_ext.h b/bdb/dbinc_auto/common_ext.h
deleted file mode 100644
index 7744982fe41..00000000000
--- a/bdb/dbinc_auto/common_ext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_common_ext_h_
-#define	_common_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_isbigendian __P((void));
-int __db_byteorder __P((DB_ENV *, int));
-int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
-int __db_fcchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
-int __db_ferr __P((const DB_ENV *, const char *, int));
-void __db_pgerr __P((DB *, db_pgno_t, int));
-int __db_pgfmt __P((DB_ENV *, db_pgno_t));
-int __db_eopnotsup __P((const DB_ENV *));
-#ifdef DIAGNOSTIC
-void __db_assert __P((const char *, const char *, int));
-#endif
-int __db_panic_msg __P((DB_ENV *));
-int __db_panic __P((DB_ENV *, int));
-void __db_err __P((const DB_ENV *, const char *, ...));
-void __db_errcall __P((const DB_ENV *, int, int, const char *, va_list));
-void __db_errfile __P((const DB_ENV *, int, int, const char *, va_list));
-void __db_logmsg __P((const DB_ENV *, DB_TXN *, const char *, u_int32_t, const char *, ...));
-int __db_unknown_flag __P((DB_ENV *, char *, u_int32_t));
-int __db_unknown_type __P((DB_ENV *, char *, DBTYPE));
-int __db_check_txn __P((DB *, DB_TXN *, u_int32_t, int));
-int __db_not_txn_env __P((DB_ENV *));
-int __db_getlong __P((DB *, const char *, char *, long, long, long *));
-int __db_getulong __P((DB *, const char *, char *, u_long, u_long, u_long *));
-void __db_idspace __P((u_int32_t *, int, u_int32_t *, u_int32_t *));
-u_int32_t __db_log2 __P((u_int32_t));
-int __db_util_arg __P((char *, char *, int *, char ***));
-int __db_util_cache __P((DB_ENV *, DB *, u_int32_t *, int *));
-int __db_util_logset __P((const char *, char *));
-void __db_util_siginit __P((void));
-int __db_util_interrupted __P((void));
-void __db_util_sigresend __P((void));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_common_ext_h_ */
diff --git a/bdb/dbinc_auto/db_ext.h b/bdb/dbinc_auto/db_ext.h
deleted file mode 100644
index 24a13975c89..00000000000
--- a/bdb/dbinc_auto/db_ext.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_db_ext_h_
-#define	_db_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __crdel_metasub_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-int __crdel_metasub_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __crdel_metasub_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __crdel_metasub_read __P((DB_ENV *, void *, __crdel_metasub_args **));
-int __crdel_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __crdel_metasub_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_master_open __P((DB *, DB_TXN *, const char *, u_int32_t, int, DB **));
-int __db_master_update __P((DB *, DB *, DB_TXN *, const char *, DBTYPE, mu_action, const char *, u_int32_t));
-int __db_dbenv_setup __P((DB *, DB_TXN *, const char *, u_int32_t, u_int32_t));
-int __db_close __P((DB *, u_int32_t));
-int __db_close_i __P((DB *, DB_TXN *, u_int32_t));
-int __db_refresh __P((DB *, DB_TXN *, u_int32_t));
-int __db_log_page __P((DB *, DB_TXN *, DB_LSN *, db_pgno_t, PAGE *));
-int __db_backup_name __P((DB_ENV *, const char *, DB_TXN *, char **));
-DB *__dblist_get __P((DB_ENV *, u_int32_t));
-#if CONFIG_TEST
-int __db_testcopy __P((DB_ENV *, DB *, const char *));
-#endif
-int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-int __db_icursor __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, u_int32_t, DBC **));
-int __db_cprint __P((DB *));
-int __db_fd __P((DB *, int *));
-int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __db_delete __P((DB *, DB_TXN *, DBT *, u_int32_t));
-int __db_sync __P((DB *, u_int32_t));
-int __db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_addrem_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, const DBT *, const DBT *, DB_LSN *));
-int __db_addrem_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_addrem_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_addrem_read __P((DB_ENV *, void *, __db_addrem_args **));
-int __db_big_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, db_pgno_t, db_pgno_t, const DBT *, DB_LSN *, DB_LSN *, DB_LSN *));
-int __db_big_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_read __P((DB_ENV *, void *, __db_big_args **));
-int __db_ovref_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, int32_t, DB_LSN *));
-int __db_ovref_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_read __P((DB_ENV *, void *, __db_ovref_args **));
-int __db_relink_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-int __db_relink_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_read __P((DB_ENV *, void *, __db_relink_args **));
-int __db_debug_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, int32_t, const DBT *, const DBT *, u_int32_t));
-int __db_debug_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_read __P((DB_ENV *, void *, __db_debug_args **));
-int __db_noop_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *));
-int __db_noop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_read __P((DB_ENV *, void *, __db_noop_args **));
-int __db_pg_alloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-int __db_pg_alloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_read __P((DB_ENV *, void *, __db_pg_alloc_args **));
-int __db_pg_free_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, const DBT *, db_pgno_t));
-int __db_pg_free_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_read __P((DB_ENV *, void *, __db_pg_free_args **));
-int __db_cksum_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t));
-int __db_cksum_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_read __P((DB_ENV *, void *, __db_cksum_args **));
-int __db_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __db_c_close __P((DBC *));
-int __db_c_destroy __P((DBC *));
-int __db_c_count __P((DBC *, db_recno_t *, u_int32_t));
-int __db_c_del __P((DBC *, u_int32_t));
-int __db_c_dup __P((DBC *, DBC **, u_int32_t));
-int __db_c_idup __P((DBC *, DBC **, u_int32_t));
-int __db_c_newopd __P((DBC *, db_pgno_t, DBC *, DBC **));
-int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_duperr __P((DB *, u_int32_t));
-int __db_c_secondary_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __db_c_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __db_c_del_primary __P((DBC *));
-DB *__db_s_first __P((DB *));
-int __db_s_next __P((DB **));
-int __db_s_done __P((DB *));
-u_int32_t __db_partsize __P((u_int32_t, DBT *));
-int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *));
-int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *));
-void __db_metaswap __P((PAGE *));
-int __db_byteswap __P((DB_ENV *, DB *, db_pgno_t, PAGE *, size_t, int));
-int __db_dispatch __P((DB_ENV *, int (**)__P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)), size_t, DBT *, DB_LSN *, db_recops, void *));
-int __db_add_recovery __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t));
-int __db_txnlist_init __P((DB_ENV *, u_int32_t, u_int32_t, DB_LSN *, void *));
-int __db_txnlist_add __P((DB_ENV *, void *, u_int32_t, int32_t, DB_LSN *));
-int __db_txnlist_remove __P((DB_ENV *, void *, u_int32_t));
-void __db_txnlist_ckp __P((DB_ENV *, void *, DB_LSN *));
-void __db_txnlist_end __P((DB_ENV *, void *));
-int __db_txnlist_find __P((DB_ENV *, void *, u_int32_t));
-int __db_txnlist_update __P((DB_ENV *, void *, u_int32_t, u_int32_t, DB_LSN *));
-int __db_txnlist_gen __P((DB_ENV *, void *, int, u_int32_t, u_int32_t));
-int __db_txnlist_lsnadd __P((DB_ENV *, void *, DB_LSN *, u_int32_t));
-int __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *));
-int __db_add_limbo __P((DB_ENV *, void *, int32_t, db_pgno_t, int32_t));
-int __db_do_the_limbo __P((DB_ENV *, DB_TXN *, DB_TXN *, DB_TXNHEAD *));
-void __db_txnlist_print __P((void *));
-int __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t));
-int __db_pitem __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *));
-int __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int));
-int __db_cursorchk __P((const DB *, u_int32_t));
-int __db_ccountchk __P((const DB *, u_int32_t, int));
-int __db_cdelchk __P((const DB *, u_int32_t, int));
-int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
-int __db_cputchk __P((const DB *, const DBT *, DBT *, u_int32_t, int));
-int __db_pgetchk __P((const DB *, const DBT *, DBT *, DBT *, u_int32_t));
-int __db_cpgetchk __P((const DB *, DBT *, DBT *, DBT *, u_int32_t, int));
-int __db_delchk __P((const DB *, DBT *, u_int32_t));
-int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
-int __db_joinchk __P((const DB *, DBC * const *, u_int32_t));
-int __db_joingetchk __P((const DB *, DBT *, u_int32_t));
-int __db_putchk __P((const DB *, DBT *, const DBT *, u_int32_t, int));
-int __db_statchk __P((const DB *, u_int32_t));
-int __db_syncchk __P((const DB *, u_int32_t));
-int __db_secondary_corrupt __P((DB *));
-int __db_associatechk __P((DB *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __db_txn_auto __P((DB *, DB_TXN **));
-int __db_join __P((DB *, DBC **, DBC **, u_int32_t));
-int __db_new __P((DBC *, u_int32_t, PAGE **));
-int __db_free __P((DBC *, PAGE *));
-int __db_lprint __P((DBC *));
-int __db_lget __P((DBC *, int, db_pgno_t, db_lockmode_t, u_int32_t, DB_LOCK *));
-int __db_lput __P((DBC *, DB_LOCK *));
-int __dbh_am_chk __P((DB *, u_int32_t));
-int  __db_set_lorder __P((DB *, int));
-int __db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __db_dbopen __P((DB *, DB_TXN *, const char *, const char *, u_int32_t, int, db_pgno_t));
-int __db_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __db_init_subdb __P((DB *, DB *, const char *, DB_TXN *));
-int __db_chk_meta __P((DB_ENV *, DB *, DBMETA *, int));
-int __db_meta_setup __P((DB_ENV *, DB *, const char *, DBMETA *, u_int32_t, int));
-int __db_goff __P((DB *, DBT *, u_int32_t, db_pgno_t, void **, u_int32_t *));
-int __db_poff __P((DBC *, const DBT *, db_pgno_t *));
-int __db_ovref __P((DBC *, db_pgno_t, int32_t));
-int __db_doff __P((DBC *, db_pgno_t));
-int __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t, int (*)(DB *, const DBT *, const DBT *), int *));
-int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __db_vrfy_ovfl_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t));
-int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void **, u_int32_t));
-void __db_loadme __P((void));
-int __db_dump __P((DB *, char *, char *));
-void __db_inmemdbflags __P((u_int32_t, void *, void (*)(u_int32_t, const FN *, void *)));
-int __db_prnpage __P((DB *, db_pgno_t, FILE *));
-int __db_prpage __P((DB *, PAGE *, FILE *, u_int32_t));
-void __db_pr __P((u_int8_t *, u_int32_t, FILE *));
-int __db_prdbt __P((DBT *, int, const char *, void *, int (*)(void *, const void *), int, VRFY_DBINFO *));
-void __db_prflags __P((u_int32_t, const FN *, void *));
-const char * __db_dbtype_to_string __P((DBTYPE));
-int	__db_prheader __P((DB *, char *, int, int, void *, int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t));
-int __db_prfooter __P((void *, int (*)(void *, const void *)));
-int __db_addrem_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_big_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_ovref_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_relink_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_debug_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_noop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_alloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_pg_free_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_cksum_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __db_traverse_big __P((DB *, db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *));
-int __db_reclaim_callback __P((DB *, PAGE *, void *, int *));
-int __db_truncate_callback __P((DB *, PAGE *, void *, int *));
-int __dbenv_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
-int __db_remove __P((DB *, const char *, const char *, u_int32_t));
-int __db_remove_i __P((DB *, DB_TXN *, const char *, const char *));
-int __dbenv_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
-int __db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
-int __db_rename_i __P((DB *, DB_TXN *, const char *, const char *, const char *));
-int __db_ret __P((DB *, PAGE *, u_int32_t, DBT *, void **, u_int32_t *));
-int __db_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
-int __db_truncate __P((DB *, DB_TXN *, u_int32_t *, u_int32_t));
-int __db_upgrade __P((DB *, const char *, u_int32_t));
-int __db_lastpgno __P((DB *, char *, DB_FH *, db_pgno_t *));
-int __db_31_offdup __P((DB *, char *, DB_FH *, int, db_pgno_t *));
-int __db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
-int  __db_verify_callback __P((void *, const void *));
-int __db_verify_internal __P((DB *, const char *, const char *, void *, int (*)(void *, const void *), u_int32_t));
-int __db_vrfy_datapage __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __db_vrfy_meta __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t));
-void __db_vrfy_struct_feedback __P((DB *, VRFY_DBINFO *));
-int __db_vrfy_inpitem __P((DB *, PAGE *, db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *));
-int __db_vrfy_duptype __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t, DBT *, void *, int (*)(void *, const void *), u_int32_t));
-int __db_vrfy_dbinfo_create __P((DB_ENV *, u_int32_t, VRFY_DBINFO **));
-int __db_vrfy_dbinfo_destroy __P((DB_ENV *, VRFY_DBINFO *));
-int __db_vrfy_getpageinfo __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **));
-int __db_vrfy_putpageinfo __P((DB_ENV *, VRFY_DBINFO *, VRFY_PAGEINFO *));
-int __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **));
-int __db_vrfy_pgset_get __P((DB *, db_pgno_t, int *));
-int __db_vrfy_pgset_inc __P((DB *, db_pgno_t));
-int __db_vrfy_pgset_dec __P((DB *, db_pgno_t));
-int __db_vrfy_pgset_next __P((DBC *, db_pgno_t *));
-int __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **));
-int __db_vrfy_childput __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *));
-int __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **));
-int __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **));
-int __db_vrfy_ccclose __P((DBC *));
-int  __db_salvage_init __P((VRFY_DBINFO *));
-void  __db_salvage_destroy __P((VRFY_DBINFO *));
-int __db_salvage_getnext __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *));
-int __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t));
-int __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t));
-int __db_salvage_markneeded __P((VRFY_DBINFO *, db_pgno_t, u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_db_ext_h_ */
diff --git a/bdb/dbinc_auto/dbreg_ext.h b/bdb/dbinc_auto/dbreg_ext.h
deleted file mode 100644
index eda26206d86..00000000000
--- a/bdb/dbinc_auto/dbreg_ext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_dbreg_ext_h_
-#define	_dbreg_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __dbreg_setup __P((DB *, const char *, u_int32_t));
-int __dbreg_teardown __P((DB *));
-int __dbreg_new_id __P((DB *, DB_TXN *));
-int __dbreg_assign_id __P((DB *, int32_t));
-int __dbreg_revoke_id __P((DB *, int));
-int __dbreg_close_id __P((DB *, DB_TXN *));
-int __dbreg_register_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, const DBT *, int32_t, DBTYPE, db_pgno_t, u_int32_t));
-int __dbreg_register_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_register_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_register_read __P((DB_ENV *, void *, __dbreg_register_args **));
-int __dbreg_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __dbreg_register_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __dbreg_add_dbentry __P((DB_ENV *, DB_LOG *, DB *, int32_t));
-void __dbreg_rem_dbentry __P((DB_LOG *, int32_t));
-int __dbreg_open_files __P((DB_ENV *));
-int __dbreg_close_files __P((DB_ENV *));
-int __dbreg_nofiles __P((DB_ENV *));
-int __dbreg_id_to_db __P((DB_ENV *, DB_TXN *, DB **, int32_t, int));
-int __dbreg_id_to_db_int __P((DB_ENV *, DB_TXN *, DB **, int32_t, int, int));
-int __dbreg_id_to_fname __P((DB_LOG *, int32_t, int, FNAME **));
-int __dbreg_fid_to_fname __P((DB_LOG *, u_int8_t *, int, FNAME **));
-int __dbreg_get_name __P((DB_ENV *, u_int8_t *, char **));
-int __dbreg_do_open __P((DB_ENV *, DB_TXN *, DB_LOG *, u_int8_t *, char *, DBTYPE, int32_t, db_pgno_t, void *, u_int32_t));
-int __dbreg_lazy_id __P((DB *));
-int __dbreg_push_id __P((DB_ENV *, int32_t));
-int __dbreg_pop_id __P((DB_ENV *, int32_t *));
-int __dbreg_pluck_id __P((DB_ENV *, int32_t));
-void __dbreg_print_dblist __P((DB_ENV *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_dbreg_ext_h_ */
diff --git a/bdb/dbinc_auto/env_ext.h b/bdb/dbinc_auto/env_ext.h
deleted file mode 100644
index 4bd0eee4a83..00000000000
--- a/bdb/dbinc_auto/env_ext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_env_ext_h_
-#define	_env_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __db_shalloc_init __P((void *, size_t));
-int __db_shalloc_size __P((size_t, size_t));
-int __db_shalloc __P((void *, size_t, size_t, void *));
-void __db_shalloc_free __P((void *, void *));
-size_t __db_shsizeof __P((void *));
-void __db_shalloc_dump __P((void *, FILE *));
-int __db_tablesize __P((u_int32_t));
-void __db_hashinit __P((void *, u_int32_t));
-int __db_fileinit __P((DB_ENV *, DB_FH *, size_t, int));
-int __db_overwrite __P((DB_ENV *, const char *));
-int __db_mi_env __P((DB_ENV *, const char *));
-int __db_mi_open __P((DB_ENV *, const char *, int));
-int __db_env_config __P((DB_ENV *, char *, u_int32_t));
-int __dbenv_open __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbenv_remove __P((DB_ENV *, const char *, u_int32_t));
-int __dbenv_close __P((DB_ENV *, u_int32_t));
-int __db_appname __P((DB_ENV *, APPNAME, const char *, u_int32_t, DB_FH *, char **));
-int __db_home __P((DB_ENV *, const char *, u_int32_t));
-int __db_apprec __P((DB_ENV *, DB_LSN *, u_int32_t));
-int __env_openfiles __P((DB_ENV *, DB_LOGC *, void *, DBT *, DB_LSN *, DB_LSN *, double, int));
-int __db_e_attach __P((DB_ENV *, u_int32_t *));
-int __db_e_detach __P((DB_ENV *, int));
-int __db_e_remove __P((DB_ENV *, u_int32_t));
-int __db_e_stat __P((DB_ENV *, REGENV *, REGION *, int *, u_int32_t));
-int __db_r_attach __P((DB_ENV *, REGINFO *, size_t));
-int __db_r_detach __P((DB_ENV *, REGINFO *, int));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_env_ext_h_ */
diff --git a/bdb/dbinc_auto/ext_185_def.in b/bdb/dbinc_auto/ext_185_def.in
deleted file mode 100644
index 8da68a8df9d..00000000000
--- a/bdb/dbinc_auto/ext_185_def.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_185_DEF_IN_
-#define	_DB_EXT_185_DEF_IN_
-
-#ifdef _DB185_INT_H_
-#define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
-#else
-#define	__db185_open __db185_open@DB_VERSION_UNIQUE_NAME@
-#endif
-
-#endif /* !_DB_EXT_185_DEF_IN_ */
diff --git a/bdb/dbinc_auto/ext_185_prot.in b/bdb/dbinc_auto/ext_185_prot.in
deleted file mode 100644
index dfd8d3d476e..00000000000
--- a/bdb/dbinc_auto/ext_185_prot.in
+++ /dev/null
@@ -1,19 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_185_PROT_IN_
-#define	_DB_EXT_185_PROT_IN_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifdef _DB185_INT_H_
-DB185 *__db185_open __P((const char *, int, int, DBTYPE, const void *));
-#else
-DB *__db185_open __P((const char *, int, int, DBTYPE, const void *));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_EXT_185_PROT_IN_ */
diff --git a/bdb/dbinc_auto/ext_def.in b/bdb/dbinc_auto/ext_def.in
deleted file mode 100644
index 7bef2465645..00000000000
--- a/bdb/dbinc_auto/ext_def.in
+++ /dev/null
@@ -1,61 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_DEF_IN_
-#define	_DB_EXT_DEF_IN_
-
-#define	db_create db_create@DB_VERSION_UNIQUE_NAME@
-#define	db_strerror db_strerror@DB_VERSION_UNIQUE_NAME@
-#define	db_env_create db_env_create@DB_VERSION_UNIQUE_NAME@
-#define	db_version db_version@DB_VERSION_UNIQUE_NAME@
-#define	log_compare log_compare@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_close db_env_set_func_close@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_dirfree db_env_set_func_dirfree@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_dirlist db_env_set_func_dirlist@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_exists db_env_set_func_exists@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_free db_env_set_func_free@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_fsync db_env_set_func_fsync@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_ioinfo db_env_set_func_ioinfo@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_malloc db_env_set_func_malloc@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_map db_env_set_func_map@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_open db_env_set_func_open@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_read db_env_set_func_read@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_realloc db_env_set_func_realloc@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_rename db_env_set_func_rename@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_seek db_env_set_func_seek@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_sleep db_env_set_func_sleep@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_unlink db_env_set_func_unlink@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_unmap db_env_set_func_unmap@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_write db_env_set_func_write@DB_VERSION_UNIQUE_NAME@
-#define	db_env_set_func_yield db_env_set_func_yield@DB_VERSION_UNIQUE_NAME@
-#if DB_DBM_HSEARCH != 0
-#define	__db_ndbm_clearerr __db_ndbm_clearerr@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_close __db_ndbm_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_delete __db_ndbm_delete@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_dirfno __db_ndbm_dirfno@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_error __db_ndbm_error@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_fetch __db_ndbm_fetch@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_firstkey __db_ndbm_firstkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_nextkey __db_ndbm_nextkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_open __db_ndbm_open@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_pagfno __db_ndbm_pagfno@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_rdonly __db_ndbm_rdonly@DB_VERSION_UNIQUE_NAME@
-#define	__db_ndbm_store __db_ndbm_store@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_close __db_dbm_close@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_dbrdonly __db_dbm_dbrdonly@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_delete __db_dbm_delete@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_dirf __db_dbm_dirf@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_fetch __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_init __db_dbm_init@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_nextkey __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_pagf __db_dbm_pagf@DB_VERSION_UNIQUE_NAME@
-#define	__db_dbm_store __db_dbm_store@DB_VERSION_UNIQUE_NAME@
-#endif
-#if DB_DBM_HSEARCH != 0
-#define	__db_hcreate __db_hcreate@DB_VERSION_UNIQUE_NAME@
-#define	__db_hsearch __db_hsearch@DB_VERSION_UNIQUE_NAME@
-#define	__db_hdestroy __db_hdestroy@DB_VERSION_UNIQUE_NAME@
-#endif
-#define db_xa_switch db_xa_switch@DB_VERSION_UNIQUE_NAME@
-
-#endif /* !_DB_EXT_DEF_IN_ */
diff --git a/bdb/dbinc_auto/ext_prot.in b/bdb/dbinc_auto/ext_prot.in
deleted file mode 100644
index 42c77a1f763..00000000000
--- a/bdb/dbinc_auto/ext_prot.in
+++ /dev/null
@@ -1,70 +0,0 @@
-
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_DB_EXT_PROT_IN_
-#define	_DB_EXT_PROT_IN_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int db_create __P((DB **, DB_ENV *, u_int32_t));
-char *db_strerror __P((int));
-int db_env_create __P((DB_ENV **, u_int32_t));
-char *db_version __P((int *, int *, int *));
-int log_compare __P((const DB_LSN *, const DB_LSN *));
-int db_env_set_func_close __P((int (*)(int)));
-int db_env_set_func_dirfree __P((void (*)(char **, int)));
-int db_env_set_func_dirlist __P((int (*)(const char *, char ***, int *)));
-int db_env_set_func_exists __P((int (*)(const char *, int *)));
-int db_env_set_func_free __P((void (*)(void *)));
-int db_env_set_func_fsync __P((int (*)(int)));
-int db_env_set_func_ioinfo __P((int (*)(const char *, int, u_int32_t *, u_int32_t *, u_int32_t *)));
-int db_env_set_func_malloc __P((void *(*)(size_t)));
-int db_env_set_func_map __P((int (*)(char *, size_t, int, int, void **)));
-int db_env_set_func_open __P((int (*)(const char *, int, ...)));
-int db_env_set_func_read __P((ssize_t (*)(int, void *, size_t)));
-int db_env_set_func_realloc __P((void *(*)(void *, size_t)));
-int db_env_set_func_rename __P((int (*)(const char *, const char *)));
-int db_env_set_func_seek __P((int (*)(int, size_t, db_pgno_t, u_int32_t, int, int)));
-int db_env_set_func_sleep __P((int (*)(u_long, u_long)));
-int db_env_set_func_unlink __P((int (*)(const char *)));
-int db_env_set_func_unmap __P((int (*)(void *, size_t)));
-int db_env_set_func_write __P((ssize_t (*)(int, const void *, size_t)));
-int db_env_set_func_yield __P((int (*)(void)));
-int txn_abort __P((DB_TXN *));
-int txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int txn_commit __P((DB_TXN *, u_int32_t));
-#if DB_DBM_HSEARCH != 0
-int	 __db_ndbm_clearerr __P((DBM *));
-void	 __db_ndbm_close __P((DBM *));
-int	 __db_ndbm_delete __P((DBM *, datum));
-int	 __db_ndbm_dirfno __P((DBM *));
-int	 __db_ndbm_error __P((DBM *));
-datum __db_ndbm_fetch __P((DBM *, datum));
-datum __db_ndbm_firstkey __P((DBM *));
-datum __db_ndbm_nextkey __P((DBM *));
-DBM	*__db_ndbm_open __P((const char *, int, int));
-int	 __db_ndbm_pagfno __P((DBM *));
-int	 __db_ndbm_rdonly __P((DBM *));
-int	 __db_ndbm_store __P((DBM *, datum, datum, int));
-int	 __db_dbm_close __P((void));
-int	 __db_dbm_dbrdonly __P((void));
-int	 __db_dbm_delete __P((datum));
-int	 __db_dbm_dirf __P((void));
-datum __db_dbm_fetch __P((datum));
-datum __db_dbm_firstkey __P((void));
-int	 __db_dbm_init __P((char *));
-datum __db_dbm_nextkey __P((datum));
-int	 __db_dbm_pagf __P((void));
-int	 __db_dbm_store __P((datum, datum));
-#endif
-#if DB_DBM_HSEARCH != 0
-int __db_hcreate __P((size_t));
-ENTRY *__db_hsearch __P((ENTRY, ACTION));
-void __db_hdestroy __P((void));
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_DB_EXT_PROT_IN_ */
diff --git a/bdb/dbinc_auto/fileops_ext.h b/bdb/dbinc_auto/fileops_ext.h
deleted file mode 100644
index 66d80e60ad9..00000000000
--- a/bdb/dbinc_auto/fileops_ext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_fileops_ext_h_
-#define	_fileops_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __fop_create_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t));
-int __fop_create_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_create_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_create_read __P((DB_ENV *, void *, __fop_create_args **));
-int __fop_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, u_int32_t));
-int __fop_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_read __P((DB_ENV *, void *, __fop_remove_args **));
-int __fop_write_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, u_int32_t, u_int32_t, const DBT *, u_int32_t));
-int __fop_write_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_read __P((DB_ENV *, void *, __fop_write_args **));
-int __fop_rename_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t));
-int __fop_rename_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_read __P((DB_ENV *, void *, __fop_rename_args **));
-int __fop_file_remove_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, const DBT *, const DBT *, const DBT *, u_int32_t, u_int32_t));
-int __fop_file_remove_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_read __P((DB_ENV *, void *, __fop_file_remove_args **));
-int __fop_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __fop_create __P((DB_ENV *, DB_TXN *, DB_FH *, const char *, APPNAME, int));
-int __fop_remove __P((DB_ENV *, DB_TXN *, u_int8_t *, const char *, APPNAME));
-int __fop_write __P((DB_ENV *, DB_TXN *, const char *, APPNAME, DB_FH *, u_int32_t, u_int8_t *, u_int32_t, u_int32_t));
-int __fop_rename __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int8_t *, APPNAME));
-int __fop_create_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_write_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_rename_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_file_remove_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __fop_lock_handle __P((DB_ENV *, DB *, u_int32_t, db_lockmode_t, DB_LOCK *, u_int32_t));
-int __fop_file_setup __P((DB *, DB_TXN *, const char *, int, u_int32_t, u_int32_t *));
-int __fop_subdb_setup __P((DB *, DB_TXN *, const char *, const char *, int, u_int32_t));
-int __fop_remove_setup __P((DB *, DB_TXN *, const char *, u_int32_t));
-int __fop_read_meta __P((DB_ENV *, const char *, u_int8_t *, size_t, DB_FH *, int, u_int32_t));
-int __fop_dummy __P((DB *, DB_TXN *, const char *, const char *, u_int32_t));
-int __fop_dbrename __P((DB *, const char *, const char *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_fileops_ext_h_ */
diff --git a/bdb/dbinc_auto/hash_ext.h b/bdb/dbinc_auto/hash_ext.h
deleted file mode 100644
index 1ee2398706f..00000000000
--- a/bdb/dbinc_auto/hash_ext.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_hash_ext_h_
-#define	_hash_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __ham_quick_delete __P((DBC *));
-int __ham_c_init __P((DBC *));
-int __ham_c_count __P((DBC *, db_recno_t *));
-int __ham_c_dup __P((DBC *, DBC *));
-u_int32_t __ham_call_hash __P((DBC *, u_int8_t *, int32_t));
-int __ham_init_dbt __P((DB_ENV *, DBT *, u_int32_t, void **, u_int32_t *));
-int __ham_c_update __P((DBC *, u_int32_t, int, int));
-int __ham_get_clist __P((DB *, db_pgno_t, u_int32_t, DBC ***));
-int __ham_insdel_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, const DBT *, const DBT *));
-int __ham_insdel_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_insdel_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_insdel_read __P((DB_ENV *, void *, __ham_insdel_args **));
-int __ham_newpage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *));
-int __ham_newpage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_read __P((DB_ENV *, void *, __ham_newpage_args **));
-int __ham_splitdata_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, const DBT *, DB_LSN *));
-int __ham_splitdata_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_read __P((DB_ENV *, void *, __ham_splitdata_args **));
-int __ham_replace_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, DB_LSN *, int32_t, const DBT *, const DBT *, u_int32_t));
-int __ham_replace_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_read __P((DB_ENV *, void *, __ham_replace_args **));
-int __ham_copypage_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, const DBT *));
-int __ham_copypage_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_read __P((DB_ENV *, void *, __ham_copypage_args **));
-int __ham_metagroup_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, db_pgno_t, DB_LSN *, u_int32_t));
-int __ham_metagroup_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_read __P((DB_ENV *, void *, __ham_metagroup_args **));
-int __ham_groupalloc_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_pgno_t));
-int __ham_groupalloc_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_read __P((DB_ENV *, void *, __ham_groupalloc_args **));
-int __ham_curadj_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t, u_int32_t, int, int, u_int32_t));
-int __ham_curadj_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_read __P((DB_ENV *, void *, __ham_curadj_args **));
-int __ham_chgpg_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_ham_mode, db_pgno_t, db_pgno_t, u_int32_t, u_int32_t));
-int __ham_chgpg_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_read __P((DB_ENV *, void *, __ham_chgpg_args **));
-int __ham_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __ham_pgin __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __ham_pgout __P((DB_ENV *, DB *, db_pgno_t, void *, DBT *));
-int __ham_mswap __P((void *));
-int __ham_add_dup __P((DBC *, DBT *, u_int32_t, db_pgno_t *));
-int __ham_dup_convert __P((DBC *));
-int __ham_make_dup __P((DB_ENV *, const DBT *, DBT *d, void **, u_int32_t *));
-void __ham_dsearch __P((DBC *, DBT *, u_int32_t *, int *, u_int32_t));
-void __ham_cprint __P((DBC *));
-u_int32_t __ham_func2 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func3 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func4 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_func5 __P((DB *, const void *, u_int32_t));
-u_int32_t __ham_test __P((DB *, const void *, u_int32_t));
-int __ham_get_meta __P((DBC *));
-int __ham_release_meta __P((DBC *));
-int __ham_dirty_meta __P((DBC *));
-int __ham_db_create __P((DB *));
-int __ham_db_close __P((DB *));
-int __ham_open __P((DB *, DB_TXN *, const char * name, db_pgno_t, u_int32_t));
-int __ham_metachk __P((DB *, const char *, HMETA *));
-int __ham_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __ham_new_subdb __P((DB *, DB *, DB_TXN *));
-int __ham_item __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_reset __P((DBC *));
-void __ham_item_init __P((DBC *));
-int __ham_item_last __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_first __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_prev __P((DBC *, db_lockmode_t, db_pgno_t *));
-int __ham_item_next __P((DBC *, db_lockmode_t, db_pgno_t *));
-void __ham_putitem __P((DB *, PAGE *p, const DBT *, int));
-void __ham_reputpair  __P((DB *, PAGE *, u_int32_t, const DBT *, const DBT *));
-int __ham_del_pair __P((DBC *, int));
-int __ham_replpair __P((DBC *, DBT *, u_int32_t));
-void __ham_onpage_replace __P((DB *, PAGE *, u_int32_t, int32_t, int32_t,  DBT *));
-int __ham_split_page __P((DBC *, u_int32_t, u_int32_t));
-int __ham_add_el __P((DBC *, const DBT *, const DBT *, int));
-void __ham_copy_item __P((DB *, PAGE *, u_int32_t, PAGE *));
-int __ham_add_ovflpage __P((DBC *, PAGE *, int, PAGE **));
-int __ham_get_cpage __P((DBC *, db_lockmode_t));
-int __ham_next_cpage __P((DBC *, db_pgno_t, int));
-int __ham_lock_bucket __P((DBC *, db_lockmode_t));
-void __ham_dpair __P((DB *, PAGE *, u_int32_t));
-int __ham_insdel_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_newpage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_replace_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_splitdata_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_copypage_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_metagroup_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_groupalloc_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_curadj_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_chgpg_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __ham_reclaim __P((DB *, DB_TXN *txn));
-int __ham_truncate __P((DB *, DB_TXN *txn, u_int32_t *));
-int __ham_stat __P((DB *, void *, u_int32_t));
-int __ham_traverse __P((DBC *, db_lockmode_t, int (*)(DB *, PAGE *, void *, int *), void *, int));
-int __ham_30_hashmeta __P((DB *, char *, u_int8_t *));
-int __ham_30_sizefix __P((DB *, DB_FH *, char *, u_int8_t *));
-int __ham_31_hashmeta __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __ham_31_hash __P((DB *, char *, u_int32_t, DB_FH *, PAGE *, int *));
-int __ham_vrfy_meta __P((DB *, VRFY_DBINFO *, HMETA *, db_pgno_t, u_int32_t));
-int __ham_vrfy __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t));
-int __ham_vrfy_structure __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t));
-int __ham_vrfy_hashing __P((DB *, u_int32_t, HMETA *, u_int32_t, db_pgno_t, u_int32_t, u_int32_t (*) __P((DB *, const void *, u_int32_t))));
-int __ham_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *, void *, int (*)(void *, const void *), u_int32_t));
-int __ham_meta2pgset __P((DB *, VRFY_DBINFO *, HMETA *, u_int32_t, DB *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_hash_ext_h_ */
diff --git a/bdb/dbinc_auto/hmac_ext.h b/bdb/dbinc_auto/hmac_ext.h
deleted file mode 100644
index d161a7291f4..00000000000
--- a/bdb/dbinc_auto/hmac_ext.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_hmac_ext_h_
-#define	_hmac_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __db_chksum __P((u_int8_t *, size_t, u_int8_t *, u_int8_t *));
-void __db_derive_mac __P((u_int8_t *, size_t, u_int8_t *));
-int __db_check_chksum __P((DB_ENV *, DB_CIPHER *, u_int8_t *, void *, size_t, int));
-void __db_SHA1Transform __P((u_int32_t *, unsigned char *));
-void __db_SHA1Init __P((SHA1_CTX *));
-void __db_SHA1Update __P((SHA1_CTX *, unsigned char *, size_t));
-void __db_SHA1Final __P((unsigned char *, SHA1_CTX *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_hmac_ext_h_ */
diff --git a/bdb/dbinc_auto/lock_ext.h b/bdb/dbinc_auto/lock_ext.h
deleted file mode 100644
index be6b1d06d1e..00000000000
--- a/bdb/dbinc_auto/lock_ext.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_lock_ext_h_
-#define	_lock_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __lock_id __P((DB_ENV *, u_int32_t *));
-int __lock_id_free __P((DB_ENV *, u_int32_t));
-int __lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-int __lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int  __lock_put __P((DB_ENV *, DB_LOCK *));
-int __lock_downgrade __P((DB_ENV *, DB_LOCK *, db_lockmode_t, u_int32_t));
-int __lock_addfamilylocker __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_freefamilylocker  __P((DB_LOCKTAB *, u_int32_t));
-int __lock_set_timeout __P(( DB_ENV *, u_int32_t, db_timeout_t, u_int32_t));
-int __lock_inherit_timeout __P(( DB_ENV *, u_int32_t, u_int32_t));
-int __lock_getlocker __P((DB_LOCKTAB *, u_int32_t, u_int32_t, int, DB_LOCKER **));
-int __lock_promote __P((DB_LOCKTAB *, DB_LOCKOBJ *, u_int32_t));
-int __lock_expired __P((DB_ENV *, db_timeval_t *, db_timeval_t *));
-int __lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
-void __lock_dbenv_create __P((DB_ENV *));
-void __lock_dbenv_close __P((DB_ENV *));
-int __lock_open __P((DB_ENV *));
-int __lock_dbenv_refresh __P((DB_ENV *));
-void __lock_region_destroy __P((DB_ENV *, REGINFO *));
-int __lock_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-int __lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-int __lock_dump_region __P((DB_ENV *, char *, FILE *));
-void __lock_printlock __P((DB_LOCKTAB *, struct __db_lock *, int));
-int __lock_cmp __P((const DBT *, DB_LOCKOBJ *));
-int __lock_locker_cmp __P((u_int32_t, DB_LOCKER *));
-u_int32_t __lock_ohash __P((const DBT *));
-u_int32_t __lock_lhash __P((DB_LOCKOBJ *));
-u_int32_t __lock_locker_hash __P((u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_lock_ext_h_ */
diff --git a/bdb/dbinc_auto/log_ext.h b/bdb/dbinc_auto/log_ext.h
deleted file mode 100644
index 6fc69afd2b4..00000000000
--- a/bdb/dbinc_auto/log_ext.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_log_ext_h_
-#define	_log_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __log_open __P((DB_ENV *));
-int __log_find __P((DB_LOG *, int, u_int32_t *, logfile_validity *));
-int __log_valid __P((DB_LOG *, u_int32_t, int, logfile_validity *));
-int __log_dbenv_refresh __P((DB_ENV *));
-int __log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-void __log_get_cached_ckp_lsn __P((DB_ENV *, DB_LSN *));
-void __log_region_destroy __P((DB_ENV *, REGINFO *));
-int __log_vtruncate __P((DB_ENV *, DB_LSN *, DB_LSN *));
-int __log_is_outdated __P((DB_ENV *dbenv, u_int32_t fnum, int *outdatedp));
-int __log_archive __P((DB_ENV *, char **[], u_int32_t));
-int __log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
-void __log_dbenv_create __P((DB_ENV *));
-int __log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-void __log_txn_lsn __P((DB_ENV *, DB_LSN *, u_int32_t *, u_int32_t *));
-int __log_newfile __P((DB_LOG *, DB_LSN *));
-int __log_flush __P((DB_ENV *, const DB_LSN *));
-int __log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
-int __log_name __P((DB_LOG *, u_int32_t, char **, DB_FH *, u_int32_t));
-int __log_rep_put __P((DB_ENV *, DB_LSN *, const DBT *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_log_ext_h_ */
diff --git a/bdb/dbinc_auto/mp_ext.h b/bdb/dbinc_auto/mp_ext.h
deleted file mode 100644
index ceadb3d9adc..00000000000
--- a/bdb/dbinc_auto/mp_ext.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_mp_ext_h_
-#define	_mp_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __memp_alloc __P((DB_MPOOL *, REGINFO *, MPOOLFILE *, size_t, roff_t *, void *));
-#ifdef DIAGNOSTIC
-void __memp_check_order __P((DB_MPOOL_HASH *));
-#endif
-int __memp_bhwrite __P((DB_MPOOL *, DB_MPOOL_HASH *, MPOOLFILE *, BH *, int));
-int __memp_pgread __P((DB_MPOOLFILE *, DB_MUTEX *, BH *, int));
-int __memp_pg __P((DB_MPOOLFILE *, BH *, int));
-void __memp_bhfree __P((DB_MPOOL *, DB_MPOOL_HASH *, BH *, int));
-int __memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void *));
-int __memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-int __memp_fopen_int __P((DB_MPOOLFILE *, MPOOLFILE *, const char *, u_int32_t, int, size_t));
-int __memp_fclose_int __P((DB_MPOOLFILE *, u_int32_t));
-int __memp_mf_discard __P((DB_MPOOL *, MPOOLFILE *));
-char * __memp_fn __P((DB_MPOOLFILE *));
-char * __memp_fns __P((DB_MPOOL *, MPOOLFILE *));
-int __memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t));
-int __memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t));
-void __memp_dbenv_create __P((DB_ENV *));
-int __memp_open __P((DB_ENV *));
-int __memp_dbenv_refresh __P((DB_ENV *));
-void __mpool_region_destroy __P((DB_ENV *, REGINFO *));
-int  __memp_nameop __P((DB_ENV *, u_int8_t *, const char *, const char *, const char *));
-int __memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
-int __memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-int __memp_dump_region __P((DB_ENV *, char *, FILE *));
-void __memp_stat_hash __P((REGINFO *, MPOOL *, u_int32_t *));
-int __memp_sync __P((DB_ENV *, DB_LSN *));
-int __memp_fsync __P((DB_MPOOLFILE *));
-int __mp_xxx_fh __P((DB_MPOOLFILE *, DB_FH **));
-int __memp_sync_int __P((DB_ENV *, DB_MPOOLFILE *, int, db_sync_op, int *));
-int __memp_trickle __P((DB_ENV *, int, int *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_mp_ext_h_ */
diff --git a/bdb/dbinc_auto/mutex_ext.h b/bdb/dbinc_auto/mutex_ext.h
deleted file mode 100644
index a40f04d5578..00000000000
--- a/bdb/dbinc_auto/mutex_ext.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_mutex_ext_h_
-#define	_mutex_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_fcntl_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_fcntl_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_fcntl_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_fcntl_mutex_destroy __P((DB_MUTEX *));
-int __db_pthread_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_pthread_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_pthread_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_pthread_mutex_destroy __P((DB_MUTEX *));
-int __db_tas_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_tas_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_tas_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_tas_mutex_destroy __P((DB_MUTEX *));
-int __db_win32_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t));
-int __db_win32_mutex_lock __P((DB_ENV *, DB_MUTEX *));
-int __db_win32_mutex_unlock __P((DB_ENV *, DB_MUTEX *));
-int __db_win32_mutex_destroy __P((DB_MUTEX *));
-int __db_mutex_setup __P((DB_ENV *, REGINFO *, void *, u_int32_t));
-void __db_mutex_free __P((DB_ENV *, REGINFO *, DB_MUTEX *));
-void __db_shreg_locks_clear __P((DB_MUTEX *, REGINFO *, REGMAINT *));
-void __db_shreg_locks_destroy __P((REGINFO *, REGMAINT *));
-int __db_shreg_mutex_init __P((DB_ENV *, DB_MUTEX *, u_int32_t, u_int32_t, REGINFO *, REGMAINT *));
-void __db_shreg_maintinit __P((REGINFO *, void *addr, size_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_mutex_ext_h_ */
diff --git a/bdb/dbinc_auto/os_ext.h b/bdb/dbinc_auto/os_ext.h
deleted file mode 100644
index 0a2e5ab2054..00000000000
--- a/bdb/dbinc_auto/os_ext.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_os_ext_h_
-#define	_os_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __os_abspath __P((const char *));
-int __os_umalloc __P((DB_ENV *, size_t, void *));
-int __os_urealloc __P((DB_ENV *, size_t, void *));
-int __os_ufree __P((DB_ENV *, void *));
-int __os_strdup __P((DB_ENV *, const char *, void *));
-int __os_calloc __P((DB_ENV *, size_t, size_t, void *));
-int __os_malloc __P((DB_ENV *, size_t, void *));
-int __os_realloc __P((DB_ENV *, size_t, void *));
-void __os_free __P((DB_ENV *, void *));
-void *__ua_memcpy __P((void *, const void *, size_t));
-int __os_clock __P((DB_ENV *, u_int32_t *, u_int32_t *));
-int __os_fs_notzero __P((void));
-int __os_dirlist __P((DB_ENV *, const char *, char ***, int *));
-void __os_dirfree __P((DB_ENV *, char **, int));
-int __os_get_errno_ret_zero __P((void));
-int __os_get_errno __P((void));
-void __os_set_errno __P((int));
-int __os_fileid __P((DB_ENV *, const char *, int, u_int8_t *));
-int __os_fsync __P((DB_ENV *, DB_FH *));
-int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
-int __os_closehandle __P((DB_ENV *, DB_FH *));
-void __os_id __P((u_int32_t *));
-int __os_r_sysattach __P((DB_ENV *, REGINFO *, REGION *));
-int __os_r_sysdetach __P((DB_ENV *, REGINFO *, int));
-int __os_mapfile __P((DB_ENV *, char *, DB_FH *, size_t, int, void **));
-int __os_unmapfile __P((DB_ENV *, void *, size_t));
-u_int32_t __db_oflags __P((int));
-int __db_omode __P((const char *));
-int __os_open __P((DB_ENV *, const char *, u_int32_t, int, DB_FH *));
-#ifdef HAVE_QNX
-int __os_shmname __P((DB_ENV *, const char *, char **));
-#endif
-int __os_r_attach __P((DB_ENV *, REGINFO *, REGION *));
-int __os_r_detach __P((DB_ENV *, REGINFO *, int));
-int __os_rename __P((DB_ENV *, const char *, const char *, u_int32_t));
-int __os_isroot __P((void));
-char *__db_rpath __P((const char *));
-int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_seek __P((DB_ENV *, DB_FH *, size_t, db_pgno_t, u_int32_t, int, DB_OS_SEEK));
-int __os_sleep __P((DB_ENV *, u_long, u_long));
-int __os_spin __P((DB_ENV *));
-void __os_yield __P((DB_ENV*, u_long));
-int __os_exists __P((const char *, int *));
-int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-int __os_tmpdir __P((DB_ENV *, u_int32_t));
-int __os_region_unlink __P((DB_ENV *, const char *));
-int __os_unlink __P((DB_ENV *, const char *));
-#if defined(DB_WIN32)
-int __os_win32_errno __P((void));
-#endif
-int __os_fsync __P((DB_ENV *, DB_FH *));
-int __os_openhandle __P((DB_ENV *, const char *, int, int, DB_FH *));
-int __os_closehandle __P((DB_ENV *, DB_FH *));
-int __os_io __P((DB_ENV *, DB_IO *, int, size_t *));
-int __os_read __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_write __P((DB_ENV *, DB_FH *, void *, size_t, size_t *));
-int __os_exists __P((const char *, int *));
-int __os_ioinfo __P((DB_ENV *, const char *, DB_FH *, u_int32_t *, u_int32_t *, u_int32_t *));
-int __os_is_winnt __P((void));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_os_ext_h_ */
diff --git a/bdb/dbinc_auto/qam_ext.h b/bdb/dbinc_auto/qam_ext.h
deleted file mode 100644
index 16dbea79e4c..00000000000
--- a/bdb/dbinc_auto/qam_ext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_qam_ext_h_
-#define	_qam_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __qam_position __P((DBC *, db_recno_t *, qam_position_mode, int *));
-int __qam_pitem __P((DBC *,  QPAGE *, u_int32_t, db_recno_t, DBT *));
-int __qam_append __P((DBC *, DBT *, DBT *));
-int __qam_c_dup __P((DBC *, DBC *));
-int __qam_c_init __P((DBC *));
-int __qam_truncate __P((DB *, DB_TXN *, u_int32_t *));
-int __qam_incfirst_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, db_recno_t, db_pgno_t));
-int __qam_incfirst_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_incfirst_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_incfirst_read __P((DB_ENV *, void *, __qam_incfirst_args **));
-int __qam_mvptr_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, db_recno_t, db_recno_t, db_recno_t, db_recno_t, DB_LSN *, db_pgno_t));
-int __qam_mvptr_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_read __P((DB_ENV *, void *, __qam_mvptr_args **));
-int __qam_del_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t));
-int __qam_del_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_read __P((DB_ENV *, void *, __qam_del_args **));
-int __qam_add_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *, u_int32_t, const DBT *));
-int __qam_add_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_read __P((DB_ENV *, void *, __qam_add_args **));
-int __qam_delext_log __P((DB *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, db_pgno_t, u_int32_t, db_recno_t, const DBT *));
-int __qam_delext_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_read __P((DB_ENV *, void *, __qam_delext_args **));
-int __qam_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __qam_mswap __P((PAGE *));
-int __qam_pgin_out __P((DB_ENV *, db_pgno_t, void *, DBT *));
-int __qam_fprobe __P((DB *, db_pgno_t, void *, qam_probe_mode, u_int32_t));
-int __qam_fclose __P((DB *, db_pgno_t));
-int __qam_fremove __P((DB *, db_pgno_t));
-int __qam_sync __P((DB *, u_int32_t));
-int __qam_gen_filelist __P(( DB *, QUEUE_FILELIST **));
-int __qam_extent_names __P((DB_ENV *, char *, char ***));
-void __qam_exid __P((DB *, u_int8_t *, u_int32_t));
-int __qam_db_create __P((DB *));
-int __qam_db_close __P((DB *));
-int __db_prqueue __P((DB *, FILE *, u_int32_t));
-int __qam_remove __P((DB *, DB_TXN *, const char *, const char *, DB_LSN *));
-int __qam_rename __P((DB *, DB_TXN *, const char *, const char *, const char *));
-int __qam_open __P((DB *, DB_TXN *, const char *, db_pgno_t, int, u_int32_t));
-int __qam_metachk __P((DB *, const char *, QMETA *));
-int __qam_new_file __P((DB *, DB_TXN *, DB_FH *, const char *));
-int __qam_incfirst_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_mvptr_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_del_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_delext_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_add_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __qam_stat __P((DB *, void *, u_int32_t));
-int __qam_31_qammeta __P((DB *, char *, u_int8_t *));
-int __qam_32_qammeta __P((DB *, char *, u_int8_t *));
-int __qam_vrfy_meta __P((DB *, VRFY_DBINFO *, QMETA *, db_pgno_t, u_int32_t));
-int __qam_vrfy_data __P((DB *, VRFY_DBINFO *, QPAGE *, db_pgno_t, u_int32_t));
-int __qam_vrfy_structure __P((DB *, VRFY_DBINFO *, u_int32_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_qam_ext_h_ */
diff --git a/bdb/dbinc_auto/rep_ext.h b/bdb/dbinc_auto/rep_ext.h
deleted file mode 100644
index 22e2d254fe8..00000000000
--- a/bdb/dbinc_auto/rep_ext.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rep_ext_h_
-#define	_rep_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __rep_dbenv_create __P((DB_ENV *));
-int __rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
-int __rep_process_txn __P((DB_ENV *, DBT *));
-int __rep_region_init __P((DB_ENV *));
-int __rep_region_destroy __P((DB_ENV *));
-int __rep_dbenv_close __P((DB_ENV *));
-int __rep_preclose __P((DB_ENV *, int));
-int __rep_check_alloc __P((DB_ENV *, TXN_RECS *, int));
-int __rep_send_message __P((DB_ENV *, int, u_int32_t, DB_LSN *, const DBT *, u_int32_t));
-int __rep_new_master __P((DB_ENV *, REP_CONTROL *, int));
-int __rep_lockpgno_init __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __rep_unlockpages __P((DB_ENV *, u_int32_t));
-int __rep_lockpages __P((DB_ENV *, int (**)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t, DB_LSN *, DB_LSN *, TXN_RECS *, u_int32_t));
-int __rep_is_client __P((DB_ENV *));
-int __rep_send_vote __P((DB_ENV *, DB_LSN *, int, int, int));
-int __rep_grow_sites __P((DB_ENV *dbenv, int nsites));
-void __rep_print_message __P((DB_ENV *, int, REP_CONTROL *, char *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rep_ext_h_ */
diff --git a/bdb/dbinc_auto/rpc_client_ext.h b/bdb/dbinc_auto/rpc_client_ext.h
deleted file mode 100644
index 9634b34abef..00000000000
--- a/bdb/dbinc_auto/rpc_client_ext.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rpc_client_ext_h_
-#define	_rpc_client_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __dbcl_envrpcserver __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
-int __dbcl_env_open_wrap __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbcl_db_open_wrap __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __dbcl_refresh __P((DB_ENV *));
-int __dbcl_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t, void **, u_int32_t *));
-void __dbcl_txn_end __P((DB_TXN *));
-void __dbcl_txn_setup __P((DB_ENV *, DB_TXN *, DB_TXN *, u_int32_t));
-void __dbcl_c_refresh __P((DBC *));
-int __dbcl_c_setup __P((long, DB *, DBC **));
-int __dbcl_dbclose_common __P((DB *));
-int __dbcl_env_alloc __P((DB_ENV *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
-int __dbcl_set_app_dispatch __P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
-int __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int));
-int __dbcl_env_close __P((DB_ENV *, u_int32_t));
-int __dbcl_env_create __P((DB_ENV *, long));
-int __dbcl_set_data_dir __P((DB_ENV *, const char *));
-int __dbcl_env_dbremove __P((DB_ENV *, DB_TXN *, const char *, const char *, u_int32_t));
-int __dbcl_env_dbrename __P((DB_ENV *, DB_TXN *, const char *, const char *, const char *, u_int32_t));
-int __dbcl_env_encrypt __P((DB_ENV *, const char *, u_int32_t));
-int __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int)));
-int __dbcl_env_flags __P((DB_ENV *, u_int32_t, int));
-int __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lg_dir __P((DB_ENV *, const char *));
-int __dbcl_set_lg_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lg_regionmax __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int));
-int __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t));
-int __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t));
-int __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t));
-int __dbcl_env_open __P((DB_ENV *, const char *, u_int32_t, int));
-int __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int)));
-int __dbcl_env_remove __P((DB_ENV *, const char *, u_int32_t));
-int __dbcl_set_shm_key __P((DB_ENV *, long));
-int __dbcl_set_tas_spins __P((DB_ENV *, u_int32_t));
-int __dbcl_set_timeout __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_set_tmp_dir __P((DB_ENV *, const char *));
-int __dbcl_set_tx_max __P((DB_ENV *, u_int32_t));
-int __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *));
-int __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int));
-int __dbcl_txn_abort __P((DB_TXN *));
-int __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-int __dbcl_txn_commit __P((DB_TXN *, u_int32_t));
-int __dbcl_txn_discard __P((DB_TXN *, u_int32_t));
-int __dbcl_txn_prepare __P((DB_TXN *, u_int8_t *));
-int __dbcl_txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-int __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-int __dbcl_txn_timeout __P((DB_TXN *, u_int32_t, u_int32_t));
-int __dbcl_rep_elect __P((DB_ENV *, int, int, u_int32_t, int *));
-int __dbcl_rep_flush __P((DB_ENV *));
-int __dbcl_rep_process_message __P((DB_ENV *, DBT *, DBT *, int *));
-int __dbcl_rep_set_limit __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_rep_set_request __P((DB_ENV *, u_int32_t, u_int32_t));
-int __dbcl_rep_set_rep_transport __P((DB_ENV *, int, int (*)(DB_ENV *, const DBT *, const DBT *, int, u_int32_t)));
-int __dbcl_rep_start __P((DB_ENV *, DBT *, u_int32_t));
-int __dbcl_rep_stat __P((DB_ENV *, DB_REP_STAT **, u_int32_t));
-int __dbcl_db_alloc __P((DB *, void *(*)(size_t), void *(*)(void *, size_t), void (*)(void *)));
-int __dbcl_db_associate __P((DB *, DB_TXN *, DB *, int (*)(DB *, const DBT *, const DBT *, DBT *), u_int32_t));
-int __dbcl_db_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_bt_maxkey __P((DB *, u_int32_t));
-int __dbcl_db_bt_minkey __P((DB *, u_int32_t));
-int __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_set_append_recno __P((DB *, int (*)(DB *, DBT *, db_recno_t)));
-int __dbcl_db_cache_priority __P((DB *, DB_CACHE_PRIORITY));
-int __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int));
-int __dbcl_db_close __P((DB *, u_int32_t));
-int __dbcl_db_create __P((DB *, DB_ENV *, u_int32_t));
-int __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t));
-int __dbcl_db_dup_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *)));
-int __dbcl_db_encrypt __P((DB *, const char *, u_int32_t));
-int __dbcl_db_extentsize __P((DB *, u_int32_t));
-int __dbcl_db_fd __P((DB *, int *));
-int __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int)));
-int __dbcl_db_flags __P((DB *, u_int32_t));
-int __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_h_ffactor __P((DB *, u_int32_t));
-int __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, const void *, u_int32_t)));
-int __dbcl_db_h_nelem __P((DB *, u_int32_t));
-int __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t));
-int __dbcl_db_lorder __P((DB *, int));
-int __dbcl_db_open __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int));
-int __dbcl_db_pagesize __P((DB *, u_int32_t));
-int __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int)));
-int __dbcl_db_pget __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
-int __dbcl_db_re_delim __P((DB *, int));
-int __dbcl_db_re_len __P((DB *, u_int32_t));
-int __dbcl_db_re_pad __P((DB *, int));
-int __dbcl_db_re_source __P((DB *, const char *));
-int __dbcl_db_remove __P((DB *, const char *, const char *, u_int32_t));
-int __dbcl_db_rename __P((DB *, const char *, const char *, const char *, u_int32_t));
-int __dbcl_db_stat __P((DB *, void *, u_int32_t));
-int __dbcl_db_sync __P((DB *, u_int32_t));
-int __dbcl_db_truncate __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t));
-int __dbcl_db_upgrade __P((DB *, const char *, u_int32_t));
-int __dbcl_db_verify __P((DB *, const char *, const char *, FILE *, u_int32_t));
-int __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t));
-int __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t));
-int __dbcl_dbc_close __P((DBC *));
-int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t));
-int __dbcl_dbc_del __P((DBC *, u_int32_t));
-int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t));
-int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_pget __P((DBC *, DBT *, DBT *, DBT *, u_int32_t));
-int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t));
-int __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *));
-int __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *));
-int __dbcl_lock_id __P((DB_ENV *, u_int32_t *));
-int __dbcl_lock_id_free __P((DB_ENV *, u_int32_t));
-int __dbcl_lock_put __P((DB_ENV *, DB_LOCK *));
-int __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, u_int32_t));
-int __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **));
-int __dbcl_log_archive __P((DB_ENV *, char ***, u_int32_t));
-int __dbcl_log_cursor __P((DB_ENV *, DB_LOGC **, u_int32_t));
-int __dbcl_log_file __P((DB_ENV *, const DB_LSN *, char *, size_t));
-int __dbcl_log_flush __P((DB_ENV *, const DB_LSN *));
-int __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t));
-int __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, u_int32_t));
-int __dbcl_memp_fcreate __P((DB_ENV *, DB_MPOOLFILE **, u_int32_t));
-int __dbcl_memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *)));
-int __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, u_int32_t));
-int __dbcl_memp_sync __P((DB_ENV *, DB_LSN *));
-int __dbcl_memp_trickle __P((DB_ENV *, int, int *));
-int __dbcl_env_close_ret __P((DB_ENV *, u_int32_t, __env_close_reply *));
-int __dbcl_env_create_ret __P((DB_ENV *, long, __env_create_reply *));
-int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, __env_open_reply *));
-int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *));
-int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
-int __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
-int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
-int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t, __txn_discard_reply *));
-int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t, __txn_recover_reply *));
-int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
-int __dbcl_db_create_ret __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
-int __dbcl_db_get_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
-int __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
-int __dbcl_db_open_ret __P((DB *, DB_TXN *, const char *, const char *, DBTYPE, u_int32_t, int, __db_open_reply *));
-int __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *, u_int32_t, __db_pget_reply *));
-int __dbcl_db_put_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
-int __dbcl_db_remove_ret __P((DB *, const char *, const char *, u_int32_t, __db_remove_reply *));
-int __dbcl_db_rename_ret __P((DB *, const char *, const char *, const char *, u_int32_t, __db_rename_reply *));
-int __dbcl_db_stat_ret __P((DB *, void *, u_int32_t, __db_stat_reply *));
-int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t  *, u_int32_t, __db_truncate_reply *));
-int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
-int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
-int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
-int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
-int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
-int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
-int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t, __dbc_pget_reply *));
-int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rpc_client_ext_h_ */
diff --git a/bdb/dbinc_auto/rpc_server_ext.h b/bdb/dbinc_auto/rpc_server_ext.h
deleted file mode 100644
index c0c706881c7..00000000000
--- a/bdb/dbinc_auto/rpc_server_ext.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_rpc_server_ext_h_
-#define	_rpc_server_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-void __env_cachesize_proc __P((long, u_int32_t, u_int32_t, u_int32_t, __env_cachesize_reply *));
-void __env_close_proc __P((long, u_int32_t, __env_close_reply *));
-void __env_create_proc __P((u_int32_t, __env_create_reply *));
-void __env_dbremove_proc __P((long, long, char *, char *, u_int32_t, __env_dbremove_reply *));
-void __env_dbrename_proc __P((long, long, char *, char *, char *, u_int32_t, __env_dbrename_reply *));
-void __env_encrypt_proc __P((long, char *, u_int32_t, __env_encrypt_reply *));
-void __env_flags_proc __P((long, u_int32_t, u_int32_t, __env_flags_reply *));
-void __env_open_proc __P((long, char *, u_int32_t, u_int32_t, __env_open_reply *));
-void __env_remove_proc __P((long, char *, u_int32_t, __env_remove_reply *));
-void __txn_abort_proc __P((long, __txn_abort_reply *));
-void __txn_begin_proc __P((long, long, u_int32_t, __txn_begin_reply *));
-void __txn_commit_proc __P((long, u_int32_t, __txn_commit_reply *));
-void __txn_discard_proc __P((long, u_int32_t, __txn_discard_reply *));
-void __txn_prepare_proc __P((long, u_int8_t *, __txn_prepare_reply *));
-void __txn_recover_proc __P((long, u_int32_t, u_int32_t, __txn_recover_reply *, int *));
-void __db_bt_maxkey_proc __P((long, u_int32_t, __db_bt_maxkey_reply *));
-void __db_associate_proc __P((long, long, long, u_int32_t, __db_associate_reply *));
-void __db_bt_minkey_proc __P((long, u_int32_t, __db_bt_minkey_reply *));
-void __db_close_proc __P((long, u_int32_t, __db_close_reply *));
-void __db_create_proc __P((long, u_int32_t, __db_create_reply *));
-void __db_del_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_del_reply *));
-void __db_encrypt_proc __P((long, char *, u_int32_t, __db_encrypt_reply *));
-void __db_extentsize_proc __P((long, u_int32_t, __db_extentsize_reply *));
-void __db_flags_proc __P((long, u_int32_t, __db_flags_reply *));
-void __db_get_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_get_reply *, int *));
-void __db_h_ffactor_proc __P((long, u_int32_t, __db_h_ffactor_reply *));
-void __db_h_nelem_proc __P((long, u_int32_t, __db_h_nelem_reply *));
-void __db_key_range_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_key_range_reply *));
-void __db_lorder_proc __P((long, u_int32_t, __db_lorder_reply *));
-void __db_open_proc __P((long, long, char *, char *, u_int32_t, u_int32_t, u_int32_t, __db_open_reply *));
-void __db_pagesize_proc __P((long, u_int32_t, __db_pagesize_reply *));
-void __db_pget_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_pget_reply *, int *));
-void __db_put_proc __P((long, long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __db_put_reply *, int *));
-void __db_re_delim_proc __P((long, u_int32_t, __db_re_delim_reply *));
-void __db_re_len_proc __P((long, u_int32_t, __db_re_len_reply *));
-void __db_re_pad_proc __P((long, u_int32_t, __db_re_pad_reply *));
-void __db_remove_proc __P((long, char *, char *, u_int32_t, __db_remove_reply *));
-void __db_rename_proc __P((long, char *, char *, char *, u_int32_t, __db_rename_reply *));
-void __db_stat_proc __P((long, u_int32_t, __db_stat_reply *, int *));
-void __db_sync_proc __P((long, u_int32_t, __db_sync_reply *));
-void __db_truncate_proc __P((long, long, u_int32_t, __db_truncate_reply *));
-void __db_cursor_proc __P((long, long, u_int32_t, __db_cursor_reply *));
-void __db_join_proc __P((long, u_int32_t *, u_int32_t, u_int32_t, __db_join_reply *));
-void __dbc_close_proc __P((long, __dbc_close_reply *));
-void __dbc_count_proc __P((long, u_int32_t, __dbc_count_reply *));
-void __dbc_del_proc __P((long, u_int32_t, __dbc_del_reply *));
-void __dbc_dup_proc __P((long, u_int32_t, __dbc_dup_reply *));
-void __dbc_get_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_get_reply *, int *));
-void __dbc_pget_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_pget_reply *, int *));
-void __dbc_put_proc __P((long, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, void *, u_int32_t, u_int32_t, __dbc_put_reply *, int *));
-void __dbsrv_settimeout __P((ct_entry *, u_int32_t));
-void __dbsrv_timeout __P((int));
-void __dbclear_ctp __P((ct_entry *));
-void __dbdel_ctp __P((ct_entry *));
-ct_entry *new_ct_ent __P((int *));
-ct_entry *get_tableent __P((long));
-ct_entry *__dbsrv_sharedb __P((ct_entry *, const char *, const char *, DBTYPE, u_int32_t));
-ct_entry *__dbsrv_shareenv __P((ct_entry *, home_entry *, u_int32_t));
-void __dbsrv_active __P((ct_entry *));
-int __db_close_int __P((long, u_int32_t));
-int __dbc_close_int __P((ct_entry *));
-int __dbenv_close_int __P((long, u_int32_t, int));
-home_entry *get_home __P((char *));
-__env_cachesize_reply *__db_env_cachesize_4001  __P((__env_cachesize_msg *, struct svc_req *));
-__env_close_reply *__db_env_close_4001 __P((__env_close_msg *, struct svc_req *));
-__env_create_reply *__db_env_create_4001 __P((__env_create_msg *, struct svc_req *));
-__env_dbremove_reply *__db_env_dbremove_4001  __P((__env_dbremove_msg *, struct svc_req *));
-__env_dbrename_reply *__db_env_dbrename_4001  __P((__env_dbrename_msg *, struct svc_req *));
-__env_encrypt_reply *__db_env_encrypt_4001  __P((__env_encrypt_msg *, struct svc_req *));
-__env_flags_reply *__db_env_flags_4001 __P((__env_flags_msg *, struct svc_req *));
-__env_open_reply *__db_env_open_4001 __P((__env_open_msg *, struct svc_req *));
-__env_remove_reply *__db_env_remove_4001 __P((__env_remove_msg *, struct svc_req *));
-__txn_abort_reply *__db_txn_abort_4001 __P((__txn_abort_msg *, struct svc_req *));
-__txn_begin_reply *__db_txn_begin_4001 __P((__txn_begin_msg *, struct svc_req *));
-__txn_commit_reply *__db_txn_commit_4001 __P((__txn_commit_msg *, struct svc_req *));
-__txn_discard_reply *__db_txn_discard_4001  __P((__txn_discard_msg *, struct svc_req *));
-__txn_prepare_reply *__db_txn_prepare_4001  __P((__txn_prepare_msg *, struct svc_req *));
-__txn_recover_reply *__db_txn_recover_4001  __P((__txn_recover_msg *, struct svc_req *));
-__db_associate_reply *__db_db_associate_4001  __P((__db_associate_msg *, struct svc_req *));
-__db_bt_maxkey_reply *__db_db_bt_maxkey_4001  __P((__db_bt_maxkey_msg *, struct svc_req *));
-__db_bt_minkey_reply *__db_db_bt_minkey_4001  __P((__db_bt_minkey_msg *, struct svc_req *));
-__db_close_reply *__db_db_close_4001 __P((__db_close_msg *, struct svc_req *));
-__db_create_reply *__db_db_create_4001 __P((__db_create_msg *, struct svc_req *));
-__db_del_reply *__db_db_del_4001 __P((__db_del_msg *, struct svc_req *));
-__db_encrypt_reply *__db_db_encrypt_4001 __P((__db_encrypt_msg *, struct svc_req *));
-__db_extentsize_reply *__db_db_extentsize_4001  __P((__db_extentsize_msg *, struct svc_req *));
-__db_flags_reply *__db_db_flags_4001 __P((__db_flags_msg *, struct svc_req *));
-__db_get_reply *__db_db_get_4001 __P((__db_get_msg *, struct svc_req *));
-__db_h_ffactor_reply *__db_db_h_ffactor_4001  __P((__db_h_ffactor_msg *, struct svc_req *));
-__db_h_nelem_reply *__db_db_h_nelem_4001 __P((__db_h_nelem_msg *, struct svc_req *));
-__db_key_range_reply *__db_db_key_range_4001  __P((__db_key_range_msg *, struct svc_req *));
-__db_lorder_reply *__db_db_lorder_4001 __P((__db_lorder_msg *, struct svc_req *));
-__db_open_reply *__db_db_open_4001 __P((__db_open_msg *, struct svc_req *));
-__db_pagesize_reply *__db_db_pagesize_4001  __P((__db_pagesize_msg *, struct svc_req *));
-__db_pget_reply *__db_db_pget_4001 __P((__db_pget_msg *, struct svc_req *));
-__db_put_reply *__db_db_put_4001 __P((__db_put_msg *, struct svc_req *));
-__db_re_delim_reply *__db_db_re_delim_4001  __P((__db_re_delim_msg *, struct svc_req *));
-__db_re_len_reply *__db_db_re_len_4001 __P((__db_re_len_msg *, struct svc_req *));
-__db_re_pad_reply *__db_db_re_pad_4001 __P((__db_re_pad_msg *, struct svc_req *));
-__db_remove_reply *__db_db_remove_4001 __P((__db_remove_msg *, struct svc_req *));
-__db_rename_reply *__db_db_rename_4001 __P((__db_rename_msg *, struct svc_req *));
-__db_stat_reply *__db_db_stat_4001 __P((__db_stat_msg *, struct svc_req *));
-__db_sync_reply *__db_db_sync_4001 __P((__db_sync_msg *, struct svc_req *));
-__db_truncate_reply *__db_db_truncate_4001  __P((__db_truncate_msg *, struct svc_req *));
-__db_cursor_reply *__db_db_cursor_4001 __P((__db_cursor_msg *, struct svc_req *));
-__db_join_reply *__db_db_join_4001 __P((__db_join_msg *, struct svc_req *));
-__dbc_close_reply *__db_dbc_close_4001 __P((__dbc_close_msg *, struct svc_req *));
-__dbc_count_reply *__db_dbc_count_4001 __P((__dbc_count_msg *, struct svc_req *));
-__dbc_del_reply *__db_dbc_del_4001 __P((__dbc_del_msg *, struct svc_req *));
-__dbc_dup_reply *__db_dbc_dup_4001 __P((__dbc_dup_msg *, struct svc_req *));
-__dbc_get_reply *__db_dbc_get_4001 __P((__dbc_get_msg *, struct svc_req *));
-__dbc_pget_reply *__db_dbc_pget_4001 __P((__dbc_pget_msg *, struct svc_req *));
-__dbc_put_reply *__db_dbc_put_4001 __P((__dbc_put_msg *, struct svc_req *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_rpc_server_ext_h_ */
diff --git a/bdb/dbinc_auto/tcl_ext.h b/bdb/dbinc_auto/tcl_ext.h
deleted file mode 100644
index 619ea4a9dfc..00000000000
--- a/bdb/dbinc_auto/tcl_ext.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_tcl_ext_h_
-#define	_tcl_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int bdb_HCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-#if DB_DBM_HSEARCH != 0
-int bdb_NdbmOpen __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DBM **));
-#endif
-#if DB_DBM_HSEARCH != 0
-int bdb_DbmCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*, int, DBM *));
-#endif
-int ndbm_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-void _DbInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int db_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int dbc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int env_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_EnvRemove __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_EnvVerbose __P((Tcl_Interp *, DB_ENV *, Tcl_Obj *, Tcl_Obj *));
-int tcl_EnvAttr __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_EnvTest __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-DBTCL_INFO *_NewInfo __P((Tcl_Interp *, void *, char *, enum INFOTYPE));
-void *_NameToPtr __P((CONST char *));
-DBTCL_INFO *_PtrToInfo __P((CONST void *));
-DBTCL_INFO *_NameToInfo __P((CONST char *));
-void  _SetInfoData __P((DBTCL_INFO *, void *));
-void  _DeleteInfo __P((DBTCL_INFO *));
-int _SetListElem __P((Tcl_Interp *, Tcl_Obj *, void *, int, void *, int));
-int _SetListElemInt __P((Tcl_Interp *, Tcl_Obj *, void *, int));
-int _SetListRecnoElem __P((Tcl_Interp *, Tcl_Obj *, db_recno_t, u_char *, int));
-int _Set3DBTList __P((Tcl_Interp *, Tcl_Obj *, DBT *, int, DBT *, int, DBT *));
-int _SetMultiList __P((Tcl_Interp *, Tcl_Obj *, DBT *, DBT*, int, int));
-int _GetGlobPrefix __P((char *, char **));
-int _ReturnSetup __P((Tcl_Interp *, int, int, char *));
-int _ErrorSetup __P((Tcl_Interp *, int, char *));
-void _ErrorFunc __P((CONST char *, char *));
-int _GetLsn __P((Tcl_Interp *, Tcl_Obj *, DB_LSN *));
-int _GetUInt32 __P((Tcl_Interp *, Tcl_Obj *, u_int32_t *));
-Tcl_Obj *_GetFlagsList __P((Tcl_Interp *, u_int32_t, void (*)(u_int32_t, void *, void (*)(u_int32_t, const FN *, void *))));
-void _debug_check  __P((void));
-int _CopyObjBytes  __P((Tcl_Interp *, Tcl_Obj *obj, void **, u_int32_t *, int *));
-int tcl_LockDetect __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LockVec __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogArchive __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogCompare __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_LogFile __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogGet __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogPut __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_LogStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int logc_Cmd __P((ClientData, Tcl_Interp *, int, Tcl_Obj * CONST*));
-void _MpInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int tcl_MpSync __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_MpTrickle __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_Mp __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_MpStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_RepElect __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepFlush __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepLimit __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepRequest __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepStart __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepProcessMessage __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-int tcl_RepStat __P((Tcl_Interp *, int, Tcl_Obj * CONST *, DB_ENV *));
-void _TxnInfoDelete __P((Tcl_Interp *, DBTCL_INFO *));
-int tcl_TxnCheckpoint __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_Txn __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int tcl_TxnStat __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_TxnTimeout __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *));
-int tcl_TxnRecover __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-int bdb_RandCommand __P((Tcl_Interp *, int, Tcl_Obj * CONST*));
-int tcl_Mutex __P((Tcl_Interp *, int, Tcl_Obj * CONST*, DB_ENV *, DBTCL_INFO *));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_tcl_ext_h_ */
diff --git a/bdb/dbinc_auto/txn_ext.h b/bdb/dbinc_auto/txn_ext.h
deleted file mode 100644
index 5a4381ed890..00000000000
--- a/bdb/dbinc_auto/txn_ext.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_txn_ext_h_
-#define	_txn_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t));
-int __txn_xa_begin __P((DB_ENV *, DB_TXN *));
-int __txn_compensate_begin __P((DB_ENV *, DB_TXN **txnp));
-int __txn_commit __P((DB_TXN *, u_int32_t));
-int __txn_abort __P((DB_TXN *));
-int __txn_discard __P((DB_TXN *, u_int32_t flags));
-int __txn_prepare __P((DB_TXN *, u_int8_t *));
-u_int32_t __txn_id __P((DB_TXN *));
-int __txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t, u_int32_t));
-int __txn_getckp __P((DB_ENV *, DB_LSN *));
-int __txn_activekids __P((DB_ENV *, u_int32_t, DB_TXN *));
-int __txn_force_abort __P((DB_ENV *, u_int8_t *));
-int __txn_preclose __P((DB_ENV *));
-int __txn_reset __P((DB_ENV *));
-int __txn_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, int32_t));
-int __txn_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_regop_read __P((DB_ENV *, void *, __txn_regop_args **));
-int __txn_ckp_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, DB_LSN *, DB_LSN *, int32_t));
-int __txn_ckp_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_read __P((DB_ENV *, void *, __txn_ckp_args **));
-int __txn_child_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, DB_LSN *));
-int __txn_child_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_read __P((DB_ENV *, void *, __txn_child_args **));
-int __txn_xa_regop_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, const DBT *, int32_t, u_int32_t, u_int32_t, DB_LSN *));
-int __txn_xa_regop_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_read __P((DB_ENV *, void *, __txn_xa_regop_args **));
-int __txn_recycle_log __P((DB_ENV *, DB_TXN *, DB_LSN *, u_int32_t, u_int32_t, u_int32_t));
-int __txn_recycle_getpgnos __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_recycle_print __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_recycle_read __P((DB_ENV *, void *, __txn_recycle_args **));
-int __txn_init_print __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __txn_init_getpgnos __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-int __txn_init_recover __P((DB_ENV *, int (***)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), size_t *));
-void __txn_dbenv_create __P((DB_ENV *));
-int __txn_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_xa_regop_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_ckp_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_child_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-int __txn_restore_txn __P((DB_ENV *, DB_LSN *, __txn_xa_regop_args *));
-int __txn_recycle_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *));
-void __txn_continue __P((DB_ENV *, DB_TXN *, TXN_DETAIL *, size_t));
-int __txn_map_gid __P((DB_ENV *, u_int8_t *, TXN_DETAIL **, size_t *));
-int __txn_recover __P((DB_ENV *, DB_PREPLIST *, long, long *, u_int32_t));
-int __txn_get_prepared __P((DB_ENV *, XID *, DB_PREPLIST *, long, long *, u_int32_t));
-int __txn_open __P((DB_ENV *));
-int __txn_dbenv_refresh __P((DB_ENV *));
-void __txn_region_destroy __P((DB_ENV *, REGINFO *));
-int __txn_id_set __P((DB_ENV *, u_int32_t, u_int32_t));
-int __txn_stat __P((DB_ENV *, DB_TXN_STAT **, u_int32_t));
-int __txn_remevent __P((DB_ENV *, DB_TXN *, const char *, u_int8_t*));
-int __txn_lockevent __P((DB_ENV *, DB_TXN *, DB *, DB_LOCK *, u_int32_t));
-void __txn_remlock __P((DB_ENV *, DB_TXN *, DB_LOCK *, u_int32_t));
-int __txn_doevents __P((DB_ENV *, DB_TXN *, int, int));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_txn_ext_h_ */
diff --git a/bdb/dbinc_auto/xa_ext.h b/bdb/dbinc_auto/xa_ext.h
deleted file mode 100644
index e4fc9895e18..00000000000
--- a/bdb/dbinc_auto/xa_ext.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* DO NOT EDIT: automatically built by dist/s_include. */
-#ifndef	_xa_ext_h_
-#define	_xa_ext_h_
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-int __db_xa_create __P((DB *));
-int __db_rmid_to_env __P((int rmid, DB_ENV **envp));
-int __db_xid_to_txn __P((DB_ENV *, XID *, size_t *));
-int __db_map_rmid __P((int, DB_ENV *));
-int __db_unmap_rmid __P((int));
-int __db_map_xid __P((DB_ENV *, XID *, size_t));
-void __db_unmap_xid __P((DB_ENV *, XID *, size_t));
-
-#if defined(__cplusplus)
-}
-#endif
-#endif /* !_xa_ext_h_ */
diff --git a/bdb/dist/s_java b/bdb/dist/s_java
index 2a65da60a73..f3c856d0532 100755
--- a/bdb/dist/s_java
+++ b/bdb/dist/s_java
@@ -38,7 +38,7 @@ cmp $t $f > /dev/null 2>&1 ||
     (echo "Building $f" && rm -f $f && cp $t $f && chmod 444 $f)
 
 # Build Db.java.
-f=../java/src/com/sleepycat/db/Db.java
+f=../java/src/com/sleepycat/db/Db.java.in
 sed '/BEGIN-JAVA-SPECIAL-CONSTANTS/q' < $f > $t
 (echo "    $msgjava" &&
  for i in `egrep '^DB_.*C$' pubdef.in | awk '{print $1}'`; do \
diff --git a/bdb/dist/s_rpc b/bdb/dist/s_rpc
index 7c478c2b5e1..cdafa669d85 100644
--- a/bdb/dist/s_rpc
+++ b/bdb/dist/s_rpc
@@ -30,6 +30,7 @@ rm -f   $client_file \
 	$header_file \
 	$rpcclnt_file \
 	$rpcsvc_file \
+	$proc_file \
 	$rpcxdr_file \
 	$sed_file \
 	$server_file \
diff --git a/bdb/java/src/com/sleepycat/db/Db.java b/bdb/java/src/com/sleepycat/db/Db.java
deleted file mode 100644
index df311795f54..00000000000
--- a/bdb/java/src/com/sleepycat/db/Db.java
+++ /dev/null
@@ -1,761 +0,0 @@
-/*-
- * See the file LICENSE for redistribution information.
- *
- * Copyright (c) 1997-2002
- *      Sleepycat Software.  All rights reserved.
- *
- * $Id: Db.java,v 11.110 2002/09/09 20:47:31 bostic Exp $
- */
-
-package com.sleepycat.db;
-
-import java.io.OutputStream;
-import java.io.FileNotFoundException;
-
-/**
- *
- * @author Donald D. Anderson
- */
-public class Db
-{
-    // BEGIN-JAVA-SPECIAL-CONSTANTS
-    /* DO NOT EDIT: automatically built by dist/s_java. */
-    public static final int DB_BTREE = 1;
-    public static final int DB_DONOTINDEX = -30999;
-    public static final int DB_HASH = 2;
-    public static final int DB_KEYEMPTY = -30998;
-    public static final int DB_KEYEXIST = -30997;
-    public static final int DB_LOCK_DEADLOCK = -30996;
-    public static final int DB_LOCK_NOTGRANTED = -30995;
-    public static final int DB_NOSERVER = -30994;
-    public static final int DB_NOSERVER_HOME = -30993;
-    public static final int DB_NOSERVER_ID = -30992;
-    public static final int DB_NOTFOUND = -30991;
-    public static final int DB_OLD_VERSION = -30990;
-    public static final int DB_PAGE_NOTFOUND = -30989;
-    public static final int DB_QUEUE = 4;
-    public static final int DB_RECNO = 3;
-    public static final int DB_REP_DUPMASTER = -30988;
-    public static final int DB_REP_HOLDELECTION = -30987;
-    public static final int DB_REP_NEWMASTER = -30986;
-    public static final int DB_REP_NEWSITE = -30985;
-    public static final int DB_REP_OUTDATED = -30984;
-    public static final int DB_RUNRECOVERY = -30982;
-    public static final int DB_SECONDARY_BAD = -30981;
-    public static final int DB_TXN_ABORT = 0;
-    public static final int DB_TXN_APPLY = 1;
-    public static final int DB_TXN_BACKWARD_ROLL = 3;
-    public static final int DB_TXN_FORWARD_ROLL = 4;
-    public static final int DB_TXN_PRINT = 8;
-    public static final int DB_UNKNOWN = 5;
-    public static final int DB_VERIFY_BAD = -30980;
-    public static final int DB_AFTER;
-    public static final int DB_AGGRESSIVE;
-    public static final int DB_APPEND;
-    public static final int DB_ARCH_ABS;
-    public static final int DB_ARCH_DATA;
-    public static final int DB_ARCH_LOG;
-    public static final int DB_AUTO_COMMIT;
-    public static final int DB_BEFORE;
-    public static final int DB_CACHED_COUNTS;
-    public static final int DB_CDB_ALLDB;
-    public static final int DB_CHKSUM_SHA1;
-    public static final int DB_CLIENT;
-    public static final int DB_CONSUME;
-    public static final int DB_CONSUME_WAIT;
-    public static final int DB_CREATE;
-    public static final int DB_CURRENT;
-    public static final int DB_CXX_NO_EXCEPTIONS;
-    public static final int DB_DBT_MALLOC;
-    public static final int DB_DBT_PARTIAL;
-    public static final int DB_DBT_REALLOC;
-    public static final int DB_DBT_USERMEM;
-    public static final int DB_DIRECT;
-    public static final int DB_DIRECT_DB;
-    public static final int DB_DIRECT_LOG;
-    public static final int DB_DIRTY_READ;
-    public static final int DB_DUP;
-    public static final int DB_DUPSORT;
-    public static final int DB_EID_BROADCAST;
-    public static final int DB_EID_INVALID;
-    public static final int DB_ENCRYPT;
-    public static final int DB_ENCRYPT_AES;
-    public static final int DB_EXCL;
-    public static final int DB_FAST_STAT;
-    public static final int DB_FIRST;
-    public static final int DB_FLUSH;
-    public static final int DB_FORCE;
-    public static final int DB_GET_BOTH;
-    public static final int DB_GET_BOTH_RANGE;
-    public static final int DB_GET_RECNO;
-    public static final int DB_INIT_CDB;
-    public static final int DB_INIT_LOCK;
-    public static final int DB_INIT_LOG;
-    public static final int DB_INIT_MPOOL;
-    public static final int DB_INIT_TXN;
-    public static final int DB_JOINENV;
-    public static final int DB_JOIN_ITEM;
-    public static final int DB_JOIN_NOSORT;
-    public static final int DB_KEYFIRST;
-    public static final int DB_KEYLAST;
-    public static final int DB_LAST;
-    public static final int DB_LOCKDOWN;
-    public static final int DB_LOCK_DEFAULT;
-    public static final int DB_LOCK_EXPIRE;
-    public static final int DB_LOCK_GET;
-    public static final int DB_LOCK_GET_TIMEOUT;
-    public static final int DB_LOCK_IREAD;
-    public static final int DB_LOCK_IWR;
-    public static final int DB_LOCK_IWRITE;
-    public static final int DB_LOCK_MAXLOCKS;
-    public static final int DB_LOCK_MINLOCKS;
-    public static final int DB_LOCK_MINWRITE;
-    public static final int DB_LOCK_NOWAIT;
-    public static final int DB_LOCK_OLDEST;
-    public static final int DB_LOCK_PUT;
-    public static final int DB_LOCK_PUT_ALL;
-    public static final int DB_LOCK_PUT_OBJ;
-    public static final int DB_LOCK_RANDOM;
-    public static final int DB_LOCK_READ;
-    public static final int DB_LOCK_TIMEOUT;
-    public static final int DB_LOCK_WRITE;
-    public static final int DB_LOCK_YOUNGEST;
-    public static final int DB_MULTIPLE;
-    public static final int DB_MULTIPLE_KEY;
-    public static final int DB_NEXT;
-    public static final int DB_NEXT_DUP;
-    public static final int DB_NEXT_NODUP;
-    public static final int DB_NODUPDATA;
-    public static final int DB_NOLOCKING;
-    public static final int DB_NOMMAP;
-    public static final int DB_NOORDERCHK;
-    public static final int DB_NOOVERWRITE;
-    public static final int DB_NOPANIC;
-    public static final int DB_NOSYNC;
-    public static final int DB_ODDFILESIZE;
-    public static final int DB_ORDERCHKONLY;
-    public static final int DB_OVERWRITE;
-    public static final int DB_PANIC_ENVIRONMENT;
-    public static final int DB_POSITION;
-    public static final int DB_PREV;
-    public static final int DB_PREV_NODUP;
-    public static final int DB_PRINTABLE;
-    public static final int DB_PRIORITY_DEFAULT;
-    public static final int DB_PRIORITY_HIGH;
-    public static final int DB_PRIORITY_LOW;
-    public static final int DB_PRIORITY_VERY_HIGH;
-    public static final int DB_PRIORITY_VERY_LOW;
-    public static final int DB_PRIVATE;
-    public static final int DB_RDONLY;
-    public static final int DB_RECNUM;
-    public static final int DB_RECORDCOUNT;
-    public static final int DB_RECOVER;
-    public static final int DB_RECOVER_FATAL;
-    public static final int DB_REGION_INIT;
-    public static final int DB_RENUMBER;
-    public static final int DB_REP_CLIENT;
-    public static final int DB_REP_LOGSONLY;
-    public static final int DB_REP_MASTER;
-    public static final int DB_REP_PERMANENT;
-    public static final int DB_REP_UNAVAIL;
-    public static final int DB_REVSPLITOFF;
-    public static final int DB_RMW;
-    public static final int DB_SALVAGE;
-    public static final int DB_SET;
-    public static final int DB_SET_LOCK_TIMEOUT;
-    public static final int DB_SET_RANGE;
-    public static final int DB_SET_RECNO;
-    public static final int DB_SET_TXN_TIMEOUT;
-    public static final int DB_SNAPSHOT;
-    public static final int DB_STAT_CLEAR;
-    public static final int DB_SYSTEM_MEM;
-    public static final int DB_THREAD;
-    public static final int DB_TRUNCATE;
-    public static final int DB_TXN_NOSYNC;
-    public static final int DB_TXN_NOWAIT;
-    public static final int DB_TXN_SYNC;
-    public static final int DB_TXN_WRITE_NOSYNC;
-    public static final int DB_UPGRADE;
-    public static final int DB_USE_ENVIRON;
-    public static final int DB_USE_ENVIRON_ROOT;
-    public static final int DB_VERB_CHKPOINT;
-    public static final int DB_VERB_DEADLOCK;
-    public static final int DB_VERB_RECOVERY;
-    public static final int DB_VERB_REPLICATION;
-    public static final int DB_VERB_WAITSFOR;
-    public static final int DB_VERIFY;
-    public static final int DB_VERSION_MAJOR;
-    public static final int DB_VERSION_MINOR;
-    public static final int DB_VERSION_PATCH;
-    public static final int DB_WRITECURSOR;
-    public static final int DB_XA_CREATE;
-    public static final int DB_XIDDATASIZE;
-    public static final int DB_YIELDCPU;
-    // END-JAVA-SPECIAL-CONSTANTS
-
-    // Note: the env can be null
-    //
-    public Db(DbEnv env, int flags)
-        throws DbException
-    {
-        constructor_env_ = env;
-        _init(env, flags);
-        if (env == null) {
-            dbenv_ = new DbEnv(this);
-        }
-        else {
-            dbenv_ = env;
-        }
-        dbenv_._add_db(this);
-    }
-
-    //
-    // Our parent DbEnv is notifying us that the environment is closing.
-    //
-    /*package*/ void _notify_dbenv_close()
-    {
-        dbenv_ = null;
-        _notify_internal();
-    }
-
-    private native void _init(DbEnv env, int flags)
-         throws DbException;
-
-    private native void _notify_internal();
-
-    // methods
-    //
-
-    public synchronized void associate(DbTxn txn, Db secondary,
-                                       DbSecondaryKeyCreate key_creator,
-                                       int flags)
-        throws DbException
-    {
-        secondary.secondary_key_create_ = key_creator;
-        _associate(txn, secondary, key_creator, flags);
-    }
-
-    public native void _associate(DbTxn txn, Db secondary,
-                                  DbSecondaryKeyCreate key_creator, int flags)
-        throws DbException;
-
-    public synchronized int close(int flags)
-        throws DbException
-    {
-        try {
-            dbenv_._remove_db(this);
-            return _close(flags);
-        }
-        finally {
-            if (constructor_env_ == null) {
-                dbenv_._notify_db_close();
-            }
-            dbenv_ = null;
-        }
-    }
-
-    public native int _close(int flags)
-         throws DbException;
-
-    public native Dbc cursor(DbTxn txnid, int flags)
-         throws DbException;
-
-    public native int del(DbTxn txnid, Dbt key, int flags)
-         throws DbException;
-
-    public native void err(int errcode, String message);
-
-    public native void errx(String message);
-
-    public native int fd()
-         throws DbException;
-
-    // overrides Object.finalize
-    protected void finalize()
-        throws Throwable
-    {
-        if (dbenv_ == null)
-            _finalize(null, null);
-        else
-            _finalize(dbenv_.errcall_, dbenv_.errpfx_);
-    }
-
-    protected native void _finalize(DbErrcall errcall, String errpfx)
-        throws Throwable;
-
-    // returns: 0, DB_NOTFOUND, or throws error
-    public native int get(DbTxn txnid, Dbt key, Dbt data, int flags)
-         throws DbException;
-
-    public native boolean get_byteswapped();
-
-    public native /*DBTYPE*/ int get_type();
-
-    public native Dbc join(Dbc curslist[], int flags)
-         throws DbException;
-
-    public native void key_range(DbTxn txnid, Dbt key,
-                                 DbKeyRange range, int flags)
-         throws DbException;
-
-    public synchronized void open(DbTxn txnid, String file,
-                     String database, /*DBTYPE*/ int type,
-                     int flags, int mode)
-         throws DbException, FileNotFoundException
-    {
-        _open(txnid, file, database, type, flags, mode);
-    }
-
-    // (Internal)
-    public native void _open(DbTxn txnid, String file,
-                            String database, /*DBTYPE*/ int type,
-                            int flags, int mode)
-         throws DbException, FileNotFoundException;
-
-
-    // returns: 0, DB_NOTFOUND, or throws error
-    public native int pget(DbTxn txnid, Dbt key, Dbt pkey, Dbt data, int flags)
-         throws DbException;
-
-    // returns: 0, DB_KEYEXIST, or throws error
-    public native int put(DbTxn txnid, Dbt key, Dbt data, int flags)
-         throws DbException;
-
-    public synchronized void rename(String file, String database,
-                                    String newname, int flags)
-        throws DbException, FileNotFoundException
-    {
-        try {
-            _rename(file, database, newname, flags);
-        }
-        finally {
-            if (constructor_env_ == null) {
-                dbenv_._notify_db_close();
-            }
-            dbenv_ = null;
-        }
-    }
-
-    public native void _rename(String file, String database,
-                               String newname, int flags)
-        throws DbException, FileNotFoundException;
-
-
-    public synchronized void remove(String file,
-                                           String database, int flags)
-        throws DbException, FileNotFoundException
-    {
-        try {
-            _remove(file, database, flags);
-        }
-        finally {
-            if (constructor_env_ == null) {
-                dbenv_._notify_db_close();
-            }
-            dbenv_ = null;
-        }
-    }
-
-    public native void _remove(String file, String database,
-                               int flags)
-        throws DbException, FileNotFoundException;
-
-    // Comparison function.
-    public void set_append_recno(DbAppendRecno append_recno)
-        throws DbException
-    {
-        append_recno_ = append_recno;
-        append_recno_changed(append_recno);
-    }
-
-    // (Internal)
-    private native void append_recno_changed(DbAppendRecno append_recno)
-        throws DbException;
-
-    // Comparison function.
-    public void set_bt_compare(DbBtreeCompare bt_compare)
-        throws DbException
-    {
-        bt_compare_ = bt_compare;
-        bt_compare_changed(bt_compare);
-    }
-
-    // (Internal)
-    private native void bt_compare_changed(DbBtreeCompare bt_compare)
-        throws DbException;
-
-    // Maximum keys per page.
-    public native void set_bt_maxkey(int maxkey)
-        throws DbException;
-
-    // Minimum keys per page.
-    public native void set_bt_minkey(int minkey)
-        throws DbException;
-
-    // Prefix function.
-    public void set_bt_prefix(DbBtreePrefix bt_prefix)
-        throws DbException
-    {
-        bt_prefix_ = bt_prefix;
-        bt_prefix_changed(bt_prefix);
-    }
-
-    // (Internal)
-    private native void bt_prefix_changed(DbBtreePrefix bt_prefix)
-        throws DbException;
-
-    // Set cache size
-    public native void set_cachesize(int gbytes, int bytes, int ncaches)
-        throws DbException;
-
-    // Set cache priority
-    public native void set_cache_priority(/* DB_CACHE_PRIORITY */ int priority)
-        throws DbException;
-
-    // Duplication resolution
-    public void set_dup_compare(DbDupCompare dup_compare)
-        throws DbException
-    {
-        dup_compare_ = dup_compare;
-        dup_compare_changed(dup_compare);
-    }
-
-    // (Internal)
-    private native void dup_compare_changed(DbDupCompare dup_compare)
-        throws DbException;
-
-    // Encryption
-    public native void set_encrypt(String passwd, /*u_int32_t*/ int flags)
-        throws DbException;
-
-    // Error message callback.
-    public void set_errcall(DbErrcall errcall)
-    {
-        if (dbenv_ != null)
-            dbenv_.set_errcall(errcall);
-    }
-
-    // Error stream.
-    public void set_error_stream(OutputStream s)
-    {
-        DbOutputStreamErrcall errcall = new DbOutputStreamErrcall(s);
-        set_errcall(errcall);
-    }
-
-    // Error message prefix.
-    public void set_errpfx(String errpfx)
-    {
-        if (dbenv_ != null)
-            dbenv_.set_errpfx(errpfx);
-    }
-
-
-    // Feedback
-    public void set_feedback(DbFeedback feedback)
-        throws DbException
-    {
-        feedback_ = feedback;
-        feedback_changed(feedback);
-    }
-
-    // (Internal)
-    private native void feedback_changed(DbFeedback feedback)
-        throws DbException;
-
-    // Flags.
-    public native void set_flags(/*u_int32_t*/ int flags)
-        throws DbException;
-
-    // Internal - only intended for testing purposes in the Java RPC server
-    public native int get_flags_raw()
-        throws DbException;
-
-    // Fill factor.
-    public native void set_h_ffactor(/*unsigned*/ int h_ffactor)
-        throws DbException;
-
-    // Hash function.
-    public void set_h_hash(DbHash h_hash)
-        throws DbException
-    {
-        h_hash_ = h_hash;
-        hash_changed(h_hash);
-    }
-
-    // (Internal)
-    private native void hash_changed(DbHash hash)
-        throws DbException;
-
-    // Number of elements.
-    public native void set_h_nelem(/*unsigned*/ int h_nelem)
-        throws DbException;
-
-    // Byte order.
-    public native void set_lorder(int lorder)
-        throws DbException;
-
-    // Underlying page size.
-    public native void set_pagesize(/*size_t*/ long pagesize)
-        throws DbException;
-
-    // Variable-length delimiting byte.
-    public native void set_re_delim(int re_delim)
-        throws DbException;
-
-    // Length for fixed-length records.
-    public native void set_re_len(/*u_int32_t*/ int re_len)
-        throws DbException;
-
-    // Fixed-length padding byte.
-    public native void set_re_pad(int re_pad)
-        throws DbException;
-
-    // Source file name.
-    public native void set_re_source(String re_source)
-        throws DbException;
-
-    // Extent size of Queue
-    public native void set_q_extentsize(/*u_int32_t*/ int extent_size)
-        throws DbException;
-
-    // returns a DbBtreeStat or DbHashStat
-    public native Object stat(int flags)
-         throws DbException;
-
-    public native void sync(int flags)
-         throws DbException;
-
-    public native int truncate(DbTxn txnid, int flags)
-         throws DbException;
-
-    public native void upgrade(String name, int flags)
-         throws DbException;
-
-    public native void verify(String name, String subdb,
-                              OutputStream outstr, int flags)
-         throws DbException;
-
-    ////////////////////////////////////////////////////////////////
-    //
-    // private data
-    //
-    private long private_dbobj_ = 0;
-    private long private_info_ = 0;
-    private DbEnv dbenv_ = null;
-    private DbEnv constructor_env_ = null;
-    private DbFeedback feedback_ = null;
-    private DbAppendRecno append_recno_ = null;
-    private DbBtreeCompare bt_compare_ = null;
-    private DbBtreePrefix bt_prefix_ = null;
-    private DbDupCompare dup_compare_ = null;
-    private DbHash h_hash_ = null;
-    private DbSecondaryKeyCreate secondary_key_create_ = null;
-
-    ////////////////////////////////////////////////////////////////
-    //
-    // static methods and data that implement
-    // loading the native library and doing any
-    // extra sanity checks on startup.
-    //
-    private static boolean already_loaded_ = false;
-
-    public static void load_db()
-    {
-        if (already_loaded_)
-            return;
-
-        // An alternate library name can be specified via a property.
-        //
-        String override;
-
-        if ((override = System.getProperty("sleepycat.db.libfile")) != null) {
-            System.load(override);
-        }
-        else if ((override = System.getProperty("sleepycat.db.libname")) != null) {
-            System.loadLibrary(override);
-        }
-        else {
-            String os = System.getProperty("os.name");
-            if (os != null && os.startsWith("Windows")) {
-                // library name is "libdb_java30.dll" (for example) on Win/*
-                System.loadLibrary("libdb_java" +
-                                   DbConstants.DB_VERSION_MAJOR +
-                                   DbConstants.DB_VERSION_MINOR);
-            }
-            else {
-                // library name is "libdb_java-3.0.so" (for example) on UNIX
-                // Note: "db_java" isn't good enough;
-                // some Unixes require us to use the explicit SONAME.
-                System.loadLibrary("db_java-" +
-                                   DbConstants.DB_VERSION_MAJOR + "." +
-                                   DbConstants.DB_VERSION_MINOR);
-            }
-        }
-
-        already_loaded_ = true;
-    }
-
-    static private native void one_time_init();
-
-    static private void check_constant(int c1, int c2)
-    {
-        if (c1 != c2) {
-            System.err.println("Db: constant mismatch");
-            Thread.dumpStack();
-            System.exit(1);
-        }
-    }
-
-    static {
-        Db.load_db();
-
-        // BEGIN-JAVA-CONSTANT-INITIALIZATION
-        /* DO NOT EDIT: automatically built by dist/s_java. */
-        DB_AFTER = DbConstants.DB_AFTER;
-        DB_AGGRESSIVE = DbConstants.DB_AGGRESSIVE;
-        DB_APPEND = DbConstants.DB_APPEND;
-        DB_ARCH_ABS = DbConstants.DB_ARCH_ABS;
-        DB_ARCH_DATA = DbConstants.DB_ARCH_DATA;
-        DB_ARCH_LOG = DbConstants.DB_ARCH_LOG;
-        DB_AUTO_COMMIT = DbConstants.DB_AUTO_COMMIT;
-        DB_BEFORE = DbConstants.DB_BEFORE;
-        DB_CACHED_COUNTS = DbConstants.DB_CACHED_COUNTS;
-        DB_CDB_ALLDB = DbConstants.DB_CDB_ALLDB;
-        DB_CHKSUM_SHA1 = DbConstants.DB_CHKSUM_SHA1;
-        DB_CLIENT = DbConstants.DB_CLIENT;
-        DB_CONSUME = DbConstants.DB_CONSUME;
-        DB_CONSUME_WAIT = DbConstants.DB_CONSUME_WAIT;
-        DB_CREATE = DbConstants.DB_CREATE;
-        DB_CURRENT = DbConstants.DB_CURRENT;
-        DB_CXX_NO_EXCEPTIONS = DbConstants.DB_CXX_NO_EXCEPTIONS;
-        DB_DBT_MALLOC = DbConstants.DB_DBT_MALLOC;
-        DB_DBT_PARTIAL = DbConstants.DB_DBT_PARTIAL;
-        DB_DBT_REALLOC = DbConstants.DB_DBT_REALLOC;
-        DB_DBT_USERMEM = DbConstants.DB_DBT_USERMEM;
-        DB_DIRECT = DbConstants.DB_DIRECT;
-        DB_DIRECT_DB = DbConstants.DB_DIRECT_DB;
-        DB_DIRECT_LOG = DbConstants.DB_DIRECT_LOG;
-        DB_DIRTY_READ = DbConstants.DB_DIRTY_READ;
-        DB_DUP = DbConstants.DB_DUP;
-        DB_DUPSORT = DbConstants.DB_DUPSORT;
-        DB_EID_BROADCAST = DbConstants.DB_EID_BROADCAST;
-        DB_EID_INVALID = DbConstants.DB_EID_INVALID;
-        DB_ENCRYPT = DbConstants.DB_ENCRYPT;
-        DB_ENCRYPT_AES = DbConstants.DB_ENCRYPT_AES;
-        DB_EXCL = DbConstants.DB_EXCL;
-        DB_FAST_STAT = DbConstants.DB_FAST_STAT;
-        DB_FIRST = DbConstants.DB_FIRST;
-        DB_FLUSH = DbConstants.DB_FLUSH;
-        DB_FORCE = DbConstants.DB_FORCE;
-        DB_GET_BOTH = DbConstants.DB_GET_BOTH;
-        DB_GET_BOTH_RANGE = DbConstants.DB_GET_BOTH_RANGE;
-        DB_GET_RECNO = DbConstants.DB_GET_RECNO;
-        DB_INIT_CDB = DbConstants.DB_INIT_CDB;
-        DB_INIT_LOCK = DbConstants.DB_INIT_LOCK;
-        DB_INIT_LOG = DbConstants.DB_INIT_LOG;
-        DB_INIT_MPOOL = DbConstants.DB_INIT_MPOOL;
-        DB_INIT_TXN = DbConstants.DB_INIT_TXN;
-        DB_JOINENV = DbConstants.DB_JOINENV;
-        DB_JOIN_ITEM = DbConstants.DB_JOIN_ITEM;
-        DB_JOIN_NOSORT = DbConstants.DB_JOIN_NOSORT;
-        DB_KEYFIRST = DbConstants.DB_KEYFIRST;
-        DB_KEYLAST = DbConstants.DB_KEYLAST;
-        DB_LAST = DbConstants.DB_LAST;
-        DB_LOCKDOWN = DbConstants.DB_LOCKDOWN;
-        DB_LOCK_DEFAULT = DbConstants.DB_LOCK_DEFAULT;
-        DB_LOCK_EXPIRE = DbConstants.DB_LOCK_EXPIRE;
-        DB_LOCK_GET = DbConstants.DB_LOCK_GET;
-        DB_LOCK_GET_TIMEOUT = DbConstants.DB_LOCK_GET_TIMEOUT;
-        DB_LOCK_IREAD = DbConstants.DB_LOCK_IREAD;
-        DB_LOCK_IWR = DbConstants.DB_LOCK_IWR;
-        DB_LOCK_IWRITE = DbConstants.DB_LOCK_IWRITE;
-        DB_LOCK_MAXLOCKS = DbConstants.DB_LOCK_MAXLOCKS;
-        DB_LOCK_MINLOCKS = DbConstants.DB_LOCK_MINLOCKS;
-        DB_LOCK_MINWRITE = DbConstants.DB_LOCK_MINWRITE;
-        DB_LOCK_NOWAIT = DbConstants.DB_LOCK_NOWAIT;
-        DB_LOCK_OLDEST = DbConstants.DB_LOCK_OLDEST;
-        DB_LOCK_PUT = DbConstants.DB_LOCK_PUT;
-        DB_LOCK_PUT_ALL = DbConstants.DB_LOCK_PUT_ALL;
-        DB_LOCK_PUT_OBJ = DbConstants.DB_LOCK_PUT_OBJ;
-        DB_LOCK_RANDOM = DbConstants.DB_LOCK_RANDOM;
-        DB_LOCK_READ = DbConstants.DB_LOCK_READ;
-        DB_LOCK_TIMEOUT = DbConstants.DB_LOCK_TIMEOUT;
-        DB_LOCK_WRITE = DbConstants.DB_LOCK_WRITE;
-        DB_LOCK_YOUNGEST = DbConstants.DB_LOCK_YOUNGEST;
-        DB_MULTIPLE = DbConstants.DB_MULTIPLE;
-        DB_MULTIPLE_KEY = DbConstants.DB_MULTIPLE_KEY;
-        DB_NEXT = DbConstants.DB_NEXT;
-        DB_NEXT_DUP = DbConstants.DB_NEXT_DUP;
-        DB_NEXT_NODUP = DbConstants.DB_NEXT_NODUP;
-        DB_NODUPDATA = DbConstants.DB_NODUPDATA;
-        DB_NOLOCKING = DbConstants.DB_NOLOCKING;
-        DB_NOMMAP = DbConstants.DB_NOMMAP;
-        DB_NOORDERCHK = DbConstants.DB_NOORDERCHK;
-        DB_NOOVERWRITE = DbConstants.DB_NOOVERWRITE;
-        DB_NOPANIC = DbConstants.DB_NOPANIC;
-        DB_NOSYNC = DbConstants.DB_NOSYNC;
-        DB_ODDFILESIZE = DbConstants.DB_ODDFILESIZE;
-        DB_ORDERCHKONLY = DbConstants.DB_ORDERCHKONLY;
-        DB_OVERWRITE = DbConstants.DB_OVERWRITE;
-        DB_PANIC_ENVIRONMENT = DbConstants.DB_PANIC_ENVIRONMENT;
-        DB_POSITION = DbConstants.DB_POSITION;
-        DB_PREV = DbConstants.DB_PREV;
-        DB_PREV_NODUP = DbConstants.DB_PREV_NODUP;
-        DB_PRINTABLE = DbConstants.DB_PRINTABLE;
-        DB_PRIORITY_DEFAULT = DbConstants.DB_PRIORITY_DEFAULT;
-        DB_PRIORITY_HIGH = DbConstants.DB_PRIORITY_HIGH;
-        DB_PRIORITY_LOW = DbConstants.DB_PRIORITY_LOW;
-        DB_PRIORITY_VERY_HIGH = DbConstants.DB_PRIORITY_VERY_HIGH;
-        DB_PRIORITY_VERY_LOW = DbConstants.DB_PRIORITY_VERY_LOW;
-        DB_PRIVATE = DbConstants.DB_PRIVATE;
-        DB_RDONLY = DbConstants.DB_RDONLY;
-        DB_RECNUM = DbConstants.DB_RECNUM;
-        DB_RECORDCOUNT = DbConstants.DB_RECORDCOUNT;
-        DB_RECOVER = DbConstants.DB_RECOVER;
-        DB_RECOVER_FATAL = DbConstants.DB_RECOVER_FATAL;
-        DB_REGION_INIT = DbConstants.DB_REGION_INIT;
-        DB_RENUMBER = DbConstants.DB_RENUMBER;
-        DB_REP_CLIENT = DbConstants.DB_REP_CLIENT;
-        DB_REP_LOGSONLY = DbConstants.DB_REP_LOGSONLY;
-        DB_REP_MASTER = DbConstants.DB_REP_MASTER;
-        DB_REP_PERMANENT = DbConstants.DB_REP_PERMANENT;
-        DB_REP_UNAVAIL = DbConstants.DB_REP_UNAVAIL;
-        DB_REVSPLITOFF = DbConstants.DB_REVSPLITOFF;
-        DB_RMW = DbConstants.DB_RMW;
-        DB_SALVAGE = DbConstants.DB_SALVAGE;
-        DB_SET = DbConstants.DB_SET;
-        DB_SET_LOCK_TIMEOUT = DbConstants.DB_SET_LOCK_TIMEOUT;
-        DB_SET_RANGE = DbConstants.DB_SET_RANGE;
-        DB_SET_RECNO = DbConstants.DB_SET_RECNO;
-        DB_SET_TXN_TIMEOUT = DbConstants.DB_SET_TXN_TIMEOUT;
-        DB_SNAPSHOT = DbConstants.DB_SNAPSHOT;
-        DB_STAT_CLEAR = DbConstants.DB_STAT_CLEAR;
-        DB_SYSTEM_MEM = DbConstants.DB_SYSTEM_MEM;
-        DB_THREAD = DbConstants.DB_THREAD;
-        DB_TRUNCATE = DbConstants.DB_TRUNCATE;
-        DB_TXN_NOSYNC = DbConstants.DB_TXN_NOSYNC;
-        DB_TXN_NOWAIT = DbConstants.DB_TXN_NOWAIT;
-        DB_TXN_SYNC = DbConstants.DB_TXN_SYNC;
-        DB_TXN_WRITE_NOSYNC = DbConstants.DB_TXN_WRITE_NOSYNC;
-        DB_UPGRADE = DbConstants.DB_UPGRADE;
-        DB_USE_ENVIRON = DbConstants.DB_USE_ENVIRON;
-        DB_USE_ENVIRON_ROOT = DbConstants.DB_USE_ENVIRON_ROOT;
-        DB_VERB_CHKPOINT = DbConstants.DB_VERB_CHKPOINT;
-        DB_VERB_DEADLOCK = DbConstants.DB_VERB_DEADLOCK;
-        DB_VERB_RECOVERY = DbConstants.DB_VERB_RECOVERY;
-        DB_VERB_REPLICATION = DbConstants.DB_VERB_REPLICATION;
-        DB_VERB_WAITSFOR = DbConstants.DB_VERB_WAITSFOR;
-        DB_VERIFY = DbConstants.DB_VERIFY;
-        DB_VERSION_MAJOR = DbConstants.DB_VERSION_MAJOR;
-        DB_VERSION_MINOR = DbConstants.DB_VERSION_MINOR;
-        DB_VERSION_PATCH = DbConstants.DB_VERSION_PATCH;
-        DB_WRITECURSOR = DbConstants.DB_WRITECURSOR;
-        DB_XA_CREATE = DbConstants.DB_XA_CREATE;
-        DB_XIDDATASIZE = DbConstants.DB_XIDDATASIZE;
-        DB_YIELDCPU = DbConstants.DB_YIELDCPU;
-        // END-JAVA-CONSTANT-INITIALIZATION
-
-        one_time_init();
-    }
-}
-// end of Db.java
diff --git a/bdb/java/src/com/sleepycat/db/Db.java.in b/bdb/java/src/com/sleepycat/db/Db.java.in
new file mode 100644
index 00000000000..df311795f54
--- /dev/null
+++ b/bdb/java/src/com/sleepycat/db/Db.java.in
@@ -0,0 +1,761 @@
+/*-
+ * See the file LICENSE for redistribution information.
+ *
+ * Copyright (c) 1997-2002
+ *      Sleepycat Software.  All rights reserved.
+ *
+ * $Id: Db.java,v 11.110 2002/09/09 20:47:31 bostic Exp $
+ */
+
+package com.sleepycat.db;
+
+import java.io.OutputStream;
+import java.io.FileNotFoundException;
+
+/**
+ *
+ * @author Donald D. Anderson
+ */
+public class Db
+{
+    // BEGIN-JAVA-SPECIAL-CONSTANTS
+    /* DO NOT EDIT: automatically built by dist/s_java. */
+    public static final int DB_BTREE = 1;
+    public static final int DB_DONOTINDEX = -30999;
+    public static final int DB_HASH = 2;
+    public static final int DB_KEYEMPTY = -30998;
+    public static final int DB_KEYEXIST = -30997;
+    public static final int DB_LOCK_DEADLOCK = -30996;
+    public static final int DB_LOCK_NOTGRANTED = -30995;
+    public static final int DB_NOSERVER = -30994;
+    public static final int DB_NOSERVER_HOME = -30993;
+    public static final int DB_NOSERVER_ID = -30992;
+    public static final int DB_NOTFOUND = -30991;
+    public static final int DB_OLD_VERSION = -30990;
+    public static final int DB_PAGE_NOTFOUND = -30989;
+    public static final int DB_QUEUE = 4;
+    public static final int DB_RECNO = 3;
+    public static final int DB_REP_DUPMASTER = -30988;
+    public static final int DB_REP_HOLDELECTION = -30987;
+    public static final int DB_REP_NEWMASTER = -30986;
+    public static final int DB_REP_NEWSITE = -30985;
+    public static final int DB_REP_OUTDATED = -30984;
+    public static final int DB_RUNRECOVERY = -30982;
+    public static final int DB_SECONDARY_BAD = -30981;
+    public static final int DB_TXN_ABORT = 0;
+    public static final int DB_TXN_APPLY = 1;
+    public static final int DB_TXN_BACKWARD_ROLL = 3;
+    public static final int DB_TXN_FORWARD_ROLL = 4;
+    public static final int DB_TXN_PRINT = 8;
+    public static final int DB_UNKNOWN = 5;
+    public static final int DB_VERIFY_BAD = -30980;
+    public static final int DB_AFTER;
+    public static final int DB_AGGRESSIVE;
+    public static final int DB_APPEND;
+    public static final int DB_ARCH_ABS;
+    public static final int DB_ARCH_DATA;
+    public static final int DB_ARCH_LOG;
+    public static final int DB_AUTO_COMMIT;
+    public static final int DB_BEFORE;
+    public static final int DB_CACHED_COUNTS;
+    public static final int DB_CDB_ALLDB;
+    public static final int DB_CHKSUM_SHA1;
+    public static final int DB_CLIENT;
+    public static final int DB_CONSUME;
+    public static final int DB_CONSUME_WAIT;
+    public static final int DB_CREATE;
+    public static final int DB_CURRENT;
+    public static final int DB_CXX_NO_EXCEPTIONS;
+    public static final int DB_DBT_MALLOC;
+    public static final int DB_DBT_PARTIAL;
+    public static final int DB_DBT_REALLOC;
+    public static final int DB_DBT_USERMEM;
+    public static final int DB_DIRECT;
+    public static final int DB_DIRECT_DB;
+    public static final int DB_DIRECT_LOG;
+    public static final int DB_DIRTY_READ;
+    public static final int DB_DUP;
+    public static final int DB_DUPSORT;
+    public static final int DB_EID_BROADCAST;
+    public static final int DB_EID_INVALID;
+    public static final int DB_ENCRYPT;
+    public static final int DB_ENCRYPT_AES;
+    public static final int DB_EXCL;
+    public static final int DB_FAST_STAT;
+    public static final int DB_FIRST;
+    public static final int DB_FLUSH;
+    public static final int DB_FORCE;
+    public static final int DB_GET_BOTH;
+    public static final int DB_GET_BOTH_RANGE;
+    public static final int DB_GET_RECNO;
+    public static final int DB_INIT_CDB;
+    public static final int DB_INIT_LOCK;
+    public static final int DB_INIT_LOG;
+    public static final int DB_INIT_MPOOL;
+    public static final int DB_INIT_TXN;
+    public static final int DB_JOINENV;
+    public static final int DB_JOIN_ITEM;
+    public static final int DB_JOIN_NOSORT;
+    public static final int DB_KEYFIRST;
+    public static final int DB_KEYLAST;
+    public static final int DB_LAST;
+    public static final int DB_LOCKDOWN;
+    public static final int DB_LOCK_DEFAULT;
+    public static final int DB_LOCK_EXPIRE;
+    public static final int DB_LOCK_GET;
+    public static final int DB_LOCK_GET_TIMEOUT;
+    public static final int DB_LOCK_IREAD;
+    public static final int DB_LOCK_IWR;
+    public static final int DB_LOCK_IWRITE;
+    public static final int DB_LOCK_MAXLOCKS;
+    public static final int DB_LOCK_MINLOCKS;
+    public static final int DB_LOCK_MINWRITE;
+    public static final int DB_LOCK_NOWAIT;
+    public static final int DB_LOCK_OLDEST;
+    public static final int DB_LOCK_PUT;
+    public static final int DB_LOCK_PUT_ALL;
+    public static final int DB_LOCK_PUT_OBJ;
+    public static final int DB_LOCK_RANDOM;
+    public static final int DB_LOCK_READ;
+    public static final int DB_LOCK_TIMEOUT;
+    public static final int DB_LOCK_WRITE;
+    public static final int DB_LOCK_YOUNGEST;
+    public static final int DB_MULTIPLE;
+    public static final int DB_MULTIPLE_KEY;
+    public static final int DB_NEXT;
+    public static final int DB_NEXT_DUP;
+    public static final int DB_NEXT_NODUP;
+    public static final int DB_NODUPDATA;
+    public static final int DB_NOLOCKING;
+    public static final int DB_NOMMAP;
+    public static final int DB_NOORDERCHK;
+    public static final int DB_NOOVERWRITE;
+    public static final int DB_NOPANIC;
+    public static final int DB_NOSYNC;
+    public static final int DB_ODDFILESIZE;
+    public static final int DB_ORDERCHKONLY;
+    public static final int DB_OVERWRITE;
+    public static final int DB_PANIC_ENVIRONMENT;
+    public static final int DB_POSITION;
+    public static final int DB_PREV;
+    public static final int DB_PREV_NODUP;
+    public static final int DB_PRINTABLE;
+    public static final int DB_PRIORITY_DEFAULT;
+    public static final int DB_PRIORITY_HIGH;
+    public static final int DB_PRIORITY_LOW;
+    public static final int DB_PRIORITY_VERY_HIGH;
+    public static final int DB_PRIORITY_VERY_LOW;
+    public static final int DB_PRIVATE;
+    public static final int DB_RDONLY;
+    public static final int DB_RECNUM;
+    public static final int DB_RECORDCOUNT;
+    public static final int DB_RECOVER;
+    public static final int DB_RECOVER_FATAL;
+    public static final int DB_REGION_INIT;
+    public static final int DB_RENUMBER;
+    public static final int DB_REP_CLIENT;
+    public static final int DB_REP_LOGSONLY;
+    public static final int DB_REP_MASTER;
+    public static final int DB_REP_PERMANENT;
+    public static final int DB_REP_UNAVAIL;
+    public static final int DB_REVSPLITOFF;
+    public static final int DB_RMW;
+    public static final int DB_SALVAGE;
+    public static final int DB_SET;
+    public static final int DB_SET_LOCK_TIMEOUT;
+    public static final int DB_SET_RANGE;
+    public static final int DB_SET_RECNO;
+    public static final int DB_SET_TXN_TIMEOUT;
+    public static final int DB_SNAPSHOT;
+    public static final int DB_STAT_CLEAR;
+    public static final int DB_SYSTEM_MEM;
+    public static final int DB_THREAD;
+    public static final int DB_TRUNCATE;
+    public static final int DB_TXN_NOSYNC;
+    public static final int DB_TXN_NOWAIT;
+    public static final int DB_TXN_SYNC;
+    public static final int DB_TXN_WRITE_NOSYNC;
+    public static final int DB_UPGRADE;
+    public static final int DB_USE_ENVIRON;
+    public static final int DB_USE_ENVIRON_ROOT;
+    public static final int DB_VERB_CHKPOINT;
+    public static final int DB_VERB_DEADLOCK;
+    public static final int DB_VERB_RECOVERY;
+    public static final int DB_VERB_REPLICATION;
+    public static final int DB_VERB_WAITSFOR;
+    public static final int DB_VERIFY;
+    public static final int DB_VERSION_MAJOR;
+    public static final int DB_VERSION_MINOR;
+    public static final int DB_VERSION_PATCH;
+    public static final int DB_WRITECURSOR;
+    public static final int DB_XA_CREATE;
+    public static final int DB_XIDDATASIZE;
+    public static final int DB_YIELDCPU;
+    // END-JAVA-SPECIAL-CONSTANTS
+
+    // Note: the env can be null
+    //
+    public Db(DbEnv env, int flags)
+        throws DbException
+    {
+        constructor_env_ = env;
+        _init(env, flags);
+        if (env == null) {
+            dbenv_ = new DbEnv(this);
+        }
+        else {
+            dbenv_ = env;
+        }
+        dbenv_._add_db(this);
+    }
+
+    //
+    // Our parent DbEnv is notifying us that the environment is closing.
+    //
+    /*package*/ void _notify_dbenv_close()
+    {
+        dbenv_ = null;
+        _notify_internal();
+    }
+
+    private native void _init(DbEnv env, int flags)
+         throws DbException;
+
+    private native void _notify_internal();
+
+    // methods
+    //
+
+    public synchronized void associate(DbTxn txn, Db secondary,
+                                       DbSecondaryKeyCreate key_creator,
+                                       int flags)
+        throws DbException
+    {
+        secondary.secondary_key_create_ = key_creator;
+        _associate(txn, secondary, key_creator, flags);
+    }
+
+    public native void _associate(DbTxn txn, Db secondary,
+                                  DbSecondaryKeyCreate key_creator, int flags)
+        throws DbException;
+
+    public synchronized int close(int flags)
+        throws DbException
+    {
+        try {
+            dbenv_._remove_db(this);
+            return _close(flags);
+        }
+        finally {
+            if (constructor_env_ == null) {
+                dbenv_._notify_db_close();
+            }
+            dbenv_ = null;
+        }
+    }
+
+    public native int _close(int flags)
+         throws DbException;
+
+    public native Dbc cursor(DbTxn txnid, int flags)
+         throws DbException;
+
+    public native int del(DbTxn txnid, Dbt key, int flags)
+         throws DbException;
+
+    public native void err(int errcode, String message);
+
+    public native void errx(String message);
+
+    public native int fd()
+         throws DbException;
+
+    // overrides Object.finalize
+    protected void finalize()
+        throws Throwable
+    {
+        if (dbenv_ == null)
+            _finalize(null, null);
+        else
+            _finalize(dbenv_.errcall_, dbenv_.errpfx_);
+    }
+
+    protected native void _finalize(DbErrcall errcall, String errpfx)
+        throws Throwable;
+
+    // returns: 0, DB_NOTFOUND, or throws error
+    public native int get(DbTxn txnid, Dbt key, Dbt data, int flags)
+         throws DbException;
+
+    public native boolean get_byteswapped();
+
+    public native /*DBTYPE*/ int get_type();
+
+    public native Dbc join(Dbc curslist[], int flags)
+         throws DbException;
+
+    public native void key_range(DbTxn txnid, Dbt key,
+                                 DbKeyRange range, int flags)
+         throws DbException;
+
+    public synchronized void open(DbTxn txnid, String file,
+                     String database, /*DBTYPE*/ int type,
+                     int flags, int mode)
+         throws DbException, FileNotFoundException
+    {
+        _open(txnid, file, database, type, flags, mode);
+    }
+
+    // (Internal)
+    public native void _open(DbTxn txnid, String file,
+                            String database, /*DBTYPE*/ int type,
+                            int flags, int mode)
+         throws DbException, FileNotFoundException;
+
+
+    // returns: 0, DB_NOTFOUND, or throws error
+    public native int pget(DbTxn txnid, Dbt key, Dbt pkey, Dbt data, int flags)
+         throws DbException;
+
+    // returns: 0, DB_KEYEXIST, or throws error
+    public native int put(DbTxn txnid, Dbt key, Dbt data, int flags)
+         throws DbException;
+
+    public synchronized void rename(String file, String database,
+                                    String newname, int flags)
+        throws DbException, FileNotFoundException
+    {
+        try {
+            _rename(file, database, newname, flags);
+        }
+        finally {
+            if (constructor_env_ == null) {
+                dbenv_._notify_db_close();
+            }
+            dbenv_ = null;
+        }
+    }
+
+    public native void _rename(String file, String database,
+                               String newname, int flags)
+        throws DbException, FileNotFoundException;
+
+
+    public synchronized void remove(String file,
+                                           String database, int flags)
+        throws DbException, FileNotFoundException
+    {
+        try {
+            _remove(file, database, flags);
+        }
+        finally {
+            if (constructor_env_ == null) {
+                dbenv_._notify_db_close();
+            }
+            dbenv_ = null;
+        }
+    }
+
+    public native void _remove(String file, String database,
+                               int flags)
+        throws DbException, FileNotFoundException;
+
+    // Comparison function.
+    public void set_append_recno(DbAppendRecno append_recno)
+        throws DbException
+    {
+        append_recno_ = append_recno;
+        append_recno_changed(append_recno);
+    }
+
+    // (Internal)
+    private native void append_recno_changed(DbAppendRecno append_recno)
+        throws DbException;
+
+    // Comparison function.
+    public void set_bt_compare(DbBtreeCompare bt_compare)
+        throws DbException
+    {
+        bt_compare_ = bt_compare;
+        bt_compare_changed(bt_compare);
+    }
+
+    // (Internal)
+    private native void bt_compare_changed(DbBtreeCompare bt_compare)
+        throws DbException;
+
+    // Maximum keys per page.
+    public native void set_bt_maxkey(int maxkey)
+        throws DbException;
+
+    // Minimum keys per page.
+    public native void set_bt_minkey(int minkey)
+        throws DbException;
+
+    // Prefix function.
+    public void set_bt_prefix(DbBtreePrefix bt_prefix)
+        throws DbException
+    {
+        bt_prefix_ = bt_prefix;
+        bt_prefix_changed(bt_prefix);
+    }
+
+    // (Internal)
+    private native void bt_prefix_changed(DbBtreePrefix bt_prefix)
+        throws DbException;
+
+    // Set cache size
+    public native void set_cachesize(int gbytes, int bytes, int ncaches)
+        throws DbException;
+
+    // Set cache priority
+    public native void set_cache_priority(/* DB_CACHE_PRIORITY */ int priority)
+        throws DbException;
+
+    // Duplication resolution
+    public void set_dup_compare(DbDupCompare dup_compare)
+        throws DbException
+    {
+        dup_compare_ = dup_compare;
+        dup_compare_changed(dup_compare);
+    }
+
+    // (Internal)
+    private native void dup_compare_changed(DbDupCompare dup_compare)
+        throws DbException;
+
+    // Encryption
+    public native void set_encrypt(String passwd, /*u_int32_t*/ int flags)
+        throws DbException;
+
+    // Error message callback.
+    public void set_errcall(DbErrcall errcall)
+    {
+        if (dbenv_ != null)
+            dbenv_.set_errcall(errcall);
+    }
+
+    // Error stream.
+    public void set_error_stream(OutputStream s)
+    {
+        DbOutputStreamErrcall errcall = new DbOutputStreamErrcall(s);
+        set_errcall(errcall);
+    }
+
+    // Error message prefix.
+    public void set_errpfx(String errpfx)
+    {
+        if (dbenv_ != null)
+            dbenv_.set_errpfx(errpfx);
+    }
+
+
+    // Feedback
+    public void set_feedback(DbFeedback feedback)
+        throws DbException
+    {
+        feedback_ = feedback;
+        feedback_changed(feedback);
+    }
+
+    // (Internal)
+    private native void feedback_changed(DbFeedback feedback)
+        throws DbException;
+
+    // Flags.
+    public native void set_flags(/*u_int32_t*/ int flags)
+        throws DbException;
+
+    // Internal - only intended for testing purposes in the Java RPC server
+    public native int get_flags_raw()
+        throws DbException;
+
+    // Fill factor.
+    public native void set_h_ffactor(/*unsigned*/ int h_ffactor)
+        throws DbException;
+
+    // Hash function.
+    public void set_h_hash(DbHash h_hash)
+        throws DbException
+    {
+        h_hash_ = h_hash;
+        hash_changed(h_hash);
+    }
+
+    // (Internal)
+    private native void hash_changed(DbHash hash)
+        throws DbException;
+
+    // Number of elements.
+    public native void set_h_nelem(/*unsigned*/ int h_nelem)
+        throws DbException;
+
+    // Byte order.
+    public native void set_lorder(int lorder)
+        throws DbException;
+
+    // Underlying page size.
+    public native void set_pagesize(/*size_t*/ long pagesize)
+        throws DbException;
+
+    // Variable-length delimiting byte.
+    public native void set_re_delim(int re_delim)
+        throws DbException;
+
+    // Length for fixed-length records.
+    public native void set_re_len(/*u_int32_t*/ int re_len)
+        throws DbException;
+
+    // Fixed-length padding byte.
+    public native void set_re_pad(int re_pad)
+        throws DbException;
+
+    // Source file name.
+    public native void set_re_source(String re_source)
+        throws DbException;
+
+    // Extent size of Queue
+    public native void set_q_extentsize(/*u_int32_t*/ int extent_size)
+        throws DbException;
+
+    // returns a DbBtreeStat or DbHashStat
+    public native Object stat(int flags)
+         throws DbException;
+
+    public native void sync(int flags)
+         throws DbException;
+
+    public native int truncate(DbTxn txnid, int flags)
+         throws DbException;
+
+    public native void upgrade(String name, int flags)
+         throws DbException;
+
+    public native void verify(String name, String subdb,
+                              OutputStream outstr, int flags)
+         throws DbException;
+
+    ////////////////////////////////////////////////////////////////
+    //
+    // private data
+    //
+    private long private_dbobj_ = 0;
+    private long private_info_ = 0;
+    private DbEnv dbenv_ = null;
+    private DbEnv constructor_env_ = null;
+    private DbFeedback feedback_ = null;
+    private DbAppendRecno append_recno_ = null;
+    private DbBtreeCompare bt_compare_ = null;
+    private DbBtreePrefix bt_prefix_ = null;
+    private DbDupCompare dup_compare_ = null;
+    private DbHash h_hash_ = null;
+    private DbSecondaryKeyCreate secondary_key_create_ = null;
+
+    ////////////////////////////////////////////////////////////////
+    //
+    // static methods and data that implement
+    // loading the native library and doing any
+    // extra sanity checks on startup.
+    //
+    private static boolean already_loaded_ = false;
+
+    public static void load_db()
+    {
+        if (already_loaded_)
+            return;
+
+        // An alternate library name can be specified via a property.
+        //
+        String override;
+
+        if ((override = System.getProperty("sleepycat.db.libfile")) != null) {
+            System.load(override);
+        }
+        else if ((override = System.getProperty("sleepycat.db.libname")) != null) {
+            System.loadLibrary(override);
+        }
+        else {
+            String os = System.getProperty("os.name");
+            if (os != null && os.startsWith("Windows")) {
+                // library name is "libdb_java30.dll" (for example) on Win/*
+                System.loadLibrary("libdb_java" +
+                                   DbConstants.DB_VERSION_MAJOR +
+                                   DbConstants.DB_VERSION_MINOR);
+            }
+            else {
+                // library name is "libdb_java-3.0.so" (for example) on UNIX
+                // Note: "db_java" isn't good enough;
+                // some Unixes require us to use the explicit SONAME.
+                System.loadLibrary("db_java-" +
+                                   DbConstants.DB_VERSION_MAJOR + "." +
+                                   DbConstants.DB_VERSION_MINOR);
+            }
+        }
+
+        already_loaded_ = true;
+    }
+
+    static private native void one_time_init();
+
+    static private void check_constant(int c1, int c2)
+    {
+        if (c1 != c2) {
+            System.err.println("Db: constant mismatch");
+            Thread.dumpStack();
+            System.exit(1);
+        }
+    }
+
+    static {
+        Db.load_db();
+
+        // BEGIN-JAVA-CONSTANT-INITIALIZATION
+        /* DO NOT EDIT: automatically built by dist/s_java. */
+        DB_AFTER = DbConstants.DB_AFTER;
+        DB_AGGRESSIVE = DbConstants.DB_AGGRESSIVE;
+        DB_APPEND = DbConstants.DB_APPEND;
+        DB_ARCH_ABS = DbConstants.DB_ARCH_ABS;
+        DB_ARCH_DATA = DbConstants.DB_ARCH_DATA;
+        DB_ARCH_LOG = DbConstants.DB_ARCH_LOG;
+        DB_AUTO_COMMIT = DbConstants.DB_AUTO_COMMIT;
+        DB_BEFORE = DbConstants.DB_BEFORE;
+        DB_CACHED_COUNTS = DbConstants.DB_CACHED_COUNTS;
+        DB_CDB_ALLDB = DbConstants.DB_CDB_ALLDB;
+        DB_CHKSUM_SHA1 = DbConstants.DB_CHKSUM_SHA1;
+        DB_CLIENT = DbConstants.DB_CLIENT;
+        DB_CONSUME = DbConstants.DB_CONSUME;
+        DB_CONSUME_WAIT = DbConstants.DB_CONSUME_WAIT;
+        DB_CREATE = DbConstants.DB_CREATE;
+        DB_CURRENT = DbConstants.DB_CURRENT;
+        DB_CXX_NO_EXCEPTIONS = DbConstants.DB_CXX_NO_EXCEPTIONS;
+        DB_DBT_MALLOC = DbConstants.DB_DBT_MALLOC;
+        DB_DBT_PARTIAL = DbConstants.DB_DBT_PARTIAL;
+        DB_DBT_REALLOC = DbConstants.DB_DBT_REALLOC;
+        DB_DBT_USERMEM = DbConstants.DB_DBT_USERMEM;
+        DB_DIRECT = DbConstants.DB_DIRECT;
+        DB_DIRECT_DB = DbConstants.DB_DIRECT_DB;
+        DB_DIRECT_LOG = DbConstants.DB_DIRECT_LOG;
+        DB_DIRTY_READ = DbConstants.DB_DIRTY_READ;
+        DB_DUP = DbConstants.DB_DUP;
+        DB_DUPSORT = DbConstants.DB_DUPSORT;
+        DB_EID_BROADCAST = DbConstants.DB_EID_BROADCAST;
+        DB_EID_INVALID = DbConstants.DB_EID_INVALID;
+        DB_ENCRYPT = DbConstants.DB_ENCRYPT;
+        DB_ENCRYPT_AES = DbConstants.DB_ENCRYPT_AES;
+        DB_EXCL = DbConstants.DB_EXCL;
+        DB_FAST_STAT = DbConstants.DB_FAST_STAT;
+        DB_FIRST = DbConstants.DB_FIRST;
+        DB_FLUSH = DbConstants.DB_FLUSH;
+        DB_FORCE = DbConstants.DB_FORCE;
+        DB_GET_BOTH = DbConstants.DB_GET_BOTH;
+        DB_GET_BOTH_RANGE = DbConstants.DB_GET_BOTH_RANGE;
+        DB_GET_RECNO = DbConstants.DB_GET_RECNO;
+        DB_INIT_CDB = DbConstants.DB_INIT_CDB;
+        DB_INIT_LOCK = DbConstants.DB_INIT_LOCK;
+        DB_INIT_LOG = DbConstants.DB_INIT_LOG;
+        DB_INIT_MPOOL = DbConstants.DB_INIT_MPOOL;
+        DB_INIT_TXN = DbConstants.DB_INIT_TXN;
+        DB_JOINENV = DbConstants.DB_JOINENV;
+        DB_JOIN_ITEM = DbConstants.DB_JOIN_ITEM;
+        DB_JOIN_NOSORT = DbConstants.DB_JOIN_NOSORT;
+        DB_KEYFIRST = DbConstants.DB_KEYFIRST;
+        DB_KEYLAST = DbConstants.DB_KEYLAST;
+        DB_LAST = DbConstants.DB_LAST;
+        DB_LOCKDOWN = DbConstants.DB_LOCKDOWN;
+        DB_LOCK_DEFAULT = DbConstants.DB_LOCK_DEFAULT;
+        DB_LOCK_EXPIRE = DbConstants.DB_LOCK_EXPIRE;
+        DB_LOCK_GET = DbConstants.DB_LOCK_GET;
+        DB_LOCK_GET_TIMEOUT = DbConstants.DB_LOCK_GET_TIMEOUT;
+        DB_LOCK_IREAD = DbConstants.DB_LOCK_IREAD;
+        DB_LOCK_IWR = DbConstants.DB_LOCK_IWR;
+        DB_LOCK_IWRITE = DbConstants.DB_LOCK_IWRITE;
+        DB_LOCK_MAXLOCKS = DbConstants.DB_LOCK_MAXLOCKS;
+        DB_LOCK_MINLOCKS = DbConstants.DB_LOCK_MINLOCKS;
+        DB_LOCK_MINWRITE = DbConstants.DB_LOCK_MINWRITE;
+        DB_LOCK_NOWAIT = DbConstants.DB_LOCK_NOWAIT;
+        DB_LOCK_OLDEST = DbConstants.DB_LOCK_OLDEST;
+        DB_LOCK_PUT = DbConstants.DB_LOCK_PUT;
+        DB_LOCK_PUT_ALL = DbConstants.DB_LOCK_PUT_ALL;
+        DB_LOCK_PUT_OBJ = DbConstants.DB_LOCK_PUT_OBJ;
+        DB_LOCK_RANDOM = DbConstants.DB_LOCK_RANDOM;
+        DB_LOCK_READ = DbConstants.DB_LOCK_READ;
+        DB_LOCK_TIMEOUT = DbConstants.DB_LOCK_TIMEOUT;
+        DB_LOCK_WRITE = DbConstants.DB_LOCK_WRITE;
+        DB_LOCK_YOUNGEST = DbConstants.DB_LOCK_YOUNGEST;
+        DB_MULTIPLE = DbConstants.DB_MULTIPLE;
+        DB_MULTIPLE_KEY = DbConstants.DB_MULTIPLE_KEY;
+        DB_NEXT = DbConstants.DB_NEXT;
+        DB_NEXT_DUP = DbConstants.DB_NEXT_DUP;
+        DB_NEXT_NODUP = DbConstants.DB_NEXT_NODUP;
+        DB_NODUPDATA = DbConstants.DB_NODUPDATA;
+        DB_NOLOCKING = DbConstants.DB_NOLOCKING;
+        DB_NOMMAP = DbConstants.DB_NOMMAP;
+        DB_NOORDERCHK = DbConstants.DB_NOORDERCHK;
+        DB_NOOVERWRITE = DbConstants.DB_NOOVERWRITE;
+        DB_NOPANIC = DbConstants.DB_NOPANIC;
+        DB_NOSYNC = DbConstants.DB_NOSYNC;
+        DB_ODDFILESIZE = DbConstants.DB_ODDFILESIZE;
+        DB_ORDERCHKONLY = DbConstants.DB_ORDERCHKONLY;
+        DB_OVERWRITE = DbConstants.DB_OVERWRITE;
+        DB_PANIC_ENVIRONMENT = DbConstants.DB_PANIC_ENVIRONMENT;
+        DB_POSITION = DbConstants.DB_POSITION;
+        DB_PREV = DbConstants.DB_PREV;
+        DB_PREV_NODUP = DbConstants.DB_PREV_NODUP;
+        DB_PRINTABLE = DbConstants.DB_PRINTABLE;
+        DB_PRIORITY_DEFAULT = DbConstants.DB_PRIORITY_DEFAULT;
+        DB_PRIORITY_HIGH = DbConstants.DB_PRIORITY_HIGH;
+        DB_PRIORITY_LOW = DbConstants.DB_PRIORITY_LOW;
+        DB_PRIORITY_VERY_HIGH = DbConstants.DB_PRIORITY_VERY_HIGH;
+        DB_PRIORITY_VERY_LOW = DbConstants.DB_PRIORITY_VERY_LOW;
+        DB_PRIVATE = DbConstants.DB_PRIVATE;
+        DB_RDONLY = DbConstants.DB_RDONLY;
+        DB_RECNUM = DbConstants.DB_RECNUM;
+        DB_RECORDCOUNT = DbConstants.DB_RECORDCOUNT;
+        DB_RECOVER = DbConstants.DB_RECOVER;
+        DB_RECOVER_FATAL = DbConstants.DB_RECOVER_FATAL;
+        DB_REGION_INIT = DbConstants.DB_REGION_INIT;
+        DB_RENUMBER = DbConstants.DB_RENUMBER;
+        DB_REP_CLIENT = DbConstants.DB_REP_CLIENT;
+        DB_REP_LOGSONLY = DbConstants.DB_REP_LOGSONLY;
+        DB_REP_MASTER = DbConstants.DB_REP_MASTER;
+        DB_REP_PERMANENT = DbConstants.DB_REP_PERMANENT;
+        DB_REP_UNAVAIL = DbConstants.DB_REP_UNAVAIL;
+        DB_REVSPLITOFF = DbConstants.DB_REVSPLITOFF;
+        DB_RMW = DbConstants.DB_RMW;
+        DB_SALVAGE = DbConstants.DB_SALVAGE;
+        DB_SET = DbConstants.DB_SET;
+        DB_SET_LOCK_TIMEOUT = DbConstants.DB_SET_LOCK_TIMEOUT;
+        DB_SET_RANGE = DbConstants.DB_SET_RANGE;
+        DB_SET_RECNO = DbConstants.DB_SET_RECNO;
+        DB_SET_TXN_TIMEOUT = DbConstants.DB_SET_TXN_TIMEOUT;
+        DB_SNAPSHOT = DbConstants.DB_SNAPSHOT;
+        DB_STAT_CLEAR = DbConstants.DB_STAT_CLEAR;
+        DB_SYSTEM_MEM = DbConstants.DB_SYSTEM_MEM;
+        DB_THREAD = DbConstants.DB_THREAD;
+        DB_TRUNCATE = DbConstants.DB_TRUNCATE;
+        DB_TXN_NOSYNC = DbConstants.DB_TXN_NOSYNC;
+        DB_TXN_NOWAIT = DbConstants.DB_TXN_NOWAIT;
+        DB_TXN_SYNC = DbConstants.DB_TXN_SYNC;
+        DB_TXN_WRITE_NOSYNC = DbConstants.DB_TXN_WRITE_NOSYNC;
+        DB_UPGRADE = DbConstants.DB_UPGRADE;
+        DB_USE_ENVIRON = DbConstants.DB_USE_ENVIRON;
+        DB_USE_ENVIRON_ROOT = DbConstants.DB_USE_ENVIRON_ROOT;
+        DB_VERB_CHKPOINT = DbConstants.DB_VERB_CHKPOINT;
+        DB_VERB_DEADLOCK = DbConstants.DB_VERB_DEADLOCK;
+        DB_VERB_RECOVERY = DbConstants.DB_VERB_RECOVERY;
+        DB_VERB_REPLICATION = DbConstants.DB_VERB_REPLICATION;
+        DB_VERB_WAITSFOR = DbConstants.DB_VERB_WAITSFOR;
+        DB_VERIFY = DbConstants.DB_VERIFY;
+        DB_VERSION_MAJOR = DbConstants.DB_VERSION_MAJOR;
+        DB_VERSION_MINOR = DbConstants.DB_VERSION_MINOR;
+        DB_VERSION_PATCH = DbConstants.DB_VERSION_PATCH;
+        DB_WRITECURSOR = DbConstants.DB_WRITECURSOR;
+        DB_XA_CREATE = DbConstants.DB_XA_CREATE;
+        DB_XIDDATASIZE = DbConstants.DB_XIDDATASIZE;
+        DB_YIELDCPU = DbConstants.DB_YIELDCPU;
+        // END-JAVA-CONSTANT-INITIALIZATION
+
+        one_time_init();
+    }
+}
+// end of Db.java
-- 
cgit v1.2.1