BDB 4.1.24

BitKeeper/deleted/.del-ex_access.wpj~3df6ae8c99bf7c5f:
  Delete: bdb/build_vxworks/ex_access/ex_access.wpj
BitKeeper/deleted/.del-ex_btrec.wpj~a7622f1c6f432dc6:
  Delete: bdb/build_vxworks/ex_btrec/ex_btrec.wpj
BitKeeper/deleted/.del-ex_dbclient.wpj~7345440f3b204cdd:
  Delete: bdb/build_vxworks/ex_dbclient/ex_dbclient.wpj
BitKeeper/deleted/.del-ex_env.wpj~fbe1ab10b04e8b74:
  Delete: bdb/build_vxworks/ex_env/ex_env.wpj
BitKeeper/deleted/.del-ex_mpool.wpj~4479cfd5c45f327d:
  Delete: bdb/build_vxworks/ex_mpool/ex_mpool.wpj
BitKeeper/deleted/.del-ex_tpcb.wpj~f78093006e14bf41:
  Delete: bdb/build_vxworks/ex_tpcb/ex_tpcb.wpj
BitKeeper/deleted/.del-db_buildall.dsp~bd749ff6da11682:
  Delete: bdb/build_win32/db_buildall.dsp
BitKeeper/deleted/.del-cxx_app.cpp~ad8df8e0791011ed:
  Delete: bdb/cxx/cxx_app.cpp
BitKeeper/deleted/.del-cxx_log.cpp~a50ff3118fe06952:
  Delete: bdb/cxx/cxx_log.cpp
BitKeeper/deleted/.del-cxx_table.cpp~ecd751e79b055556:
  Delete: bdb/cxx/cxx_table.cpp
BitKeeper/deleted/.del-namemap.txt~796a3acd3885d8fd:
  Delete: bdb/cxx/namemap.txt
BitKeeper/deleted/.del-Design.fileop~3ca4da68f1727373:
  Delete: bdb/db/Design.fileop
BitKeeper/deleted/.del-db185_int.h~61bee3736e7959ef:
  Delete: bdb/db185/db185_int.h
BitKeeper/deleted/.del-acconfig.h~411e8854d67ad8b5:
  Delete: bdb/dist/acconfig.h
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Delete: bdb/dist/aclocal/mutex.m4
BitKeeper/deleted/.del-options.m4~b9d0ca637213750a:
  Delete: bdb/dist/aclocal/options.m4
BitKeeper/deleted/.del-programs.m4~3ce7890b47732b30:
  Delete: bdb/dist/aclocal/programs.m4
BitKeeper/deleted/.del-tcl.m4~f944e2db93c3b6db:
  Delete: bdb/dist/aclocal/tcl.m4
BitKeeper/deleted/.del-types.m4~59cae158c9a32cff:
  Delete: bdb/dist/aclocal/types.m4
BitKeeper/deleted/.del-script~d38f6d3a4f159cb4:
  Delete: bdb/dist/build/script
BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
  Delete: bdb/dist/configure.in
BitKeeper/deleted/.del-ltconfig~66bbd007d8024af:
  Delete: bdb/dist/ltconfig
BitKeeper/deleted/.del-rec_ctemp~a28554362534f00a:
  Delete: bdb/dist/rec_ctemp
BitKeeper/deleted/.del-s_tcl~2ffe4326459fcd9f:
  Delete: bdb/dist/s_tcl
BitKeeper/deleted/.del-.IGNORE_ME~d8148b08fa7d5d15:
  Delete: bdb/dist/template/.IGNORE_ME
BitKeeper/deleted/.del-btree.h~179f2aefec1753d:
  Delete: bdb/include/btree.h
BitKeeper/deleted/.del-cxx_int.h~6b649c04766508f8:
  Delete: bdb/include/cxx_int.h
BitKeeper/deleted/.del-db.src~6b433ae615b16a8d:
  Delete: bdb/include/db.src
BitKeeper/deleted/.del-db_185.h~ad8b373d9391d35c:
  Delete: bdb/include/db_185.h
BitKeeper/deleted/.del-db_am.h~a714912b6b75932f:
  Delete: bdb/include/db_am.h
BitKeeper/deleted/.del-db_cxx.h~fcafadf45f5d19e9:
  Delete: bdb/include/db_cxx.h
BitKeeper/deleted/.del-db_dispatch.h~6844f20f7eb46904:
  Delete: bdb/include/db_dispatch.h
BitKeeper/deleted/.del-db_int.src~419a3f48b6a01da7:
  Delete: bdb/include/db_int.src
BitKeeper/deleted/.del-db_join.h~76f9747a42c3399a:
  Delete: bdb/include/db_join.h
BitKeeper/deleted/.del-db_page.h~e302ca3a4db3abdc:
  Delete: bdb/include/db_page.h
BitKeeper/deleted/.del-db_server_int.h~e1d20b6ba3bca1ab:
  Delete: bdb/include/db_server_int.h
BitKeeper/deleted/.del-db_shash.h~5fbf2d696fac90f3:
  Delete: bdb/include/db_shash.h
BitKeeper/deleted/.del-db_swap.h~1e60887550864a59:
  Delete: bdb/include/db_swap.h
BitKeeper/deleted/.del-db_upgrade.h~c644eee73701fc8d:
  Delete: bdb/include/db_upgrade.h
BitKeeper/deleted/.del-db_verify.h~b8d6c297c61f342e:
  Delete: bdb/include/db_verify.h
BitKeeper/deleted/.del-debug.h~dc2b4f2cf27ccebc:
  Delete: bdb/include/debug.h
BitKeeper/deleted/.del-hash.h~2aaa548b28882dfb:
  Delete: bdb/include/hash.h
BitKeeper/deleted/.del-lock.h~a761c1b7de57b77f:
  Delete: bdb/include/lock.h
BitKeeper/deleted/.del-log.h~ff20184238e35e4d:
  Delete: bdb/include/log.h
BitKeeper/deleted/.del-mp.h~7e317597622f3411:
  Delete: bdb/include/mp.h
BitKeeper/deleted/.del-mutex.h~d3ae7a2977a68137:
  Delete: bdb/include/mutex.h
BitKeeper/deleted/.del-os.h~91867cc8757cd0e3:
  Delete: bdb/include/os.h
BitKeeper/deleted/.del-os_jump.h~e1b939fa5151d4be:
  Delete: bdb/include/os_jump.h
BitKeeper/deleted/.del-qam.h~6fad0c1b5723d597:
  Delete: bdb/include/qam.h
BitKeeper/deleted/.del-queue.h~4c72c0826c123d5:
  Delete: bdb/include/queue.h
BitKeeper/deleted/.del-region.h~513fe04d977ca0fc:
  Delete: bdb/include/region.h
BitKeeper/deleted/.del-shqueue.h~525fc3e6c2025c36:
  Delete: bdb/include/shqueue.h
BitKeeper/deleted/.del-tcl_db.h~c536fd61a844f23f:
  Delete: bdb/include/tcl_db.h
BitKeeper/deleted/.del-txn.h~c8d94b221ec147e4:
  Delete: bdb/include/txn.h
BitKeeper/deleted/.del-xa.h~ecc466493aae9d9a:
  Delete: bdb/include/xa.h
BitKeeper/deleted/.del-DbRecoveryInit.java~756b52601a0b9023:
  Delete: bdb/java/src/com/sleepycat/db/DbRecoveryInit.java
BitKeeper/deleted/.del-DbTxnRecover.java~74607cba7ab89d6d:
  Delete: bdb/java/src/com/sleepycat/db/DbTxnRecover.java
BitKeeper/deleted/.del-lock_conflict.c~fc5e0f14cf597a2b:
  Delete: bdb/lock/lock_conflict.c
BitKeeper/deleted/.del-log.src~53ac9e7b5cb023f2:
  Delete: bdb/log/log.src
BitKeeper/deleted/.del-log_findckp.c~24287f008916e81f:
  Delete: bdb/log/log_findckp.c
BitKeeper/deleted/.del-log_rec.c~d51711f2cac09297:
  Delete: bdb/log/log_rec.c
BitKeeper/deleted/.del-log_register.c~b40bb4efac75ca15:
  Delete: bdb/log/log_register.c
BitKeeper/deleted/.del-Design~b3d0f179f2767b:
  Delete: bdb/mp/Design
