Masato Taruishi
taru****@sourc*****
2004年 6月 1日 (火) 17:00:50 JST
===================================================================
RCS file: ultrapossum/module/server/00server,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ultrapossum/module/server/00server 2004/06/01 03:36:04 1.31
+++ ultrapossum/module/server/00server 2004/06/01 08:00:50 1.32
@@ -167,7 +167,8 @@
REPLOGFILE=`ultrapossum_getconf REPLOGFILE $DIRECTORY/replog`
if test "x$SLAPD_BACKEND_DB_TYPE" = "x"; then
- SLAPD_BACKEND_DB_TYPE=$SLAPD_DEFAULT_BACKEND_DB_TYPE
+ val=`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BACKEND_DB_TYPE 2> /dev/null`
+ SLAPD_BACKEND_DB_TYPE=${val:-$SLAPD_DEFAULT_BACKEND_DB_TYPE}
fi
ULTRAPOSSUM_APPS=`find $APPSDIR -type f -maxdepth 1 | grep -v tmp | xargs -n1 basename 2> /dev/null || true`
===================================================================
RCS file: ultrapossum/module/server/server.cf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/module/server/server.cf 2004/04/12 04:35:49 1.7
+++ ultrapossum/module/server/server.cf 2004/06/01 08:00:50 1.8
@@ -17,6 +17,9 @@
# Directory where the database file locates
#DBDIRECTORY=/var/lib/ldap/ultrapossum/db
+# OpenLDAP backend database
+#SLAPD_BACKEND_DB_TYPE=""
+
# Administrator's RDN from suffix
#ROOTRDN='cn=admin'
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ultrapossum/module/server/update-server 2004/05/11 10:32:59 1.34
+++ ultrapossum/module/server/update-server 2004/06/01 08:00:50 1.35
@@ -205,7 +205,7 @@
echo "E: db directory holds another namingContext: $val in $DIRECTORY" 1>&2
exit 1
fi
- val=`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BACKEND_DB_TYPE | cut -d= -f2- | sed -e 's/"\(.*\)"/\1/'`
+ val=`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BACKEND_DB_TYPE`
if test "x$val" != "x$SLAPD_BACKEND_DB_TYPE"; then
echo "E: db directory holds another backend type: $val in $DIRECTORY" 1>&2
exit 1