Commit 7aaa0b28 authored by Marek Vavrusa's avatar Marek Vavrusa

Merge branch 'master' into packet-api-rewrite

parents 47db4afe 84727223
.TH "knsec3hash" "8" "June 2013" "CZ.NIC Labs" "Knot DNS, version @VERSION@"
.TH "knsec3hash" "1" "June 2013" "CZ.NIC Labs" "Knot DNS, version @VERSION@"
.SH NAME
.B knsec3hash
\- Simple utility to compute NSEC3 hash (libknot equivalent of ISC nsec3hash)
......
......@@ -666,10 +666,8 @@ static int update_zone(knot_zone_t **dst, conf_zone_t *conf, knot_nameserver_t *
goto fail;
}
/* Don't schedule when immediate syncing is used. */
if (conf->dbsync_timeout > 0) {
zones_schedule_ixfr_sync(new_zone, conf->dbsync_timeout);
}
/* Schedule zonefile flush. */
zones_schedule_ixfr_sync(new_zone, conf->dbsync_timeout);
knot_zone_contents_t *new_contents = new_zone->contents;
if (new_contents) {
......
......@@ -35,13 +35,13 @@
#endif
// ECDSA support requires OpenSSL version >= 1.0.1
#if !defined(OPENSSL_NO_ECDSA) && OPENSSL_VERSION_NUMBER >= 0x10001000
#if !defined(OPENSSL_NO_ECDSA) && OPENSSL_VERSION_NUMBER >= 0x10001000L
#define KNOT_ENABLE_ECDSA 1
#else
#undef KNOT_ENABLE_ECDSA
#endif
#if !defined(OPENSSL_NO_GOST)
#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL
#define KNOT_ENABLE_GOST 1
#else
#undef KNOT_ENABLE_GOST
......
......@@ -105,11 +105,20 @@ static void openssl_mutexes_destroy(void)
*
* \param openssl_id Thread identifier in OpenSSL.
*/
#if OPENSSL_VERSION_NUMBER >= 0x1000001fL
static void openssl_threadid_cb(CRYPTO_THREADID *openssl_id)
{
pthread_t id = pthread_self();
CRYPTO_THREADID_set_pointer(openssl_id, (void *)id);
}
#else
static unsigned long openssl_threadid_cb(void)
{
unsigned long ret;
ret = (unsigned long)pthread_self();
return(ret);
}
#endif
/*- pluggable engines -------------------------------------------------------*/
......@@ -181,7 +190,11 @@ void knot_crypto_init_threads(void)
}
// thread identification
#if OPENSSL_VERSION_NUMBER >= 0x1000001fL
CRYPTO_THREADID_set_callback(openssl_threadid_cb);
#else
CRYPTO_set_id_callback((unsigned long (*)())openssl_threadid_cb);
#endif
}
void knot_crypto_cleanup_threads(void)
......
......@@ -232,7 +232,7 @@ int knot_load_zone_keys(const char *keydir_name, const knot_dname_t *zone_name,
nsec3_enabled)
) {
log_zone_notice("%s Ignoring key %d (%s): unknown "
"algorithm or non-NSEC3 algrorithm when"
"algorithm or non-NSEC3 algorithm when"
" NSEC3 is requested.\n", msgpref,
params.keytag, entry->d_name);
knot_free_key_params(&params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment