Masato Taruishi
taru****@users*****
2004年 9月 22日 (水) 21:31:12 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/server/10server 2004/09/22 04:19:37 1.13
+++ ultrapossum/module/server/10server 2004/09/22 12:31:11 1.14
@@ -183,10 +183,10 @@
case "$SLAPD_MAJOR_VERSION" in
2.0)
- . $MODULEDIR/server/2.0
+ source_shell $MODULEDIR/server/2.0
;;
2.1|2.2)
- . $MODULEDIR/server/2.1
+ source_shell $MODULEDIR/server/2.1
;;
*)
echo "Unknown slapd version type $SLAPD_MAJOR_VERSION" 1>&2
===================================================================
RCS file: ultrapossum/module/server/2.1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/2.1 2004/04/05 16:23:37 1.3
+++ ultrapossum/module/server/2.1 2004/09/22 12:31:11 1.4
@@ -17,5 +17,5 @@
# $Id$
-. $MODULEDIR/server/2.0
+source_shell $MODULEDIR/server/2.0
===================================================================
RCS file: ultrapossum/module/server/apps,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/apps 2004/07/16 06:41:00 1.9
+++ ultrapossum/module/server/apps 2004/09/22 12:31:11 1.10
@@ -39,9 +39,9 @@
getapps | while read cf
do
schemas=""
- . $APPSDIR/$cf
+ source_shell $APPSDIR/$cf
if test -f $APPSCONFDIR/$cf.cf; then
- . $APPSCONFDIR/$cf.cf
+ source_shell $APPSCONFDIR/$cf.cf
fi
for schema in $schemas
do
@@ -52,9 +52,9 @@
ldif)
getapps | while read cf
do
- . $APPSDIR/$cf
+ source_shell $APPSDIR/$cf
if test -f $APPSCONFDIR/$cf.cf; then
- . $APPSCONFDIR/$cf.cf
+ source_shell $APPSCONFDIR/$cf.cf
fi
for app in $apps
do
===================================================================
RCS file: ultrapossum/module/server/runtime,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/module/server/runtime 2004/04/02 02:34:10 1.4
+++ ultrapossum/module/server/runtime 2004/09/22 12:31:11 1.5
@@ -36,7 +36,7 @@
echo "E: no permission to read server runtime status" 1>&2
exit 1
fi
-. "$ULTRAPOSSUMRUN"
+source_shell "$ULTRAPOSSUMRUN"
for a in "$@"
do
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/slapd.sh 2004/09/07 12:17:13 1.8
+++ ultrapossum/module/server/slapd.sh 2004/09/22 12:31:11 1.9
@@ -34,9 +34,9 @@
## TODO: choose apps
for cf in `/bin/ls $APPSDIR`
do
- . $APPSDIR/$cf
+ source_shell $APPSDIR/$cf
if test -f $APPSCONFDIR/$cf.cf; then
- . $APPSCONFDIR/$cf.cf
+ source_shell $APPSCONFDIR/$cf.cf
fi
for i in $indexes_eq
do
===================================================================
RCS file: ultrapossum/module/server/startup,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/module/server/startup 2004/09/22 10:16:40 1.14
+++ ultrapossum/module/server/startup 2004/09/22 12:31:11 1.15
@@ -55,11 +55,7 @@
xstatus)
if test -f "$ULTRAPOSSUMRUN"; then
- if test -r "$ULTRAPOSSUMRUN"; then
- . $ULTRAPOSSUMRUN
- else
- echo "Warning: no permission to read ultrapossum runtime variable" 1>&2
- fi
+ source_shell $ULTRAPOSSUMRUN
fi
if test `ldapmaster_status` = "running" ||
test `ldapslave_status` = "running"; then
@@ -74,7 +70,7 @@
configure_server
fi
if test "$1" = "stop" && test -f "$ULTRAPOSSUMRUN"; then
- . $ULTRAPOSSUMRUN
+ source_shell "$ULTRAPOSSUMRUN"
fi
if test "$TYPE" = "master"; then
ldapmaster_service_$1