Masato Taruishi
taru****@users*****
2004年 10月 11日 (月) 18:54:53 JST
=================================================================== RCS file: ultrapossum/module/client/00client,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ultrapossum/module/client/00client 2004/10/10 20:29:14 1.1 +++ ultrapossum/module/client/00client 2004/10/11 09:54:52 1.2 @@ -38,7 +38,9 @@ # TLS OPTIONS TLSSYSCONFDIR=$(ultrapossum_getconf TLSSYSCONFDIR "$SYSCONFDIR/tls") - LDAPTLS_CACERTDIR=$(ultrapossum_getconf LDAPTLS_CACERTDIR "$localstatedir/lib/$PACKAGE/tls") + if test -d $TLSSYSCONFDIR; then + LDAPTLS_CACERTDIR=$(ultrapossum_getconf LDAPTLS_CACERTDIR "$localstatedir/lib/$PACKAGE/tls") + fi LDAPTLS_REQCERT=$(ultrapossum_getconf LDAPTLS_REQCERT "") fi =================================================================== RCS file: ultrapossum/module/client/update-client,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ultrapossum/module/client/update-client 2004/10/11 07:51:14 1.9 +++ ultrapossum/module/client/update-client 2004/10/11 09:54:52 1.10 @@ -33,15 +33,17 @@ add_end_vaconf "$LDAPCONF" "$tmp" "$id" fi # FIXME: c_rehash path - /bin/rm -rf "$LDAPTLS_CACERTDIR" - install -d "$LDAPTLS_CACERTDIR" - if test -d "$TLSSYSCONFDIR"; then - if test -x "/usr/bin/c_rehash"; then - find $TLSSYSCONFDIR -name '*.pem' | while read f - do - /bin/ln -s $f $LDAPTLS_CACERTDIR - done - (cd $LDAPTLS_CACERTDIR; c_rehash . > /dev/null 2>&1 ) + if test "x$LDAPTLS_CACERTDIR" != "x"; then + /bin/rm -rf "$LDAPTLS_CACERTDIR" + install -d "$LDAPTLS_CACERTDIR" + if test -d "$TLSSYSCONFDIR"; then + if test -x "/usr/bin/c_rehash"; then + find $TLSSYSCONFDIR -name '*.pem' | while read f + do + /bin/ln -s $f $LDAPTLS_CACERTDIR + done + (cd $LDAPTLS_CACERTDIR; c_rehash . > /dev/null 2>&1 ) + fi fi fi }