Rename "modules" to "plugins", and fix up makefile variables etc

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17565 dc483132-0cff-0310-8789-dd5450dbe970

133 files changed, 31 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9028c092c5..e39e705961 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* plugins: Directory renamed from "modules".
+	* Makefile.in (SUBDIRS, fake-install), configure.in: Updated.
+
 2005-11-29  Jeffrey Altman <jaltman@mit.edu>
 
 	* Makefile.in: add src/windows/kfwlogon tree
diff --git a/src/Makefile.in b/src/Makefile.in
index 0e47ec89c9..8b9be5d94c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -4,7 +4,7 @@ thisconfigdir=.
 myfulldir=.
 mydir=.
 SUBDIRS=util include lib @krb524@ kdc kadmin slave clients \
-	modules/kdb/db2 \
+	plugins/kdb/db2 \
 	appl tests \
 	config-files gen-manpages
 BUILDTOP=$(REL)$(C)
@@ -96,7 +96,7 @@ fake-install:
 	done
 	(w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
 	(w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
-	(w=`pwd`; cd modules/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
+	(w=`pwd`; cd plugins/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
 
 TAGS: $(SRCS)
 	etags $(SRCS)
diff --git a/src/configure.in b/src/configure.in
index 68ec28ce12..74985522dd 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -545,6 +545,6 @@ dnl if test -n "$KRB4_LIB"; then
 dnl   AC_CONFIG_SUBDIRS(krb524)
 dnl fi
 
-AC_CONFIG_SUBDIRS(kadmin clients modules/kdb/db2 appl tests)
+AC_CONFIG_SUBDIRS(kadmin clients plugins/kdb/db2 appl tests)
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
 V5_AC_OUTPUT_MAKEFILE(. util util/support util/send-pr lib kdc slave krb524 config-files gen-manpages include include/krb5 include/kerberosIV)
diff --git a/src/modules/kdb/db2/ChangeLog b/src/plugins/kdb/db2/ChangeLog
index fe61913f8c..e88e25d732 100644
--- a/src/modules/kdb/db2/ChangeLog
+++ b/src/plugins/kdb/db2/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-16  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (myfulldir, RELDIR): Updated for directory rename.
+
 2005-11-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* policy_db.h: Include db.h after gssrpc/types.h, to fix
diff --git a/src/modules/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index 0caee1a80b..5dd15be3e4 100644
--- a/src/modules/kdb/db2/Makefile.in
+++ b/src/plugins/kdb/db2/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=.
-myfulldir=modules/kdb/db2
+myfulldir=plugins/kdb/db2
 mydir=.
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
@@ -24,7 +24,7 @@ LIBBASE=db2
 LIBMAJOR=0
 LIBMINOR=0
 SO_EXT=.so
-RELDIR=../modules/kdb/db2
+RELDIR=../plugins/kdb/db2
 # Depends on libk5crypto and libkrb5
 # Also on gssrpc, for xdr stuff.
 SHLIB_EXPDEPS = \
diff --git a/src/modules/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c
index 97ce1123b2..97ce1123b2 100644
--- a/src/modules/kdb/db2/adb_openclose.c
+++ b/src/plugins/kdb/db2/adb_openclose.c
diff --git a/src/modules/kdb/db2/adb_policy.c b/src/plugins/kdb/db2/adb_policy.c
index e338cbbd02..e338cbbd02 100644
--- a/src/modules/kdb/db2/adb_policy.c
+++ b/src/plugins/kdb/db2/adb_policy.c
diff --git a/src/modules/kdb/db2/configure.in b/src/plugins/kdb/db2/configure.in
index 9f958db122..9f958db122 100644
--- a/src/modules/kdb/db2/configure.in
+++ b/src/plugins/kdb/db2/configure.in
diff --git a/src/modules/kdb/db2/db2.exports b/src/plugins/kdb/db2/db2.exports
index 25320ff729..25320ff729 100644
--- a/src/modules/kdb/db2/db2.exports
+++ b/src/plugins/kdb/db2/db2.exports
diff --git a/src/modules/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index f119de3de9..f119de3de9 100644
--- a/src/modules/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
diff --git a/src/modules/kdb/db2/kdb_compat.h b/src/plugins/kdb/db2/kdb_compat.h
index 540d4a2499..540d4a2499 100644
--- a/src/modules/kdb/db2/kdb_compat.h
+++ b/src/plugins/kdb/db2/kdb_compat.h
diff --git a/src/modules/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c
index f3950eeccd..f3950eeccd 100644
--- a/src/modules/kdb/db2/kdb_db2.c
+++ b/src/plugins/kdb/db2/kdb_db2.c
diff --git a/src/modules/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h
index ba03ea36f3..ba03ea36f3 100644
--- a/src/modules/kdb/db2/kdb_db2.h
+++ b/src/plugins/kdb/db2/kdb_db2.h
diff --git a/src/modules/kdb/db2/kdb_xdr.c b/src/plugins/kdb/db2/kdb_xdr.c
index 396350d760..396350d760 100644
--- a/src/modules/kdb/db2/kdb_xdr.c
+++ b/src/plugins/kdb/db2/kdb_xdr.c
diff --git a/src/modules/kdb/db2/kdb_xdr.h b/src/plugins/kdb/db2/kdb_xdr.h
index 2ee068fbd5..2ee068fbd5 100644
--- a/src/modules/kdb/db2/kdb_xdr.h
+++ b/src/plugins/kdb/db2/kdb_xdr.h
diff --git a/src/modules/kdb/db2/libdb2/CHANGELOG.db2 b/src/plugins/kdb/db2/libdb2/CHANGELOG.db2
index abd05f95d4..abd05f95d4 100644
--- a/src/modules/kdb/db2/libdb2/CHANGELOG.db2
+++ b/src/plugins/kdb/db2/libdb2/CHANGELOG.db2
diff --git a/src/modules/kdb/db2/libdb2/ChangeLog b/src/plugins/kdb/db2/libdb2/ChangeLog
index 38efcb1c82..3c6bc71e51 100644
--- a/src/modules/kdb/db2/libdb2/ChangeLog
+++ b/src/plugins/kdb/db2/libdb2/ChangeLog
@@ -1,6 +1,13 @@
 2005-12-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (all-unix): Do depend on all-libs.
+	(myfulldir, RELDIR): Updated for directory rename.
+	* hash/Makefile.in (myfulldir): Likewise.
+	* db/Makefile.in (myfulldir): Likewise.
+	* mpool/Makefile.in (myfulldir): Likewise.
+	* btree/Makefile.in (myfulldir): Likewise.
+	* recno/Makefile.in (myfulldir): Likewise.
+	* clib/Makefile.in (myfulldir): Likewise.
 
 2005-10-27  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/modules/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index 18c85ed03b..5e53de4238 100644
--- a/src/modules/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=.
-myfulldir=modules/kdb/db2/libdb2
+myfulldir=plugins/kdb/db2/libdb2
 mydir=.
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCAL_SUBDIRS=hash btree db mpool recno clib test
@@ -10,7 +10,7 @@ LIBMINOR=1
 STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \
 	recno/OBJS.ST clib/OBJS.ST
 SUBDIROBJLISTS=$(STOBJLISTS)
-RELDIR=../modules/kdb/db2/libdb2
+RELDIR=../plugins/kdb/db2/libdb2
 
 HDRDIR=$(BUILDTOP)/include
 HDRS =	$(HDRDIR)/db.h $(HDRDIR)/db-config.h $(HDRDIR)/db-ndbm.h
diff --git a/src/modules/kdb/db2/libdb2/Makefile.inc b/src/plugins/kdb/db2/libdb2/Makefile.inc
index 77af9c5123..77af9c5123 100644
--- a/src/modules/kdb/db2/libdb2/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/README b/src/plugins/kdb/db2/libdb2/README
index 70118bef5f..70118bef5f 100644
--- a/src/modules/kdb/db2/libdb2/README
+++ b/src/plugins/kdb/db2/libdb2/README
diff --git a/src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB b/src/plugins/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB
index 112454e945..112454e945 100644
--- a/src/modules/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB
+++ b/src/plugins/kdb/db2/libdb2/README.NOT.SLEEPYCAT.DB
diff --git a/src/modules/kdb/db2/libdb2/README.db2 b/src/plugins/kdb/db2/libdb2/README.db2
index 5700b73932..5700b73932 100644
--- a/src/modules/kdb/db2/libdb2/README.db2
+++ b/src/plugins/kdb/db2/libdb2/README.db2
diff --git a/src/modules/kdb/db2/libdb2/btree/Makefile.in b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
index 11f4c84348..52243b4607 100644
--- a/src/modules/kdb/db2/libdb2/btree/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/btree
+myfulldir=plugins/kdb/db2/libdb2/btree
 mydir=btree
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
diff --git a/src/modules/kdb/db2/libdb2/btree/Makefile.inc b/src/plugins/kdb/db2/libdb2/btree/Makefile.inc
index 8ed76494aa..8ed76494aa 100644
--- a/src/modules/kdb/db2/libdb2/btree/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_close.c b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
index 11be134113..11be134113 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_close.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_close.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_conv.c b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
index 6cfa216ca8..6cfa216ca8 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_conv.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_conv.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_debug.c b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c
index d36256b3af..d36256b3af 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_debug.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_debug.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_delete.c b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
index d002a66edd..d002a66edd 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_delete.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_delete.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_get.c b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
index b6318211a1..b6318211a1 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_get.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_get.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_open.c b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
index 3e4c67a4bc..3e4c67a4bc 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_open.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_open.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_overflow.c b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
index 8b1f597912..8b1f597912 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_overflow.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_overflow.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_page.c b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
index 3663cf7f93..3663cf7f93 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_page.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_page.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_put.c b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
index f75ca9295c..f75ca9295c 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_put.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_put.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_search.c b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
index de7ab126f9..de7ab126f9 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_search.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_search.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_seq.c b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
index bbfb9c6c63..bbfb9c6c63 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_seq.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_seq.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_split.c b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
index 0cc6cf09bc..0cc6cf09bc 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_split.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_split.c
diff --git a/src/modules/kdb/db2/libdb2/btree/bt_utils.c b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
index 1a34598ad6..1a34598ad6 100644
--- a/src/modules/kdb/db2/libdb2/btree/bt_utils.c
+++ b/src/plugins/kdb/db2/libdb2/btree/bt_utils.c
diff --git a/src/modules/kdb/db2/libdb2/btree/btree.h b/src/plugins/kdb/db2/libdb2/btree/btree.h
index 171712749f..171712749f 100644
--- a/src/modules/kdb/db2/libdb2/btree/btree.h
+++ b/src/plugins/kdb/db2/libdb2/btree/btree.h
diff --git a/src/modules/kdb/db2/libdb2/btree/extern.h b/src/plugins/kdb/db2/libdb2/btree/extern.h
index 3aa88417e3..3aa88417e3 100644
--- a/src/modules/kdb/db2/libdb2/btree/extern.h
+++ b/src/plugins/kdb/db2/libdb2/btree/extern.h
diff --git a/src/modules/kdb/db2/libdb2/clib/Makefile.in b/src/plugins/kdb/db2/libdb2/clib/Makefile.in
index c5ab559677..09f8089672 100644
--- a/src/modules/kdb/db2/libdb2/clib/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/clib/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/clib
+myfulldir=plugins/kdb/db2/libdb2/clib
 mydir=clib
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=@MEMMOVE_OBJ@ @MKSTEMP_OBJ@ @STRERROR_OBJ@
diff --git a/src/modules/kdb/db2/libdb2/clib/memmove.c b/src/plugins/kdb/db2/libdb2/clib/memmove.c
index f9bf650a38..f9bf650a38 100644
--- a/src/modules/kdb/db2/libdb2/clib/memmove.c
+++ b/src/plugins/kdb/db2/libdb2/clib/memmove.c
diff --git a/src/modules/kdb/db2/libdb2/clib/mkstemp.c b/src/plugins/kdb/db2/libdb2/clib/mkstemp.c
index 71dc7d17a1..71dc7d17a1 100644
--- a/src/modules/kdb/db2/libdb2/clib/mkstemp.c
+++ b/src/plugins/kdb/db2/libdb2/clib/mkstemp.c
diff --git a/src/modules/kdb/db2/libdb2/clib/strerror.c b/src/plugins/kdb/db2/libdb2/clib/strerror.c
index 0a509f79f2..0a509f79f2 100644
--- a/src/modules/kdb/db2/libdb2/clib/strerror.c
+++ b/src/plugins/kdb/db2/libdb2/clib/strerror.c
diff --git a/src/modules/kdb/db2/libdb2/configure.in b/src/plugins/kdb/db2/libdb2/configure.in
index 9a339b0bbe..9a339b0bbe 100644
--- a/src/modules/kdb/db2/libdb2/configure.in
+++ b/src/plugins/kdb/db2/libdb2/configure.in
diff --git a/src/modules/kdb/db2/libdb2/db/Makefile.in b/src/plugins/kdb/db2/libdb2/db/Makefile.in
index 9c7d7c2691..074bb7f329 100644
--- a/src/modules/kdb/db2/libdb2/db/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/db/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/db
+myfulldir=plugins/kdb/db2/libdb2/db
 mydir=db
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=db.o
diff --git a/src/modules/kdb/db2/libdb2/db/Makefile.inc b/src/plugins/kdb/db2/libdb2/db/Makefile.inc
index 59478ba198..59478ba198 100644
--- a/src/modules/kdb/db2/libdb2/db/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/db/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/db/db.c b/src/plugins/kdb/db2/libdb2/db/db.c
index fba7795342..fba7795342 100644
--- a/src/modules/kdb/db2/libdb2/db/db.c
+++ b/src/plugins/kdb/db2/libdb2/db/db.c
diff --git a/src/modules/kdb/db2/libdb2/docs/btree.3.ps b/src/plugins/kdb/db2/libdb2/docs/btree.3.ps
index c79c97232c..c79c97232c 100644
--- a/src/modules/kdb/db2/libdb2/docs/btree.3.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/btree.3.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/dbopen.3.ps b/src/plugins/kdb/db2/libdb2/docs/dbopen.3.ps
index c621bef97d..c621bef97d 100644
--- a/src/modules/kdb/db2/libdb2/docs/dbopen.3.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/dbopen.3.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/hash.3.ps b/src/plugins/kdb/db2/libdb2/docs/hash.3.ps
index 18303cfb7c..18303cfb7c 100644
--- a/src/modules/kdb/db2/libdb2/docs/hash.3.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/hash.3.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/hash.usenix.ps b/src/plugins/kdb/db2/libdb2/docs/hash.usenix.ps
index acdea09926..acdea09926 100644
--- a/src/modules/kdb/db2/libdb2/docs/hash.usenix.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/hash.usenix.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps b/src/plugins/kdb/db2/libdb2/docs/libtp.usenix.ps
index 5b5ba6e1b8..5b5ba6e1b8 100644
--- a/src/modules/kdb/db2/libdb2/docs/libtp.usenix.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/libtp.usenix.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/mpool.3.ps b/src/plugins/kdb/db2/libdb2/docs/mpool.3.ps
index 816c9243c8..816c9243c8 100644
--- a/src/modules/kdb/db2/libdb2/docs/mpool.3.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/mpool.3.ps
diff --git a/src/modules/kdb/db2/libdb2/docs/recno.3.ps b/src/plugins/kdb/db2/libdb2/docs/recno.3.ps
index 8ffccfca90..8ffccfca90 100644
--- a/src/modules/kdb/db2/libdb2/docs/recno.3.ps
+++ b/src/plugins/kdb/db2/libdb2/docs/recno.3.ps
diff --git a/src/modules/kdb/db2/libdb2/hash/Makefile.in b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
index 0e3b1adcdf..1e60e9a18c 100644
--- a/src/modules/kdb/db2/libdb2/hash/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/hash
+myfulldir=plugins/kdb/db2/libdb2/hash
 mydir=hash
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
diff --git a/src/modules/kdb/db2/libdb2/hash/Makefile.inc b/src/plugins/kdb/db2/libdb2/hash/Makefile.inc
index 87746f721e..87746f721e 100644
--- a/src/modules/kdb/db2/libdb2/hash/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/hash/dbm.c b/src/plugins/kdb/db2/libdb2/hash/dbm.c
index 58c9df7383..58c9df7383 100644
--- a/src/modules/kdb/db2/libdb2/hash/dbm.c
+++ b/src/plugins/kdb/db2/libdb2/hash/dbm.c
diff --git a/src/modules/kdb/db2/libdb2/hash/extern.h b/src/plugins/kdb/db2/libdb2/hash/extern.h
index 872b6b0fef..872b6b0fef 100644
--- a/src/modules/kdb/db2/libdb2/hash/extern.h
+++ b/src/plugins/kdb/db2/libdb2/hash/extern.h
diff --git a/src/modules/kdb/db2/libdb2/hash/hash.c b/src/plugins/kdb/db2/libdb2/hash/hash.c
index 0e254938e9..0e254938e9 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hash.c.patch b/src/plugins/kdb/db2/libdb2/hash/hash.c.patch
index b72cc0d26d..b72cc0d26d 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash.c.patch
+++ b/src/plugins/kdb/db2/libdb2/hash/hash.c.patch
diff --git a/src/modules/kdb/db2/libdb2/hash/hash.h b/src/plugins/kdb/db2/libdb2/hash/hash.h
index b202fc9f22..b202fc9f22 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash.h
+++ b/src/plugins/kdb/db2/libdb2/hash/hash.h
diff --git a/src/modules/kdb/db2/libdb2/hash/hash_bigkey.c b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
index 06210a57cc..06210a57cc 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash_bigkey.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash_bigkey.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hash_debug.c b/src/plugins/kdb/db2/libdb2/hash/hash_debug.c
index 69229fc8df..69229fc8df 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash_debug.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash_debug.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hash_func.c b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
index 1dee694608..1dee694608 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash_func.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash_func.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hash_log2.c b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
index 8c710e5d21..8c710e5d21 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash_log2.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash_log2.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hash_page.c b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
index e25115d3f0..e25115d3f0 100644
--- a/src/modules/kdb/db2/libdb2/hash/hash_page.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hash_page.c
diff --git a/src/modules/kdb/db2/libdb2/hash/hsearch.c b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
index 02ff7ef843..02ff7ef843 100644
--- a/src/modules/kdb/db2/libdb2/hash/hsearch.c
+++ b/src/plugins/kdb/db2/libdb2/hash/hsearch.c
diff --git a/src/modules/kdb/db2/libdb2/hash/page.h b/src/plugins/kdb/db2/libdb2/hash/page.h
index 8ef8a2e294..8ef8a2e294 100644
--- a/src/modules/kdb/db2/libdb2/hash/page.h
+++ b/src/plugins/kdb/db2/libdb2/hash/page.h
diff --git a/src/modules/kdb/db2/libdb2/hash/page.h.patch b/src/plugins/kdb/db2/libdb2/hash/page.h.patch
index 4a0311fea3..4a0311fea3 100644
--- a/src/modules/kdb/db2/libdb2/hash/page.h.patch
+++ b/src/plugins/kdb/db2/libdb2/hash/page.h.patch
diff --git a/src/modules/kdb/db2/libdb2/hash/search.h b/src/plugins/kdb/db2/libdb2/hash/search.h
index 6d6a0a82f4..6d6a0a82f4 100644
--- a/src/modules/kdb/db2/libdb2/hash/search.h
+++ b/src/plugins/kdb/db2/libdb2/hash/search.h
diff --git a/src/modules/kdb/db2/libdb2/include/ChangeLog b/src/plugins/kdb/db2/libdb2/include/ChangeLog
index 676bbd44a7..676bbd44a7 100644
--- a/src/modules/kdb/db2/libdb2/include/ChangeLog
+++ b/src/plugins/kdb/db2/libdb2/include/ChangeLog
diff --git a/src/modules/kdb/db2/libdb2/include/db-config.h.in b/src/plugins/kdb/db2/libdb2/include/db-config.h.in
index bcd7991b34..bcd7991b34 100644
--- a/src/modules/kdb/db2/libdb2/include/db-config.h.in
+++ b/src/plugins/kdb/db2/libdb2/include/db-config.h.in
diff --git a/src/modules/kdb/db2/libdb2/include/db-dbm.h b/src/plugins/kdb/db2/libdb2/include/db-dbm.h
index 28c93786cd..28c93786cd 100644
--- a/src/modules/kdb/db2/libdb2/include/db-dbm.h
+++ b/src/plugins/kdb/db2/libdb2/include/db-dbm.h
diff --git a/src/modules/kdb/db2/libdb2/include/db-int.h b/src/plugins/kdb/db2/libdb2/include/db-int.h
index bbb22925aa..bbb22925aa 100644
--- a/src/modules/kdb/db2/libdb2/include/db-int.h
+++ b/src/plugins/kdb/db2/libdb2/include/db-int.h
diff --git a/src/modules/kdb/db2/libdb2/include/db-ndbm.h b/src/plugins/kdb/db2/libdb2/include/db-ndbm.h
index e99f46fdc9..e99f46fdc9 100644
--- a/src/modules/kdb/db2/libdb2/include/db-ndbm.h
+++ b/src/plugins/kdb/db2/libdb2/include/db-ndbm.h
diff --git a/src/modules/kdb/db2/libdb2/include/db-queue.h b/src/plugins/kdb/db2/libdb2/include/db-queue.h
index 40d32ccb6e..40d32ccb6e 100644
--- a/src/modules/kdb/db2/libdb2/include/db-queue.h
+++ b/src/plugins/kdb/db2/libdb2/include/db-queue.h
diff --git a/src/modules/kdb/db2/libdb2/include/db.h b/src/plugins/kdb/db2/libdb2/include/db.h
index 980145a3d9..980145a3d9 100644
--- a/src/modules/kdb/db2/libdb2/include/db.h
+++ b/src/plugins/kdb/db2/libdb2/include/db.h
diff --git a/src/modules/kdb/db2/libdb2/libdb.exports b/src/plugins/kdb/db2/libdb2/libdb.exports
index 5dbc2e4389..5dbc2e4389 100644
--- a/src/modules/kdb/db2/libdb2/libdb.exports
+++ b/src/plugins/kdb/db2/libdb2/libdb.exports
diff --git a/src/modules/kdb/db2/libdb2/man/Makefile.inc b/src/plugins/kdb/db2/libdb2/man/Makefile.inc
index f85cba1f81..f85cba1f81 100644
--- a/src/modules/kdb/db2/libdb2/man/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/man/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/man/db.man.ps b/src/plugins/kdb/db2/libdb2/man/db.man.ps
index 23feea6e5c..23feea6e5c 100644
--- a/src/modules/kdb/db2/libdb2/man/db.man.ps
+++ b/src/plugins/kdb/db2/libdb2/man/db.man.ps
diff --git a/src/modules/kdb/db2/libdb2/man/db_btree.3 b/src/plugins/kdb/db2/libdb2/man/db_btree.3
index 25e289f3cd..25e289f3cd 100644
--- a/src/modules/kdb/db2/libdb2/man/db_btree.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_btree.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_hash.3 b/src/plugins/kdb/db2/libdb2/man/db_hash.3
index adb88fca7c..adb88fca7c 100644
--- a/src/modules/kdb/db2/libdb2/man/db_hash.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_hash.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_lock.3 b/src/plugins/kdb/db2/libdb2/man/db_lock.3
index b18a38c60c..b18a38c60c 100644
--- a/src/modules/kdb/db2/libdb2/man/db_lock.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_lock.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_log.3 b/src/plugins/kdb/db2/libdb2/man/db_log.3
index 34c4d1f5d1..34c4d1f5d1 100644
--- a/src/modules/kdb/db2/libdb2/man/db_log.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_log.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_mpool.3 b/src/plugins/kdb/db2/libdb2/man/db_mpool.3
index 4b683b6185..4b683b6185 100644
--- a/src/modules/kdb/db2/libdb2/man/db_mpool.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_mpool.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_open.3 b/src/plugins/kdb/db2/libdb2/man/db_open.3
index f988ef9245..f988ef9245 100644
--- a/src/modules/kdb/db2/libdb2/man/db_open.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_open.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_recno.3 b/src/plugins/kdb/db2/libdb2/man/db_recno.3
index 6b93b3f5a1..6b93b3f5a1 100644
--- a/src/modules/kdb/db2/libdb2/man/db_recno.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_recno.3
diff --git a/src/modules/kdb/db2/libdb2/man/db_txn.3 b/src/plugins/kdb/db2/libdb2/man/db_txn.3
index 18ad64692e..18ad64692e 100644
--- a/src/modules/kdb/db2/libdb2/man/db_txn.3
+++ b/src/plugins/kdb/db2/libdb2/man/db_txn.3
diff --git a/src/modules/kdb/db2/libdb2/man/spell.ok b/src/plugins/kdb/db2/libdb2/man/spell.ok
index 794b00bf87..794b00bf87 100644
--- a/src/modules/kdb/db2/libdb2/man/spell.ok
+++ b/src/plugins/kdb/db2/libdb2/man/spell.ok
diff --git a/src/modules/kdb/db2/libdb2/mpool/Makefile.in b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
index e40c161745..9745c4e300 100644
--- a/src/modules/kdb/db2/libdb2/mpool/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/mpool
+myfulldir=plugins/kdb/db2/libdb2/mpool
 mydir=mpool
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=mpool.o
diff --git a/src/modules/kdb/db2/libdb2/mpool/Makefile.inc b/src/plugins/kdb/db2/libdb2/mpool/Makefile.inc
index 93210c89e2..93210c89e2 100644
--- a/src/modules/kdb/db2/libdb2/mpool/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/mpool/README b/src/plugins/kdb/db2/libdb2/mpool/README
index 0f01fbcdb4..0f01fbcdb4 100644
--- a/src/modules/kdb/db2/libdb2/mpool/README
+++ b/src/plugins/kdb/db2/libdb2/mpool/README
diff --git a/src/modules/kdb/db2/libdb2/mpool/mpool.c b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
index d172f71baa..d172f71baa 100644
--- a/src/modules/kdb/db2/libdb2/mpool/mpool.c
+++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.c
diff --git a/src/modules/kdb/db2/libdb2/mpool/mpool.h b/src/plugins/kdb/db2/libdb2/mpool/mpool.h
index 627ad5b368..627ad5b368 100644
--- a/src/modules/kdb/db2/libdb2/mpool/mpool.h
+++ b/src/plugins/kdb/db2/libdb2/mpool/mpool.h
diff --git a/src/modules/kdb/db2/libdb2/recno/Makefile.in b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
index e90a7cb3da..4d6b9a5084 100644
--- a/src/modules/kdb/db2/libdb2/recno/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/recno
+myfulldir=plugins/kdb/db2/libdb2/recno
 mydir=recno
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
diff --git a/src/modules/kdb/db2/libdb2/recno/Makefile.inc b/src/plugins/kdb/db2/libdb2/recno/Makefile.inc
index e49e225522..e49e225522 100644
--- a/src/modules/kdb/db2/libdb2/recno/Makefile.inc
+++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.inc
diff --git a/src/modules/kdb/db2/libdb2/recno/extern.h b/src/plugins/kdb/db2/libdb2/recno/extern.h
index 98e382c37e..98e382c37e 100644
--- a/src/modules/kdb/db2/libdb2/recno/extern.h
+++ b/src/plugins/kdb/db2/libdb2/recno/extern.h
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_close.c b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
index ed3da6ea42..ed3da6ea42 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_close.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_close.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_delete.c b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
index b69c9ad742..b69c9ad742 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_delete.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_delete.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_get.c b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
index 230b2d4f54..230b2d4f54 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_get.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_get.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_open.c b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
index f18a1cb028..f18a1cb028 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_open.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_open.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_put.c b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
index e7fa75882f..e7fa75882f 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_put.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_put.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_search.c b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
index a328f1be06..a328f1be06 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_search.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_search.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_seq.c b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
index 1edaa998e8..1edaa998e8 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_seq.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_seq.c
diff --git a/src/modules/kdb/db2/libdb2/recno/rec_utils.c b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
index f757a724f5..f757a724f5 100644
--- a/src/modules/kdb/db2/libdb2/recno/rec_utils.c
+++ b/src/plugins/kdb/db2/libdb2/recno/rec_utils.c
diff --git a/src/modules/kdb/db2/libdb2/recno/recno.h b/src/plugins/kdb/db2/libdb2/recno/recno.h
index bec772c2fa..bec772c2fa 100644
--- a/src/modules/kdb/db2/libdb2/recno/recno.h
+++ b/src/plugins/kdb/db2/libdb2/recno/recno.h
diff --git a/src/modules/kdb/db2/libdb2/test/ChangeLog b/src/plugins/kdb/db2/libdb2/test/ChangeLog
index ee1c78df6d..91d5c1f6df 100644
--- a/src/modules/kdb/db2/libdb2/test/ChangeLog
+++ b/src/plugins/kdb/db2/libdb2/test/ChangeLog
@@ -2,6 +2,7 @@
 
 	* Makefile.in (PROG_LIBPATH, DB_DEPLIB): Look for library in
 	.. instead of $TOPLIBD.
+	(myfulldir): Updated for directory rename.
 
 2005-10-04  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/modules/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index 2c1f851c8f..af4b6bec72 100644
--- a/src/modules/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -1,5 +1,5 @@
 thisconfigdir=./..
-myfulldir=modules/kdb/db2/libdb2/test
+myfulldir=plugins/kdb/db2/libdb2/test
 mydir=test
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 
diff --git a/src/modules/kdb/db2/libdb2/test/README b/src/plugins/kdb/db2/libdb2/test/README
index 0c0cd13d8f..0c0cd13d8f 100644
--- a/src/modules/kdb/db2/libdb2/test/README
+++ b/src/plugins/kdb/db2/libdb2/test/README
diff --git a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/data b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/data
index 37a518537e..37a518537e 100644
--- a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/data
+++ b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/data
diff --git a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/mbox
index 9d5d49d073..9d5d49d073 100644
--- a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/mbox
+++ b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/mbox
diff --git a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/t.c
index f77b676f14..f77b676f14 100644
--- a/src/modules/kdb/db2/libdb2/test/SEQ_TEST/t.c
+++ b/src/plugins/kdb/db2/libdb2/test/SEQ_TEST/t.c
diff --git a/src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog b/src/plugins/kdb/db2/libdb2/test/btree.tests/ChangeLog
index 339db618af..339db618af 100644
--- a/src/modules/kdb/db2/libdb2/test/btree.tests/ChangeLog
+++ b/src/plugins/kdb/db2/libdb2/test/btree.tests/ChangeLog
diff --git a/src/modules/kdb/db2/libdb2/test/btree.tests/main.c b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c
index 06f02b3ad0..06f02b3ad0 100644
--- a/src/modules/kdb/db2/libdb2/test/btree.tests/main.c
+++ b/src/plugins/kdb/db2/libdb2/test/btree.tests/main.c
diff --git a/src/modules/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c
index 10a89a6fad..10a89a6fad 100644
--- a/src/modules/kdb/db2/libdb2/test/dbtest.c
+++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c
diff --git a/src/modules/kdb/db2/libdb2/test/dictionary b/src/plugins/kdb/db2/libdb2/test/dictionary
index 53640f0164..53640f0164 100644
--- a/src/modules/kdb/db2/libdb2/test/dictionary
+++ b/src/plugins/kdb/db2/libdb2/test/dictionary
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile b/src/plugins/kdb/db2/libdb2/test/hash1.tests/Makefile
index 348a8f818b..348a8f818b 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/Makefile
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/Makefile
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/driver2.c
index 6a3b432cb6..6a3b432cb6 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/driver2.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/driver2.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh b/src/plugins/kdb/db2/libdb2/test/hash1.tests/makedb.sh
index 15901de193..15901de193 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/makedb.sh
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/makedb.sh
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tcreat3.c
index f11487b320..f11487b320 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/tcreat3.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tcreat3.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tdel.c
index 826611486d..826611486d 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/tdel.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tdel.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/testit b/src/plugins/kdb/db2/libdb2/test/hash1.tests/testit
index c80dc4e69b..c80dc4e69b 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/testit
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/testit
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/thash4.c
index b15b617bc7..b15b617bc7 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/thash4.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/thash4.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tread2.c
index 1e2cc4c503..1e2cc4c503 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/tread2.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tread2.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tseq.c
index d2d36862d1..d2d36862d1 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/tseq.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tseq.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tverify.c
index 4747804f76..4747804f76 100644
--- a/src/modules/kdb/db2/libdb2/test/hash1.tests/tverify.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash1.tests/tverify.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash2.tests/README b/src/plugins/kdb/db2/libdb2/test/hash2.tests/README
index f29ccf7e1b..f29ccf7e1b 100644
--- a/src/modules/kdb/db2/libdb2/test/hash2.tests/README
+++ b/src/plugins/kdb/db2/libdb2/test/hash2.tests/README
diff --git a/src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c b/src/plugins/kdb/db2/libdb2/test/hash2.tests/bigtest.c
index 81c559ad2a..81c559ad2a 100644
--- a/src/modules/kdb/db2/libdb2/test/hash2.tests/bigtest.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash2.tests/bigtest.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c b/src/plugins/kdb/db2/libdb2/test/hash2.tests/passtest.c
index adb72c004b..adb72c004b 100644
--- a/src/modules/kdb/db2/libdb2/test/hash2.tests/passtest.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash2.tests/passtest.c
diff --git a/src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c b/src/plugins/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c
index da37676878..da37676878 100644
--- a/src/modules/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c
+++ b/src/plugins/kdb/db2/libdb2/test/hash2.tests/passwd/genpass.c
diff --git a/src/modules/kdb/db2/libdb2/test/run.test b/src/plugins/kdb/db2/libdb2/test/run.test
index 48c3a63d0e..48c3a63d0e 100644
--- a/src/modules/kdb/db2/libdb2/test/run.test
+++ b/src/plugins/kdb/db2/libdb2/test/run.test
diff --git a/src/modules/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c
index 37761080a8..37761080a8 100644
--- a/src/modules/kdb/db2/pol_xdr.c
+++ b/src/plugins/kdb/db2/pol_xdr.c
diff --git a/src/modules/kdb/db2/policy_db.h b/src/plugins/kdb/db2/policy_db.h
index 8bbef800b5..8bbef800b5 100644
--- a/src/modules/kdb/db2/policy_db.h
+++ b/src/plugins/kdb/db2/policy_db.h