BitKeeper/deleted/.del-os_finit.c~95dbefc6fe79b26c:
  Delete: bdb/os/os_finit.c
BitKeeper/deleted/.del-os_abs.c~df95d1e7db81924:
  Delete: bdb/os_vxworks/os_abs.c
BitKeeper/deleted/.del-os_finit.c~803b484bdb9d0122:
  Delete: bdb/os_vxworks/os_finit.c
BitKeeper/deleted/.del-os_map.c~3a6d7926398b76d3:
  Delete: bdb/os_vxworks/os_map.c
BitKeeper/deleted/.del-os_finit.c~19a227c6d3c78ad:
  Delete: bdb/os_win32/os_finit.c
BitKeeper/deleted/.del-log-corruption.patch~1cf2ecc7c6408d5d:
  Delete: bdb/patches/log-corruption.patch
BitKeeper/deleted/.del-Btree.pm~af6d0c5eaed4a98e:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Btree.pm
BitKeeper/deleted/.del-BerkeleyDB.pm~7244036d4482643:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pm
BitKeeper/deleted/.del-BerkeleyDB.pod~e7b18fd6132448e3:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod
BitKeeper/deleted/.del-Hash.pm~10292a26c06a5c95:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB/Hash.pm
BitKeeper/deleted/.del-BerkeleyDB.pod.P~79f76a1495eda203:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.pod.P
BitKeeper/deleted/.del-BerkeleyDB.xs~80c99afbd98e392c:
  Delete: bdb/perl.BerkeleyDB/BerkeleyDB.xs
BitKeeper/deleted/.del-Changes~729c1891efa60de9:
  Delete: bdb/perl.BerkeleyDB/Changes
BitKeeper/deleted/.del-MANIFEST~63a1e34aecf157a0:
  Delete: bdb/perl.BerkeleyDB/MANIFEST
BitKeeper/deleted/.del-Makefile.PL~c68797707d8df87a:
  Delete: bdb/perl.BerkeleyDB/Makefile.PL
BitKeeper/deleted/.del-README~5f2f579b1a241407:
  Delete: bdb/perl.BerkeleyDB/README
BitKeeper/deleted/.del-Todo~dca3c66c193adda9:
  Delete: bdb/perl.BerkeleyDB/Todo
BitKeeper/deleted/.del-config.in~ae81681e450e0999:
  Delete: bdb/perl.BerkeleyDB/config.in
BitKeeper/deleted/.del-dbinfo~28ad67d83be4f68e:
  Delete: bdb/perl.BerkeleyDB/dbinfo
BitKeeper/deleted/.del-mkconsts~543ab60669c7a04e:
  Delete: bdb/perl.BerkeleyDB/mkconsts
BitKeeper/deleted/.del-mkpod~182c0ca54e439afb:
  Delete: bdb/perl.BerkeleyDB/mkpod
BitKeeper/deleted/.del-5.004~e008cb5a48805543:
  Delete: bdb/perl.BerkeleyDB/patches/5.004
BitKeeper/deleted/.del-irix_6_5.pl~61662bb08afcdec8:
  Delete: bdb/perl.BerkeleyDB/hints/irix_6_5.pl
BitKeeper/deleted/.del-solaris.pl~6771e7182394e152:
  Delete: bdb/perl.BerkeleyDB/hints/solaris.pl
BitKeeper/deleted/.del-typemap~783b8f5295b05f3d:
  Delete: bdb/perl.BerkeleyDB/typemap
BitKeeper/deleted/.del-5.004_01~6081ce2fff7b0bc:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_01
BitKeeper/deleted/.del-5.004_02~87214eac35ad9e6:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_02
BitKeeper/deleted/.del-5.004_03~9a672becec7cb40f:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~e326cb51af09d154:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~7ab457a1e41a92fe:
  Delete: bdb/perl.BerkeleyDB/patches/5.004_05
BitKeeper/deleted/.del-5.005~f9e2d59b5964cd4b:
  Delete: bdb/perl.BerkeleyDB/patches/5.005
BitKeeper/deleted/.del-5.005_01~3eb9fb7b5842ea8e:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~67477ce0bef717cb:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~c4c29a1fb21e290a:
  Delete: bdb/perl.BerkeleyDB/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~e1fb9897d124ee22:
  Delete: bdb/perl.BerkeleyDB/patches/5.6.0
BitKeeper/deleted/.del-btree.t~e4a1a3c675ddc406:
  Delete: bdb/perl.BerkeleyDB/t/btree.t
BitKeeper/deleted/.del-db-3.0.t~d2c60991d84558f2:
  Delete: bdb/perl.BerkeleyDB/t/db-3.0.t
BitKeeper/deleted/.del-db-3.1.t~6ee88cd13f55e018:
  Delete: bdb/perl.BerkeleyDB/t/db-3.1.t
BitKeeper/deleted/.del-db-3.2.t~f73b6461f98fd1cf:
  Delete: bdb/perl.BerkeleyDB/t/db-3.2.t
BitKeeper/deleted/.del-destroy.t~cc6a2ae1980a2ecd:
  Delete: bdb/perl.BerkeleyDB/t/destroy.t
BitKeeper/deleted/.del-env.t~a8604a4499c4bd07:
  Delete: bdb/perl.BerkeleyDB/t/env.t
BitKeeper/deleted/.del-examples.t~2571b77c3cc75574:
  Delete: bdb/perl.BerkeleyDB/t/examples.t
BitKeeper/deleted/.del-examples.t.T~8228bdd75ac78b88:
  Delete: bdb/perl.BerkeleyDB/t/examples.t.T
BitKeeper/deleted/.del-examples3.t.T~66a186897a87026d:
  Delete: bdb/perl.BerkeleyDB/t/examples3.t.T
BitKeeper/deleted/.del-examples3.t~fe3822ba2f2d7f83:
  Delete: bdb/perl.BerkeleyDB/t/examples3.t
BitKeeper/deleted/.del-filter.t~f87b045c1b708637:
  Delete: bdb/perl.BerkeleyDB/t/filter.t
BitKeeper/deleted/.del-hash.t~616bfb4d644de3a3:
  Delete: bdb/perl.BerkeleyDB/t/hash.t
BitKeeper/deleted/.del-join.t~29fc39f74a83ca22:
  Delete: bdb/perl.BerkeleyDB/t/join.t
BitKeeper/deleted/.del-mldbm.t~31f5015341eea040:
  Delete: bdb/perl.BerkeleyDB/t/mldbm.t
BitKeeper/deleted/.del-queue.t~8f338034ce44a641:
  Delete: bdb/perl.BerkeleyDB/t/queue.t
BitKeeper/deleted/.del-recno.t~d4ddbd3743add63e:
  Delete: bdb/perl.BerkeleyDB/t/recno.t
BitKeeper/deleted/.del-strict.t~6885cdd2ea71ca2d:
  Delete: bdb/perl.BerkeleyDB/t/strict.t
BitKeeper/deleted/.del-subdb.t~aab62a5d5864c603:
  Delete: bdb/perl.BerkeleyDB/t/subdb.t
BitKeeper/deleted/.del-txn.t~65033b8558ae1216:
  Delete: bdb/perl.BerkeleyDB/t/txn.t
BitKeeper/deleted/.del-unknown.t~f3710458682665e1:
  Delete: bdb/perl.BerkeleyDB/t/unknown.t
BitKeeper/deleted/.del-Changes~436f74a5c414c65b:
  Delete: bdb/perl.DB_File/Changes
BitKeeper/deleted/.del-DB_File.pm~ae0951c6c7665a82:
  Delete: bdb/perl.DB_File/DB_File.pm
BitKeeper/deleted/.del-DB_File.xs~89e49a0b5556f1d8:
  Delete: bdb/perl.DB_File/DB_File.xs
BitKeeper/deleted/.del-DB_File_BS~290fad5dbbb87069:
  Delete: bdb/perl.DB_File/DB_File_BS
BitKeeper/deleted/.del-MANIFEST~90ee581572bdd4ac:
  Delete: bdb/perl.DB_File/MANIFEST
BitKeeper/deleted/.del-Makefile.PL~ac0567bb5a377e38:
  Delete: bdb/perl.DB_File/Makefile.PL
BitKeeper/deleted/.del-README~77e924a5a9bae6b3:
  Delete: bdb/perl.DB_File/README
