[Ultrapossum-cvs 413] ultrapossum/module/server 1.8,1.9,10server

Back to archive index

Masato Taruishi taru****@users*****
2004年 9月 15日 (水) 19:31:05 JST


===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/10server	2004/08/27 08:32:36	1.8
+++ ultrapossum/module/server/10server	2004/09/15 10:31:05	1.9
@@ -89,7 +89,7 @@
 LDAPURILIST=`ultrapossum_getconf LDAPURILIST ldap://:$LDAPLISTENPORT/`
 
 MASTER=`ultrapossum_getconf MASTER $LDAPMASTER`
-SLAPD_VERSION=`strings $SLAPD | grep OpenLDAP: | sed -e 's/.*slapd \([^ ]*\).*$/\1/'`
+SLAPD_VERSION=$(ultrapossum_getconf SLAPD_VERSION `strings $SLAPD 2> /dev/null | grep OpenLDAP: | sed -e 's/.*slapd \([^ ]*\).*$/\1/'`)
 
 if test "x$SLAPD_MAJOR_VERSION" = "x" && test -x $SLAPD; then
   case "$SLAPD_VERSION" in
@@ -159,7 +159,7 @@
 fi
 
 SLAPD_MAJOR_VERSION=`ultrapossum_getconf SLAPD_MAJOR_VERSION 2.0`
-SLAPD_BERKLEYDB_SONAME=$(ultrapossum_getconf SLAPD_BERKLEYDB_SONAME `ldd $SLAPD | grep libdb | awk -F' ' '{print $1;}'`)
+SLAPD_BERKLEYDB_SONAME=$(ultrapossum_getconf SLAPD_BERKLEYDB_SONAME `ldd $SLAPD 2> /dev/null | grep libdb | awk -F' ' '{print $1;}'`)
 
 SLURPDSLAVES=`ultrapossum_getconf SLURPDSLAVES ""`
 REPLICALISTENPORT=`ultrapossum_getconf REPLICALISTENPORT ldap`



Ultrapossum-cvs メーリングリストの案内
Back to archive index