Masato Taruishi
taru****@users*****
2004年 10月 11日 (月) 18:55:21 JST
===================================================================
RCS file: ultrapossum/debian/ultrapossum-tls.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ultrapossum/debian/ultrapossum-tls.config 2004/09/30 09:49:26 1.7
+++ ultrapossum/debian/ultrapossum-tls.config 2004/10/11 09:55:21 1.8
@@ -12,16 +12,18 @@
trap "/bin/rm -f $tmp" 0
chmod 600 $tmp
-if test -x "/usr/share/ultrapossum/update.d/update-startTLS"; then
+if test -x "/usr/bin/ultrapossum-config"; then
eval `/usr/bin/ultrapossum-config init`
trap "/bin/rm -f $tmp; eval `ultrapossum-config term`" 0
-else
+fi
+
+if ! test -x "/usr/share/ultrapossum/update.d/update-startTLS"; then
if ! test -f "/etc/ssl/openssl.cnf"; then
exit 0
fi
CERTCOUNTRY=`grep -e "^countryName_default" /etc/ssl/openssl.cnf | cut -d= -f2- | sed -e 's/^ *//'`
CERTSTATE=`grep -e "^stateOrProvinceName_default" /etc/ssl/openssl.cnf | cut -d= -f2- | sed -e 's/^ *//'`
- CERTORGANIZATION=`hostname`
+ CERTORGANIZATION=${ORGANIZATION:-`hostname`}
CERTHOST=`hostname --fqdn`
if test -f "/etc/ultrapossum/ultrapossum.cf"; then
. /etc/ultrapossum/ultrapossum.cf