BitKeeper/deleted/.del-config.in~ab4c2792b86a810b:
  Delete: bdb/perl.DB_File/config.in
BitKeeper/deleted/.del-dbinfo~461c43b30fab2cb:
  Delete: bdb/perl.DB_File/dbinfo
BitKeeper/deleted/.del-dynixptx.pl~50dcddfae25d17e9:
  Delete: bdb/perl.DB_File/hints/dynixptx.pl
BitKeeper/deleted/.del-typemap~55cffb3288a9e587:
  Delete: bdb/perl.DB_File/typemap
BitKeeper/deleted/.del-version.c~a4df0e646f8b3975:
  Delete: bdb/perl.DB_File/version.c
BitKeeper/deleted/.del-5.004_01~d6830d0082702af7:
  Delete: bdb/perl.DB_File/patches/5.004_01
BitKeeper/deleted/.del-5.004_02~78b082dc80c91031:
  Delete: bdb/perl.DB_File/patches/5.004_02
BitKeeper/deleted/.del-5.004~4411ec2e3c9e008b:
  Delete: bdb/perl.DB_File/patches/5.004
BitKeeper/deleted/.del-sco.pl~1e795fe14fe4dcfe:
  Delete: bdb/perl.DB_File/hints/sco.pl
BitKeeper/deleted/.del-5.004_03~33f274648b160d95:
  Delete: bdb/perl.DB_File/patches/5.004_03
BitKeeper/deleted/.del-5.004_04~8f3d1b3cf18bb20a:
  Delete: bdb/perl.DB_File/patches/5.004_04
BitKeeper/deleted/.del-5.004_05~9c0f02e7331e142:
  Delete: bdb/perl.DB_File/patches/5.004_05
BitKeeper/deleted/.del-5.005~c2108cb2e3c8d951:
  Delete: bdb/perl.DB_File/patches/5.005
BitKeeper/deleted/.del-5.005_01~3b45e9673afc4cfa:
  Delete: bdb/perl.DB_File/patches/5.005_01
BitKeeper/deleted/.del-5.005_02~9fe5766bb02a4522:
  Delete: bdb/perl.DB_File/patches/5.005_02
BitKeeper/deleted/.del-5.005_03~ffa1c38c19ae72ea:
  Delete: bdb/perl.DB_File/patches/5.005_03
BitKeeper/deleted/.del-5.6.0~373be3a5ce47be85:
  Delete: bdb/perl.DB_File/patches/5.6.0
BitKeeper/deleted/.del-db-btree.t~3231595a1c241eb3:
  Delete: bdb/perl.DB_File/t/db-btree.t
BitKeeper/deleted/.del-db-hash.t~7c4ad0c795c7fad2:
  Delete: bdb/perl.DB_File/t/db-hash.t
BitKeeper/deleted/.del-db-recno.t~6c2d3d80b9ba4a50:
  Delete: bdb/perl.DB_File/t/db-recno.t
BitKeeper/deleted/.del-db_server.sed~cdb00ebcd48a64e2:
  Delete: bdb/rpc_server/db_server.sed
BitKeeper/deleted/.del-db_server_proc.c~d46c8f409c3747f4:
  Delete: bdb/rpc_server/db_server_proc.c
BitKeeper/deleted/.del-db_server_svc.sed~3f5e59f334fa4607:
  Delete: bdb/rpc_server/db_server_svc.sed
BitKeeper/deleted/.del-db_server_util.c~a809f3a4629acda:
  Delete: bdb/rpc_server/db_server_util.c
BitKeeper/deleted/.del-log.tcl~ff1b41f1355b97d7:
  Delete: bdb/test/log.tcl
BitKeeper/deleted/.del-mpool.tcl~b0df4dc1b04db26c:
  Delete: bdb/test/mpool.tcl
BitKeeper/deleted/.del-mutex.tcl~52fd5c73a150565:
  Delete: bdb/test/mutex.tcl
BitKeeper/deleted/.del-txn.tcl~c4ff071550b5446e:
  Delete: bdb/test/txn.tcl
BitKeeper/deleted/.del-README~e800a12a5392010a:
  Delete: bdb/test/upgrade/README
BitKeeper/deleted/.del-pack-2.6.6.pl~89d5076d758d3e98:
  Delete: bdb/test/upgrade/generate-2.X/pack-2.6.6.pl
BitKeeper/deleted/.del-test-2.6.patch~4a52dc83d447547b:
  Delete: bdb/test/upgrade/generate-2.X/test-2.6.patch

2 files changed, 606 insertions, 231 deletions

diff --git a/bdb/rpc_client/client.c b/bdb/rpc_client/client.c
index 70744f54b4c..b6367e21449 100644
--- a/bdb/rpc_client/client.c
+++ b/bdb/rpc_client/client.c
@@ -1,20 +1,23 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1996, 1997, 1998, 1999, 2000
+ * Copyright (c) 1996-2002
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: client.c,v 1.21 2000/11/30 00:58:44 ubell Exp $";
+static const char revid[] = "$Id: client.c,v 1.51 2002/08/06 06:18:15 bostic Exp $";
 #endif /* not lint */
 
 #ifdef HAVE_RPC
 #ifndef NO_SYSTEM_INCLUDES
 #include <sys/types.h>
 
+#ifdef HAVE_VXWORKS
+#include <rpcLib.h>
+#endif
 #include <rpc/rpc.h>
 
 #include <ctype.h>
@@ -22,71 +25,124 @@ static const char revid[] = "$Id: client.c,v 1.21 2000/11/30 00:58:44 ubell Exp
 #include <string.h>
 #include <unistd.h>
 #endif
-#include "db_server.h"
 
 #include "db_int.h"
-#include "txn.h"
-#include "gen_client_ext.h"
-#include "rpc_client_ext.h"
+#include "dbinc/db_page.h"
+#include "dbinc/db_am.h"
+#include "dbinc/txn.h"
+
+#include "dbinc_auto/db_server.h"
+#include "dbinc_auto/rpc_client_ext.h"
+
+static int __dbcl_c_destroy __P((DBC *));
+static int __dbcl_txn_close __P((DB_ENV *));
 
 /*
- * __dbclenv_server --
+ * __dbcl_envrpcserver --
  *	Initialize an environment's server.
  *
- * PUBLIC: int __dbcl_envserver __P((DB_ENV *, char *, long, long, u_int32_t));
+ * PUBLIC: int __dbcl_envrpcserver
+ * PUBLIC:     __P((DB_ENV *, void *, const char *, long, long, u_int32_t));
  */
 int
-__dbcl_envserver(dbenv, host, tsec, ssec, flags)
+__dbcl_envrpcserver(dbenv, clnt, host, tsec, ssec, flags)
 	DB_ENV *dbenv;
