Masato Taruishi
taru****@users*****
2004年 4月 6日 (火) 01:23:37 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ultrapossum/module/server/00server 2004/04/05 11:39:43 1.20
+++ ultrapossum/module/server/00server 2004/04/05 16:23:37 1.21
@@ -149,17 +149,13 @@
eval "`ultrapossum_parse_config server`"
case "$SLAPD_VERSION" in
- 2.0)
- . $MODULEDIR/server/2.0
- ;;
- 2.1)
- . $MODULEDIR/server/2.1
- ;;
- *)
- echo "Unknown slapd version type $SLAPD_VERSION" 1>&2
- ;;
+ 2.0)
+ SLAPD_DEFAULT_BACKEND_DB_TYPE=ldbm
+ ;;
+ 2.1)
+ SLAPD_DEFAULT_BACKEND_DB_TYPE=bdb
+ ;;
esac
-
DIRECTORY=$DBDIRECTORY/$SUFFIX
===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ultrapossum/module/server/2.0 2004/04/02 02:13:32 1.12
+++ ultrapossum/module/server/2.0 2004/04/05 16:23:37 1.13
@@ -184,5 +184,3 @@
fi
}
-SLAPD_DEFAULT_BACKEND_DB_TYPE=ldbm
-
===================================================================
RCS file: ultrapossum/module/server/2.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ultrapossum/module/server/2.1 2004/04/02 02:13:32 1.2
+++ ultrapossum/module/server/2.1 2004/04/05 16:23:37 1.3
@@ -19,5 +19,3 @@
. $MODULEDIR/server/2.0
-SLAPD_DEFAULT_BACKEND_DB_TYPE=bdb
-
===================================================================
RCS file: ultrapossum/module/server/startup,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/startup 2004/04/02 02:13:32 1.8
+++ ultrapossum/module/server/startup 2004/04/05 16:23:37 1.9
@@ -22,6 +22,18 @@
eval `ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
+case "$SLAPD_VERSION" in
+ 2.0)
+ . $MODULEDIR/server/2.0
+ ;;
+ 2.1)
+ . $MODULEDIR/server/2.1
+ ;;
+ *)
+ echo "Unknown slapd version type $SLAPD_VERSION" 1>&2
+ ;;
+esac
+
configure_server() {
if test "x$ULTRAPOSSUM_MODULE_SERVER" != "xinstalled"; then
$UPDATEDIR/update-server configure