The old .conf config file was intended to be compatible with the ancient
PKS keyserver. All new features are only supported with the .ini format
and this is going to make the automated tests supporting both more
awkward. So deprecate the old style and stop testing it.
conffile = fopen(configfile, "r");
}
conffile = fopen(configfile, "r");
}
+ if (oldstyle) {
+ logthing(LOGTHING_CRITICAL, "Reading deprecated old-style "
+ "configuration file. This will not be "
+ "supported in the next release.");
+ }
+
if (conffile != NULL) {
if (!fgets(curline, 1023, conffile)) {
logthing(LOGTHING_CRITICAL,
if (conffile != NULL) {
if (!fgets(curline, 1023, conffile)) {
logthing(LOGTHING_CRITICAL,
backend=${t##libkeydb_}
backend=${backend%%.so}
if [ "`echo ${TESTSDIR}/$backend-*`" != "${TESTSDIR}/$backend-*" ]; then
backend=${t##libkeydb_}
backend=${backend%%.so}
if [ "`echo ${TESTSDIR}/$backend-*`" != "${TESTSDIR}/$backend-*" ]; then
- echo "* testing $backend backend [conf]"
- (sed -e "s;BUILDDIR;${BUILDDIR};" -e "s;WORKDIR;${WORKDIR};" \
- ${TESTSDIR}/test-in.conf ; \
- echo db_backend $backend) > ${WORKDIR}/test.conf
- for t in ${TESTSDIR}/$backend-*.t ${TESTSDIR}/all-*.t; do
- total=`expr $total + 1`
- mkdir ${WORKDIR}/db/
- if ! $t ${WORKDIR}/test.conf $backend; then
- echo "test $t failed" >&2
- fail=`expr $fail + 1`
- fi
- rm -rf ${WORKDIR}/db/
- done
- rm ${WORKDIR}/test.conf
- fi
-
- if [ "`echo ${TESTSDIR}/$backend-*`" != "${TESTSDIR}/$backend-*" ]; then
- echo "* testing $backend backend [ini]"
+ echo "* testing $backend backend"
sed -e "s;BUILDDIR;${BUILDDIR};" -e "s;WORKDIR;${WORKDIR};" \
-e "s;DB;${backend};" \
${TESTSDIR}/test-in.ini > ${WORKDIR}/test.ini
sed -e "s;BUILDDIR;${BUILDDIR};" -e "s;WORKDIR;${WORKDIR};" \
-e "s;DB;${backend};" \
${TESTSDIR}/test-in.ini > ${WORKDIR}/test.ini
+++ /dev/null
-pks_bin_dir BUILDDIR
-backends_dir BUILDDIR
-db_dir WORKDIR/db/
-logfile onak.log
-loglevel 7
-use_keyd false
-this_site pgp-public-keys@localhost
-max_reply_keys 128