-	char *host;
+	void *clnt;
+	const char *host;
 	long tsec, ssec;
 	u_int32_t flags;
 {
 	CLIENT *cl;
-	__env_create_msg req;
-	__env_create_reply *replyp;
 	struct timeval tp;
-	int ret;
 
 	COMPQUIET(flags, 0);
 
 #ifdef HAVE_VXWORKS
-	if ((ret = rpcTaskInit()) != 0) {
+	if (rpcTaskInit() != 0) {
 		__db_err(dbenv, "Could not initialize VxWorks RPC");
 		return (ERROR);
 	}
 #endif
-	if ((cl =
-	    clnt_create(host, DB_SERVERPROG, DB_SERVERVERS, "tcp")) == NULL) {
-		__db_err(dbenv, clnt_spcreateerror(host));
-		return (DB_NOSERVER);
+	if (RPC_ON(dbenv)) {
+		__db_err(dbenv, "Already set an RPC handle");
+		return (EINVAL);
 	}
-	dbenv->cl_handle = cl;
-
-	if (tsec != 0) {
-		tp.tv_sec = tsec;
-		tp.tv_usec = 0;
-		(void)clnt_control(cl, CLSET_TIMEOUT, (char *)&tp);
-	}
-
-	req.timeout = ssec;
 	/*
-	 * CALL THE SERVER
+	 * Only create the client and set its timeout if the user
+	 * did not pass us a client structure to begin with.
 	 */
-	if ((replyp = __db_env_create_1(&req, cl)) == NULL) {
-		__db_err(dbenv, clnt_sperror(cl, "Berkeley DB"));
-		return (DB_NOSERVER);
+	if (clnt == NULL) {
+		if ((cl = clnt_create((char *)host, DB_RPC_SERVERPROG,
+		    DB_RPC_SERVERVERS, "tcp")) == NULL) {
+			__db_err(dbenv, clnt_spcreateerror((char *)host));
+			return (DB_NOSERVER);
+		}
+		if (tsec != 0) {
+			tp.tv_sec = tsec;
+			tp.tv_usec = 0;
+			(void)clnt_control(cl, CLSET_TIMEOUT, (char *)&tp);
+		}
+	} else {
+		cl = (CLIENT *)clnt;
+		F_SET(dbenv, DB_ENV_RPCCLIENT_GIVEN);
 	}
+	dbenv->cl_handle = cl;
 
-	/*
-	 * Process reply and free up our space from request
-	 * SUCCESS:  Store ID from server.
-	 */
-	if ((ret = replyp->status) != 0)
+	return (__dbcl_env_create(dbenv, ssec));
+}
+
+/*
+ * __dbcl_env_open_wrap --
+ *	Wrapper function for DB_ENV->open function for clients.
+ *	We need a wrapper function to deal with DB_USE_ENVIRON* flags
+ *	and we don't want to complicate the generated code for env_open.
+ *
+ * PUBLIC: int __dbcl_env_open_wrap
+ * PUBLIC:     __P((DB_ENV *, const char *, u_int32_t, int));
+ */
+int
+__dbcl_env_open_wrap(dbenv, home, flags, mode)
+	DB_ENV * dbenv;
+	const char * home;
+	u_int32_t flags;
+	int mode;
+{
+	int ret;
+
+	if (LF_ISSET(DB_THREAD)) {
+		__db_err(dbenv, "DB_THREAD not allowed on RPC clients");
+		return (EINVAL);
+	}
+	if ((ret = __db_home(dbenv, home, flags)) != 0)
 		return (ret);
+	return (__dbcl_env_open(dbenv, dbenv->db_home, flags, mode));
+}
 
-	dbenv->cl_id = replyp->envcl_id;
-	return (0);
+/*
+ * __dbcl_db_open_wrap --
+ *	Wrapper function for DB->open function for clients.
+ *	We need a wrapper function to error on DB_THREAD flag.
+ *	and we don't want to complicate the generated code.
+ *
+ * PUBLIC: int __dbcl_db_open_wrap
+ * PUBLIC:     __P((DB *, DB_TXN *, const char *, const char *,
+ * PUBLIC:     DBTYPE, u_int32_t, int));
+ */
+int
+__dbcl_db_open_wrap(dbp, txnp, name, subdb, type, flags, mode)
+	DB * dbp;
+	DB_TXN * txnp;
+	const char * name;
+	const char * subdb;
+	DBTYPE type;
+	u_int32_t flags;
+	int mode;
+{
+	if (LF_ISSET(DB_THREAD)) {
+		__db_err(dbp->dbenv, "DB_THREAD not allowed on RPC clients");
+		return (EINVAL);
+	}
+	return (__dbcl_db_open(dbp, txnp, name, subdb, type, flags, mode));
 }
 
 /*
@@ -114,17 +170,50 @@ __dbcl_refresh(dbenv)
 		ret = __dbcl_txn_close(dbenv);
 		dbenv->tx_handle = NULL;
 	}
-	if (cl != NULL)
+	if (!F_ISSET(dbenv, DB_ENV_RPCCLIENT_GIVEN) && cl != NULL)
 		clnt_destroy(cl);
 	dbenv->cl_handle = NULL;
+	if (dbenv->db_home != NULL) {
+		__os_free(dbenv, dbenv->db_home);
+		dbenv->db_home = NULL;
+	}
+	return (ret);
+}
+
+/*
+ * __dbcl_retcopy --
+ *	Copy the returned data into the user's DBT, handling allocation flags,
+ *	but not DB_DBT_PARTIAL.
+ *
+ * PUBLIC: int __dbcl_retcopy __P((DB_ENV *, DBT *,
+ * PUBLIC:    void *, u_int32_t, void **, u_int32_t *));
+ */
+int
+__dbcl_retcopy(dbenv, dbt, data, len, memp, memsize)
+	DB_ENV *dbenv;
+	DBT *dbt;
+	void *data;
+	u_int32_t len;
+	void **memp;
+	u_int32_t *memsize;
+{
+	int ret;
+	u_int32_t orig_flags;
+
+	/*
+	 * The RPC server handles DB_DBT_PARTIAL, so we mask it out here to
+	 * avoid the handling of partials in __db_retcopy.
+	 */
+	orig_flags = dbt->flags;
+	F_CLR(dbt, DB_DBT_PARTIAL);
+	ret = __db_retcopy(dbenv, dbt, data, len, memp, memsize);
+	dbt->flags = orig_flags;
 	return (ret);
 }
 
 /*
  * __dbcl_txn_close --
  *	Clean up an environment's transactions.
- *
- * PUBLIC: int __dbcl_txn_close __P((DB_ENV *));
  */
 int
 __dbcl_txn_close(dbenv)
@@ -147,7 +236,7 @@ __dbcl_txn_close(dbenv)
 	while ((txnp = TAILQ_FIRST(&tmgrp->txn_chain)) != NULL)
 		__dbcl_txn_end(txnp);
 
-	__os_free(tmgrp, sizeof(*tmgrp));
+	__os_free(dbenv, tmgrp);
 	return (ret);
 
 }
@@ -187,18 +276,57 @@ __dbcl_txn_end(txnp)
 	if (txnp->parent != NULL)
 		TAILQ_REMOVE(&txnp->parent->kids, txnp, klinks);
 	TAILQ_REMOVE(&mgr->txn_chain, txnp, links);
-	__os_free(txnp, sizeof(*txnp));
+	__os_free(dbenv, txnp);
+}
 
-	return;
+/*
+ * __dbcl_txn_setup --
+ *	Setup a client transaction structure.
+ *
+ * PUBLIC: void __dbcl_txn_setup __P((DB_ENV *, DB_TXN *, DB_TXN *, u_int32_t));
+ */
+void
+__dbcl_txn_setup(dbenv, txn, parent, id)
+	DB_ENV *dbenv;
+	DB_TXN *txn;
+	DB_TXN *parent;
+	u_int32_t id;
+{
+	txn->mgrp = dbenv->tx_handle;
+	txn->parent = parent;
+	txn->txnid = id;
+
+	/*
+	 * XXX
+	 * In DB library the txn_chain is protected by the mgrp->mutexp.
+	 * However, that mutex is implemented in the environments shared
+	 * memory region.  The client library does not support all of the
+	 * region - that just get forwarded to the server.  Therefore,
+	 * the chain is unprotected here, but properly protected on the
+	 * server.
+	 */
+	TAILQ_INSERT_TAIL(&txn->mgrp->txn_chain, txn, links);
+
+	TAILQ_INIT(&txn->kids);
+
+	if (parent != NULL)
+		TAILQ_INSERT_HEAD(&parent->kids, txn, klinks);
+
+	txn->abort = __dbcl_txn_abort;
+	txn->commit = __dbcl_txn_commit;
+	txn->discard = __dbcl_txn_discard;
+	txn->id = __txn_id;
+	txn->prepare = __dbcl_txn_prepare;
+	txn->set_timeout = __dbcl_txn_timeout;
+
+	txn->flags = TXN_MALLOC;
 }
 
 /*
  * __dbcl_c_destroy --
  *	Destroy a cursor.
- *
- * PUBLIC: int __dbcl_c_destroy __P((DBC *));
  */
-int
+static int
 __dbcl_c_destroy(dbc)
 	DBC *dbc;
 {
@@ -207,7 +335,14 @@ __dbcl_c_destroy(dbc)
 	dbp = dbc->dbp;
 
 	TAILQ_REMOVE(&dbp->free_queue, dbc, links);
-	__os_free(dbc, sizeof(*dbc));
+	/* Discard any memory used to store returned data. */
+	if (dbc->my_rskey.data != NULL)
+		__os_free(dbc->dbp->dbenv, dbc->my_rskey.data);
+	if (dbc->my_rkey.data != NULL)
+		__os_free(dbc->dbp->dbenv, dbc->my_rkey.data);
+	if (dbc->my_rdata.data != NULL)
+		__os_free(dbc->dbp->dbenv, dbc->my_rdata.data);
+	__os_free(NULL, dbc);
 
 	return (0);
 }
@@ -219,24 +354,23 @@ __dbcl_c_destroy(dbc)
  * PUBLIC: void __dbcl_c_refresh __P((DBC *));
  */
 void
-__dbcl_c_refresh(dbcp)
-	DBC *dbcp;
+__dbcl_c_refresh(dbc)
+	DBC *dbc;
 {
 	DB *dbp;
 
-	dbp = dbcp->dbp;
-	dbcp->flags = 0;
-	dbcp->cl_id = 0;
+	dbp = dbc->dbp;
+	dbc->flags = 0;
+	dbc->cl_id = 0;
 
 	/*
 	 * If dbp->cursor fails locally, we use a local dbc so that
 	 * we can close it.  In that case, dbp will be NULL.
 	 */
 	if (dbp != NULL) {
-		TAILQ_REMOVE(&dbp->active_queue, dbcp, links);
-		TAILQ_INSERT_TAIL(&dbp->free_queue, dbcp, links);
+		TAILQ_REMOVE(&dbp->active_queue, dbc, links);
+		TAILQ_INSERT_TAIL(&dbp->free_queue, dbc, links);
 	}
-	return;
 }
 
 /*
@@ -246,13 +380,13 @@ __dbcl_c_refresh(dbcp)
  * PUBLIC: int __dbcl_c_setup __P((long, DB *, DBC **));
  */
 int
-__dbcl_c_setup(cl_id, dbp, dbcpp)
+__dbcl_c_setup(cl_id, dbp, dbcp)
 	long cl_id;
 	DB *dbp;
-	DBC **dbcpp;
+	DBC **dbcp;
 {
 	DBC *dbc, tmpdbc;
-	int ret, t_ret;
+	int ret;
 
 	if ((dbc = TAILQ_FIRST(&dbp->free_queue)) != NULL)
 		TAILQ_REMOVE(&dbp->free_queue, dbc, links);
@@ -260,12 +394,12 @@ __dbcl_c_setup(cl_id, dbp, dbcpp)
 		if ((ret =
 		    __os_calloc(dbp->dbenv, 1, sizeof(DBC), &dbc)) != 0) {
 			/*
-			* If we die here, set up a tmp dbc to call the
-			* server to shut down that cursor.
-			*/
+			 * If we die here, set up a tmp dbc to call the
+			 * server to shut down that cursor.
+			 */
 			tmpdbc.dbp = NULL;
 			tmpdbc.cl_id = cl_id;
-			t_ret = __dbcl_dbc_close(&tmpdbc);
+			(void)__dbcl_dbc_close(&tmpdbc);
 			return (ret);
 		}
 		dbc->c_close = __dbcl_dbc_close;
@@ -273,62 +407,14 @@ __dbcl_c_setup(cl_id, dbp, dbcpp)
 		dbc->c_del = __dbcl_dbc_del;
 		dbc->c_dup = __dbcl_dbc_dup;
 		dbc->c_get = __dbcl_dbc_get;
+		dbc->c_pget = __dbcl_dbc_pget;
 		dbc->c_put = __dbcl_dbc_put;
 		dbc->c_am_destroy = __dbcl_c_destroy;
 	}
 	dbc->cl_id = cl_id;
 	dbc->dbp = dbp;
 	TAILQ_INSERT_TAIL(&dbp->active_queue, dbc, links);
-	*dbcpp = dbc;
-	return (0);
-}
-
-/*
- * __dbcl_retcopy --
- *	Copy the returned data into the user's DBT, handling special flags
- *	as they apply to a client.  Modeled after __db_retcopy().
- *
- * PUBLIC: int __dbcl_retcopy __P((DB_ENV *, DBT *, void *, u_int32_t));
- */
-int
-__dbcl_retcopy(dbenv, dbt, data, len)
-	DB_ENV *dbenv;
-	DBT *dbt;
-	void *data;
-	u_int32_t len;
-{
-	int ret;
-
-	/*
-	 * No need to handle DB_DBT_PARTIAL here, server already did.
-	 */
-	dbt->size = len;
-
-	/*
-	 * Allocate memory to be owned by the application: DB_DBT_MALLOC
-	 * and DB_DBT_REALLOC.  Always allocate even if we're copying 0 bytes.
-	 * Or use memory specified by application: DB_DBT_USERMEM.
-	 */
-	if (F_ISSET(dbt, DB_DBT_MALLOC)) {
-		if ((ret = __os_malloc(dbenv, len, NULL, &dbt->data)) != 0)
-			return (ret);
-	} else if (F_ISSET(dbt, DB_DBT_REALLOC)) {
-		if ((ret = __os_realloc(dbenv, len, NULL, &dbt->data)) != 0)
-			return (ret);
-	} else if (F_ISSET(dbt, DB_DBT_USERMEM)) {
-		if (len != 0 && (dbt->data == NULL || dbt->ulen < len))
-			return (ENOMEM);
-	} else {
-		/*
-		 * If no user flags, then set the DBT to point to the
-		 * returned data pointer and return.
-		 */
-		dbt->data = data;
-		return (0);
-	}
-
-	if (len != 0)
-		memcpy(dbt->data, data, len);
+	*dbcp = dbc;
 	return (0);
 }
 
