Masato Taruishi
taru****@sourc*****
2004年 7月 16日 (金) 15:41:00 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ultrapossum/module/server/10server 2004/07/03 06:11:45 1.6
+++ ultrapossum/module/server/10server 2004/07/16 06:41:00 1.7
@@ -40,6 +40,7 @@
SLAPADD_EXTRA_ARGS=`ultrapossum_getconf SLAPADD_EXTRA_ARGS ""`
SLAPCAT=`ultrapossum_getconf SLAPCAT "slapcat"`
SLAPINDEX=`ultrapossum_getconf SLAPINDEX "slapindex"`
+SLAPPASSWD=`ultrapossum_getconf SLAPPASSWD "slappasswd"`
UCDATA_PATH=`ultrapossum_getconf UCDATA_PATH $ldapdatadir/ucdata`
@@ -229,8 +230,8 @@
fi
if test "x$SECRETCF" != "x"; then
- if slappasswd -s $ROOTPW > /dev/null 2> /dev/null; then
- SLAPROOTPW=$(ultrapossum_getconf SLAPROOTPW `slappasswd -s $ROOTPW`)
+ if $SLAPPASSWD -s $ROOTPW > /dev/null 2> /dev/null; then
+ SLAPROOTPW=$(ultrapossum_getconf SLAPROOTPW `$SLAPPASSWD -s $ROOTPW`)
else
SLAPROOTPW=$(ultrapossum_getconf SLAPROOTPW $ROOTPW)
fi
===================================================================
RCS file: ultrapossum/module/server/apps,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ultrapossum/module/server/apps 2004/05/14 11:08:56 1.8
+++ ultrapossum/module/server/apps 2004/07/16 06:41:00 1.9
@@ -68,7 +68,7 @@
objectClass: person
cn: $app
sn: $app
-userPassword: `slappasswd -s $pass`
+userPassword: `$SLAPPASSWD -s $pass`
EOF
echo ""
done