@@ -363,9 +449,16 @@ __dbcl_dbclose_common(dbp)
 
 	TAILQ_INIT(&dbp->free_queue);
 	TAILQ_INIT(&dbp->active_queue);
+	/* Discard any memory used to store returned data. */
+	if (dbp->my_rskey.data != NULL)
+		__os_free(dbp->dbenv, dbp->my_rskey.data);
+	if (dbp->my_rkey.data != NULL)
+		__os_free(dbp->dbenv, dbp->my_rkey.data);
+	if (dbp->my_rdata.data != NULL)
+		__os_free(dbp->dbenv, dbp->my_rdata.data);
 
 	memset(dbp, CLEAR_BYTE, sizeof(*dbp));
-	__os_free(dbp, sizeof(*dbp));
+	__os_free(NULL, dbp);
 	return (ret);
 }
 #endif /* HAVE_RPC */
diff --git a/bdb/rpc_client/gen_client_ret.c b/bdb/rpc_client/gen_client_ret.c
index 17e3f195fc3..f35589738cd 100644
--- a/bdb/rpc_client/gen_client_ret.c
+++ b/bdb/rpc_client/gen_client_ret.c
@@ -1,14 +1,14 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 2000
- *      Sleepycat Software.  All rights reserved.
+ * Copyright (c) 2000-2002
+ *	Sleepycat Software.  All rights reserved.
  */
 
 #include "db_config.h"
 
 #ifndef lint
-static const char revid[] = "$Id: gen_client_ret.c,v 1.29 2000/12/31 19:26:23 bostic Exp $";
+static const char revid[] = "$Id: gen_client_ret.c,v 1.57 2002/08/06 06:18:37 bostic Exp $";
 #endif /* not lint */
 
 #ifdef HAVE_RPC
@@ -19,17 +19,19 @@ static const char revid[] = "$Id: gen_client_ret.c,v 1.29 2000/12/31 19:26:23 bo
 
 #include <string.h>
 #endif
-#include "db_server.h"
 
 #include "db_int.h"
-#include "db_page.h"
-#include "txn.h"
-#include "db_ext.h"
-#include "rpc_client_ext.h"
+#include "dbinc/db_page.h"
+#include "dbinc/db_am.h"
+#include "dbinc/txn.h"
 
-static void __db_db_stat_statsfree __P((u_int32_t *));
-static int __db_db_stat_statslist __P((__db_stat_statsreplist *, u_int32_t **));
+#include "dbinc_auto/db_server.h"
+#include "dbinc_auto/rpc_client_ext.h"
 
+/*
+ * PUBLIC: int __dbcl_env_close_ret
+ * PUBLIC:     __P((DB_ENV *, u_int32_t, __env_close_reply *));
+ */
 int
 __dbcl_env_close_ret(dbenv, flags, replyp)
 	DB_ENV *dbenv;
@@ -41,13 +43,36 @@ __dbcl_env_close_ret(dbenv, flags, replyp)
 	COMPQUIET(flags, 0);
 
 	ret = __dbcl_refresh(dbenv);
-	__os_free(dbenv, sizeof(*dbenv));
+	__os_free(NULL, dbenv);
 	if (replyp->status == 0 && ret != 0)
 		return (ret);
 	else
 		return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_env_create_ret
+ * PUBLIC:     __P((DB_ENV *, long, __env_create_reply *));
+ */
+int
+__dbcl_env_create_ret(dbenv, timeout, replyp)
+	DB_ENV * dbenv;
+	long timeout;
+	__env_create_reply *replyp;
+{
+
+	COMPQUIET(timeout, 0);
+
+	if (replyp->status != 0)
+		return (replyp->status);
+	dbenv->cl_id = replyp->envcl_id;
+	return (replyp->status);
+}
+
+/*
+ * PUBLIC: int __dbcl_env_open_ret __P((DB_ENV *,
+ * PUBLIC:     const char *, u_int32_t, int, __env_open_reply *));
+ */
 int
 __dbcl_env_open_ret(dbenv, home, flags, mode, replyp)
 	DB_ENV *dbenv;
@@ -68,6 +93,7 @@ __dbcl_env_open_ret(dbenv, home, flags, mode, replyp)
 	if (replyp->status != 0)
 		return (replyp->status);
 
+	dbenv->cl_id = replyp->envcl_id;
 	/*
 	 * If the user requested transactions, then we have some
 	 * local client-side setup to do also.
@@ -84,6 +110,10 @@ __dbcl_env_open_ret(dbenv, home, flags, mode, replyp)
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_env_remove_ret
+ * PUBLIC:     __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *));
+ */
 int
 __dbcl_env_remove_ret(dbenv, home, flags, replyp)
 	DB_ENV *dbenv;
@@ -97,13 +127,16 @@ __dbcl_env_remove_ret(dbenv, home, flags, replyp)
 	COMPQUIET(flags, 0);
 
 	ret = __dbcl_refresh(dbenv);
-	__os_free(dbenv, sizeof(*dbenv));
+	__os_free(NULL, dbenv);
 	if (replyp->status == 0 && ret != 0)
 		return (ret);
 	else
 		return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *));
+ */
 int
 __dbcl_txn_abort_ret(txnp, replyp)
 	DB_TXN *txnp;
@@ -113,6 +146,10 @@ __dbcl_txn_abort_ret(txnp, replyp)
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_txn_begin_ret __P((DB_ENV *,
+ * PUBLIC:     DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *));
+ */
 int
 __dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp)
 	DB_ENV *envp;
@@ -130,29 +167,15 @@ __dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp)
 
 	if ((ret = __os_calloc(envp, 1, sizeof(DB_TXN), &txn)) != 0)
 		return (ret);
-	txn->txnid = replyp->txnidcl_id;
-	txn->mgrp = envp->tx_handle;
-	txn->parent = parent;
-	TAILQ_INIT(&txn->kids);
-	txn->flags = TXN_MALLOC;
-	if (parent != NULL)
-		TAILQ_INSERT_HEAD(&parent->kids, txn, klinks);
-
-	/*
-	 * XXX
-	 * In DB library the txn_chain is protected by the mgrp->mutexp.
-	 * However, that mutex is implemented in the environments shared
-	 * memory region.  The client library does not support all of the
-	 * region - that just get forwarded to the server.  Therefore,
-	 * the chain is unprotected here, but properly protected on the
-	 * server.
-	 */
-	TAILQ_INSERT_TAIL(&txn->mgrp->txn_chain, txn, links);
-
+	__dbcl_txn_setup(envp, txn, parent, replyp->txnidcl_id);
 	*txnpp = txn;
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_txn_commit_ret
+ * PUBLIC:     __P((DB_TXN *, u_int32_t, __txn_commit_reply *));
+ */
 int
 __dbcl_txn_commit_ret(txnp, flags, replyp)
 	DB_TXN *txnp;
@@ -165,6 +188,83 @@ __dbcl_txn_commit_ret(txnp, flags, replyp)
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_txn_discard_ret __P((DB_TXN *, u_int32_t,
+ * PUBLIC:      __txn_discard_reply *));
+ */
+int
+__dbcl_txn_discard_ret(txnp, flags, replyp)
+	DB_TXN * txnp;
+	u_int32_t flags;
+	__txn_discard_reply *replyp;
+{
+	COMPQUIET(flags, 0);
+
+	__dbcl_txn_end(txnp);
+	return (replyp->status);
+}
+
+/*
+ * PUBLIC: int __dbcl_txn_recover_ret __P((DB_ENV *, DB_PREPLIST *, long,
+ * PUBLIC:      long *, u_int32_t, __txn_recover_reply *));
+ */
+int
+__dbcl_txn_recover_ret(dbenv, preplist, count, retp, flags, replyp)
+	DB_ENV * dbenv;
+	DB_PREPLIST * preplist;
+	long count;
+	long * retp;
+	u_int32_t flags;
+	__txn_recover_reply *replyp;
+{
+	DB_PREPLIST *prep;
+	DB_TXN *txnarray, *txn;
+	u_int32_t i, *txnid;
+	int ret;
+	u_int8_t *gid;
+
+	COMPQUIET(flags, 0);
+	COMPQUIET(count, 0);
+
+	if (replyp->status != 0)
+		return (replyp->status);
+
+	*retp = (long) replyp->retcount;
+
+	if (replyp->retcount == 0)
+		return (replyp->status);
+
+	if ((ret = __os_calloc(dbenv, replyp->retcount, sizeof(DB_TXN),
+	    &txnarray)) != 0)
+		return (ret);
+	/*
+	 * We have a bunch of arrays that need to iterate in
+	 * lockstep with each other.
+	 */
+	i = 0;
+	txn = txnarray;
+	txnid = (u_int32_t *)replyp->txn.txn_val;
+	gid = (u_int8_t *)replyp->gid.gid_val;
+	prep = preplist;
+	while (i++ < replyp->retcount) {
+		__dbcl_txn_setup(dbenv, txn, NULL, *txnid);
+		prep->txn = txn;
+		memcpy(&prep->gid, gid, DB_XIDDATASIZE);
+		/*
+		 * Now increment all our array pointers.
+		 */
+		txn++;
+		gid += DB_XIDDATASIZE;
+		txnid++;
+		prep++;
+	}
+
+	return (0);
+}
+
+/*
+ * PUBLIC: int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *));
+ */
 int
 __dbcl_db_close_ret(dbp, flags, replyp)
 	DB *dbp;
@@ -183,6 +283,30 @@ __dbcl_db_close_ret(dbp, flags, replyp)
 		return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_create_ret
+ * PUBLIC:     __P((DB *, DB_ENV *, u_int32_t, __db_create_reply *));
+ */
+int
+__dbcl_db_create_ret(dbp, dbenv, flags, replyp)
+	DB * dbp;
+	DB_ENV * dbenv;
+	u_int32_t flags;
+	__db_create_reply *replyp;
+{
+	COMPQUIET(dbenv, NULL);
+	COMPQUIET(flags, 0);
+
+	if (replyp->status != 0)
+		return (replyp->status);
+	dbp->cl_id = replyp->dbcl_id;
+	return (replyp->status);
+}
+
+/*
+ * PUBLIC: int __dbcl_db_get_ret
+ * PUBLIC:     __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *));
+ */
 int
 __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp)
 	DB *dbp;
@@ -206,20 +330,26 @@ __dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp)
 
 	oldkey = key->data;
 	ret = __dbcl_retcopy(dbenv, key, replyp->keydata.keydata_val,
-	    replyp->keydata.keydata_len);
+	    replyp->keydata.keydata_len, &dbp->my_rkey.data,
+	    &dbp->my_rkey.ulen);
 	if (ret)
 		return (ret);
 	ret = __dbcl_retcopy(dbenv, data, replyp->datadata.datadata_val,
-	    replyp->datadata.datadata_len);
+	    replyp->datadata.datadata_len, &dbp->my_rdata.data,
+	    &dbp->my_rdata.ulen);
 	/*
 	 * If an error on copying 'data' and we allocated for 'key'
 	 * free it before returning the error.
 	 */
 	if (ret && oldkey != NULL)
-		__os_free(key->data, key->size);
+		__os_free(dbenv, key->data);
 	return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_key_range_ret __P((DB *, DB_TXN *,
+ * PUBLIC:     DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *));
+ */
 int
 __dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp)
 	DB *dbp;
@@ -242,32 +372,114 @@ __dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp)
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_open_ret __P((DB *, DB_TXN *, const char *,
+ * PUBLIC:     const char *, DBTYPE, u_int32_t, int, __db_open_reply *));
+ */
 int
-__dbcl_db_open_ret(dbp, name, subdb, type, flags, mode, replyp)
+__dbcl_db_open_ret(dbp, txn, name, subdb, type, flags, mode, replyp)
 	DB *dbp;
+	DB_TXN *txn;
 	const char *name, *subdb;
 	DBTYPE type;
 	u_int32_t flags;
 	int mode;
 	__db_open_reply *replyp;
 {
+	COMPQUIET(txn, NULL);
 	COMPQUIET(name, NULL);
 	COMPQUIET(subdb, NULL);
 	COMPQUIET(type, 0);
 	COMPQUIET(flags, 0);
 	COMPQUIET(mode, 0);
 
-	dbp->type = replyp->type;
+	if (replyp->status == 0) {
+		dbp->cl_id = replyp->dbcl_id;
+		dbp->type = replyp->type;
+		/*
+		 * We get back the database's byteorder on the server.
+		 * Determine if our byteorder is the same or not by
+		 * calling __db_set_lorder.
+		 *
+		 * XXX
+		 * This MUST come before we set the flags because
+		 * __db_set_lorder checks that it is called before
+		 * the open flag is set.
+		 */
+		(void)__db_set_lorder(dbp, replyp->lorder);
+
+		/*
+		 * XXX
+		 * This is only for Tcl which peeks at the dbp flags.
+		 * When dbp->get_flags exists, this should go away.
+		 */
+		dbp->flags = replyp->dbflags;
+	}
+	return (replyp->status);
+}
+
+/*
+ * PUBLIC: int __dbcl_db_pget_ret __P((DB *, DB_TXN *, DBT *, DBT *, DBT *,
+ * PUBLIC:      u_int32_t, __db_pget_reply *));
+ */
+int
+__dbcl_db_pget_ret(dbp, txnp, skey, pkey, data, flags, replyp)
+	DB * dbp;
+	DB_TXN * txnp;
+	DBT * skey;
+	DBT * pkey;
+	DBT * data;
+	u_int32_t flags;
+	__db_pget_reply *replyp;
+{
+	DB_ENV *dbenv;
+	int ret;
+	void *oldskey, *oldpkey;
+
+	COMPQUIET(txnp, NULL);
+	COMPQUIET(flags, 0);
 
+	ret = 0;
+	if (replyp->status != 0)
+		return (replyp->status);
+
+	dbenv = dbp->dbenv;
+
+	oldskey = skey->data;
+	ret = __dbcl_retcopy(dbenv, skey, replyp->skeydata.skeydata_val,
+	    replyp->skeydata.skeydata_len, &dbp->my_rskey.data,
+	    &dbp->my_rskey.ulen);
+	if (ret)
+		return (ret);
+
+	oldpkey = pkey->data;
+	ret = __dbcl_retcopy(dbenv, pkey, replyp->pkeydata.pkeydata_val,
+	    replyp->pkeydata.pkeydata_len, &dbp->my_rkey.data,
+	    &dbp->my_rkey.ulen);
+	if (ret && oldskey != NULL) {
+		__os_free(dbenv, skey->data);
+		return (ret);
+	}
+	ret = __dbcl_retcopy(dbenv, data, replyp->datadata.datadata_val,
+	    replyp->datadata.datadata_len, &dbp->my_rdata.data,
+	    &dbp->my_rdata.ulen);
 	/*
-	 * XXX
-	 * This is only for Tcl which peeks at the dbp flags.
-	 * When dbp->get_flags exists, this should go away.
+	 * If an error on copying 'data' and we allocated for '*key'
+	 * free it before returning the error.
 	 */
-	dbp->flags = replyp->dbflags;
-	return (replyp->status);
+	if (ret) {
+		if (oldskey != NULL)
+			__os_free(dbenv, skey->data);
+		if (oldpkey != NULL)
+			__os_free(dbenv, pkey->data);
+	}
+	return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_put_ret
+ * PUBLIC:     __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *));
+ */
 int
 __dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp)
 	DB *dbp;
@@ -289,6 +501,10 @@ __dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp)
 	return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_remove_ret __P((DB *,
+ * PUBLIC:     const char *, const char *, u_int32_t, __db_remove_reply *));
+ */
 int
 __dbcl_db_remove_ret(dbp, name, subdb, flags, replyp)
 	DB *dbp;
@@ -310,12 +526,16 @@ __dbcl_db_remove_ret(dbp, name, subdb, flags, replyp)
 		return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_rename_ret __P((DB *, const char *,
+ * PUBLIC:     const char *, const char *, u_int32_t, __db_rename_reply *));
+ */
 int
 __dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp)
 	DB *dbp;
 	const char *name, *subdb, *newname;
 	u_int32_t flags;
-	__db_remove_reply *replyp;
+	__db_rename_reply *replyp;
 {
 	int ret;
 
@@ -332,82 +552,66 @@ __dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp)
 		return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_stat_ret
+ * PUBLIC:     __P((DB *, void *, u_int32_t, __db_stat_reply *));
+ */
 int
-__dbcl_db_stat_ret(dbp, sp, func, flags, replyp)
+__dbcl_db_stat_ret(dbp, sp, flags, replyp)
 	DB *dbp;
 	void *sp;
-	void *(*func) __P((size_t));
 	u_int32_t flags;
 	__db_stat_reply *replyp;
 {
-	int ret;
-	u_int32_t *__db_statslist;
+	int len, ret;
+	u_int32_t i, *q, *p, *retsp;
 
-	COMPQUIET(dbp, NULL);
-	COMPQUIET(func, NULL);
 	COMPQUIET(flags, 0);
 
-	if (replyp->status != 0)
+	if (replyp->status != 0 || sp == NULL)
 		return (replyp->status);
 
-	if ((ret =
-	    __db_db_stat_statslist(replyp->statslist, &__db_statslist)) != 0)
-		return (ret);
-
-	if (sp == NULL)
-		__db_db_stat_statsfree(__db_statslist);
-	else
-		*(u_int32_t **)sp = __db_statslist;
-	return (replyp->status);
-}
-
-static int
-__db_db_stat_statslist(locp, ppp)
-	__db_stat_statsreplist *locp;
-	u_int32_t **ppp;
-{
-	u_int32_t *pp;
-	int cnt, ret, size;
-	__db_stat_statsreplist *nl;
-
-	for (cnt = 0, nl = locp; nl != NULL; cnt++, nl = nl->next)
-		;
-
-	if (cnt == 0) {
-		*ppp = NULL;
-		return (0);
-	}
-	size = sizeof(*pp) * cnt;
-	if ((ret = __os_malloc(NULL, size, NULL, ppp)) != 0)
+	len = replyp->stats.stats_len * sizeof(u_int32_t);
+	if ((ret = __os_umalloc(dbp->dbenv, len, &retsp)) != 0)
 		return (ret);
-	memset(*ppp, 0, size);
-	for (pp = *ppp, nl = locp; nl != NULL; nl = nl->next, pp++) {
-		*pp = *(u_int32_t *)nl->ent.ent_val;
-	}
+	for (i = 0, q = retsp, p = (u_int32_t *)replyp->stats.stats_val;
+	    i < replyp->stats.stats_len; i++, q++, p++)
+		*q = *p;
+	*(u_int32_t **)sp = retsp;
 	return (0);
 }
 
-static void
-__db_db_stat_statsfree(pp)
-	u_int32_t *pp;
+/*
+ * PUBLIC: int __dbcl_db_truncate_ret __P((DB *, DB_TXN *, u_int32_t  *,
+ * PUBLIC:      u_int32_t, __db_truncate_reply *));
+ */
+int
+__dbcl_db_truncate_ret(dbp, txnp, countp, flags, replyp)
+	DB *dbp;
+	DB_TXN *txnp;
+	u_int32_t *countp, flags;
+	__db_truncate_reply *replyp;
 {
-	size_t size;
-	u_int32_t *p;
+	COMPQUIET(dbp, NULL);
+	COMPQUIET(txnp, NULL);
+	COMPQUIET(flags, 0);
 
-	if (pp == NULL)
-		return;
-	size = sizeof(*p);
-	for (p = pp; *p != 0; p++)
-		size += sizeof(*p);
+	if (replyp->status != 0)
+		return (replyp->status);
+	*countp = replyp->count;
 
-	__os_free(pp, size);
+	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_db_cursor_ret
+ * PUBLIC:     __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *));
+ */
 int
-__dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp)
+__dbcl_db_cursor_ret(dbp, txnp, dbcp, flags, replyp)
 	DB *dbp;
 	DB_TXN *txnp;
-	DBC **dbcpp;
+	DBC **dbcp;
 	u_int32_t flags;
 	__db_cursor_reply *replyp;
 {
@@ -417,13 +621,17 @@ __dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp)
 	if (replyp->status != 0)
 		return (replyp->status);
 
-	return (__dbcl_c_setup(replyp->dbcidcl_id, dbp, dbcpp));
+	return (__dbcl_c_setup(replyp->dbcidcl_id, dbp, dbcp));
 }
 
+/*
+ * PUBLIC: int __dbcl_db_join_ret
+ * PUBLIC:     __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *));
+ */
 int
-__dbcl_db_join_ret(dbp, curs, dbcpp, flags, replyp)
+__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp)
 	DB *dbp;
-	DBC **curs, **dbcpp;
+	DBC **curs, **dbcp;
 	u_int32_t flags;
 	__db_join_reply *replyp;
 {
@@ -440,21 +648,25 @@ __dbcl_db_join_ret(dbp, curs, dbcpp, flags, replyp)
 	 * client-side cursor/db relationship to know what cursors
 	 * are open in the db, and to store their ID.  Nothing else.
 	 */
-	return (__dbcl_c_setup(replyp->dbcidcl_id, dbp, dbcpp));
+	return (__dbcl_c_setup(replyp->dbcidcl_id, dbp, dbcp));
 }
 
+/*
+ * PUBLIC: int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *));
+ */
 int
-__dbcl_dbc_close_ret(dbcp, replyp)
-	DBC *dbcp;
+__dbcl_dbc_close_ret(dbc, replyp)
+	DBC *dbc;
 	__dbc_close_reply *replyp;
 {
-	DB *dbp;
-
-	dbp = dbcp->dbp;
-	__dbcl_c_refresh(dbcp);
+	__dbcl_c_refresh(dbc);
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_dbc_count_ret
+ * PUBLIC:     __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *));
+ */
 int
 __dbcl_dbc_count_ret(dbc, countp, flags, replyp)
 	DBC *dbc;
@@ -472,9 +684,13 @@ __dbcl_dbc_count_ret(dbc, countp, flags, replyp)
 	return (replyp->status);
 }
 
+/*
+ * PUBLIC: int __dbcl_dbc_dup_ret
+ * PUBLIC:     __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *));
+ */
 int
-__dbcl_dbc_dup_ret(dbcp, dbcpp, flags, replyp)
-	DBC *dbcp, **dbcpp;
+__dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp)
+	DBC *dbc, **dbcp;
 	u_int32_t flags;
 	__dbc_dup_reply *replyp;
 {
@@ -483,12 +699,16 @@ __dbcl_dbc_dup_ret(dbcp, dbcpp, flags, replyp)
 	if (replyp->status != 0)
 		return (replyp->status);
 
-	return (__dbcl_c_setup(replyp->dbcidcl_id, dbcp->dbp, dbcpp));
+	return (__dbcl_c_setup(replyp->dbcidcl_id, dbc->dbp, dbcp));
 }
 
+/*
+ * PUBLIC: int __dbcl_dbc_get_ret
+ * PUBLIC:     __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *));
+ */
 int
-__dbcl_dbc_get_ret(dbcp, key, data, flags, replyp)
-	DBC *dbcp;
+__dbcl_dbc_get_ret(dbc, key, data, flags, replyp)
+	DBC *dbc;
 	DBT *key, *data;
 	u_int32_t flags;
 	__dbc_get_reply *replyp;
@@ -503,27 +723,89 @@ __dbcl_dbc_get_ret(dbcp, key, data, flags, replyp)
 	if (replyp->status != 0)
 		return (replyp->status);
 
-	dbenv = dbcp->dbp->dbenv;
+	dbenv = dbc->dbp->dbenv;
 	oldkey = key->data;
 	ret = __dbcl_retcopy(dbenv, key, replyp->keydata.keydata_val,
-	    replyp->keydata.keydata_len);
+	    replyp->keydata.keydata_len, &dbc->my_rkey.data,
+	    &dbc->my_rkey.ulen);
 	if (ret)
 		return (ret);
 	ret = __dbcl_retcopy(dbenv, data, replyp->datadata.datadata_val,
-	    replyp->datadata.datadata_len);
+	    replyp->datadata.datadata_len, &dbc->my_rdata.data,
+	    &dbc->my_rdata.ulen);
 
 	/*
 	 * If an error on copying 'data' and we allocated for 'key'
 	 * free it before returning the error.
 	 */
 	if (ret && oldkey != NULL)
-		__os_free(key->data, key->size);
+		__os_free(dbenv, key->data);
 	return (ret);
 }
 
+/*
+ * PUBLIC: int __dbcl_dbc_pget_ret __P((DBC *, DBT *, DBT *, DBT *, u_int32_t,
+ * PUBLIC:      __dbc_pget_reply *));
+ */
 int
-__dbcl_dbc_put_ret(dbcp, key, data, flags, replyp)
-	DBC *dbcp;
+__dbcl_dbc_pget_ret(dbc, skey, pkey, data, flags, replyp)
+	DBC * dbc;
+	DBT * skey;
+	DBT * pkey;
+	DBT * data;
+	u_int32_t flags;
+	__dbc_pget_reply *replyp;
+{
+	DB_ENV *dbenv;
+	int ret;
+	void *oldskey, *oldpkey;
+
+	COMPQUIET(flags, 0);
+
+	ret = 0;
+	if (replyp->status != 0)
+		return (replyp->status);
+
+	dbenv = dbc->dbp->dbenv;
+
+	oldskey = skey->data;
+	ret = __dbcl_retcopy(dbenv, skey, replyp->skeydata.skeydata_val,
+	    replyp->skeydata.skeydata_len, &dbc->my_rskey.data,
+	    &dbc->my_rskey.ulen);
+	if (ret)
+		return (ret);
+
+	oldpkey = pkey->data;
+	ret = __dbcl_retcopy(dbenv, pkey, replyp->pkeydata.pkeydata_val,
+	    replyp->pkeydata.pkeydata_len, &dbc->my_rkey.data,
+	    &dbc->my_rkey.ulen);
+	if (ret && oldskey != NULL) {
+		__os_free(dbenv, skey->data);
+		return (ret);
+	}
+	ret = __dbcl_retcopy(dbenv, data, replyp->datadata.datadata_val,
+	    replyp->datadata.datadata_len, &dbc->my_rdata.data,
+	    &dbc->my_rdata.ulen);
+	/*
+	 * If an error on copying 'data' and we allocated for '*key'
+	 * free it before returning the error.
+	 */
+	if (ret) {
+		if (oldskey != NULL)
+			__os_free(dbenv, skey->data);
+		if (oldpkey != NULL)
+			__os_free(dbenv, pkey->data);
+	}
+	return (ret);
+}
+
+/*
+ * PUBLIC: int __dbcl_dbc_put_ret
+ * PUBLIC:     __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *));
+ */
+int
+__dbcl_dbc_put_ret(dbc, key, data, flags, replyp)
+	DBC *dbc;
 	DBT *key, *data;
 	u_int32_t flags;
 	__dbc_put_reply *replyp;
@@ -533,7 +815,7 @@ __dbcl_dbc_put_ret(dbcp, key, data, flags, replyp)
 	if (replyp->status != 0)
 		return (replyp->status);
 
-	if (replyp->status == 0 && dbcp->dbp->type == DB_RECNO &&
+	if (replyp->status == 0 && dbc->dbp->type == DB_RECNO &&
 	    (flags == DB_AFTER || flags == DB_BEFORE))
 		*(db_recno_t *)key->data =
 		    *(db_recno_t *)replyp->keydata.keydata_val;