interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release/1.5.0' into develop

This commit is contained in:
Willem Toorop 2018-12-14 16:05:27 +01:00
parent e9060792dc 36cb9b0243
commit 79459f5d1d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -165,7 +165,7 @@ distclean:
rm -f m4/ltoptions.m4 rm -f m4/ltoptions.m4
rm -f m4/ltsugar.m4 rm -f m4/ltsugar.m4
rm -f m4/ltversion.m4 rm -f m4/ltversion.m4
rm -f $(distdir).tar.gz $(distdir).tar.gz.sha256 rm -f $(distdir).tar.gz $(distdir).tar.gz.sha256 $(distdir).tar.gz.sha1
rm -f $(distdir).tar.gz.md5 $(distdir).tar.gz.asc rm -f $(distdir).tar.gz.md5 $(distdir).tar.gz.asc
megaclean: megaclean:
@ -177,11 +177,14 @@ autoclean: megaclean
dist: $(distdir).tar.gz dist: $(distdir).tar.gz
pub: $(distdir).tar.gz.sha256 $(distdir).tar.gz.md5 $(distdir).tar.gz.asc pub: $(distdir).tar.gz.sha256 $(distdir).tar.gz.md5 $(distdir).tar.gz.asc $(distdir).tar.gz.sha1
$(distdir).tar.gz.sha256: $(distdir).tar.gz $(distdir).tar.gz.sha256: $(distdir).tar.gz
openssl sha256 $(distdir).tar.gz >$@ openssl sha256 $(distdir).tar.gz >$@
$(distdir).tar.gz.sha1: $(distdir).tar.gz
openssl sha1 $(distdir).tar.gz >$@
$(distdir).tar.gz.md5: $(distdir).tar.gz $(distdir).tar.gz.md5: $(distdir).tar.gz
openssl md5 $(distdir).tar.gz >$@ openssl md5 $(distdir).tar.gz >$@

11
src/context.c
View File

@ -5349,6 +5349,8 @@ int _getdns_context_write_priv_file(getdns_context *context,
(void) close(fd); (void) close(fd);
context->can_write_appdata = PROP_UNABLE; context->can_write_appdata = PROP_UNABLE;
context->trust_anchors_backoff_expiry =
_getdns_get_now_ms() + context->trust_anchors_backoff_time;
return 0; return 0;
} }
@ -5361,9 +5363,12 @@ int _getdns_context_can_write_appdata(getdns_context *context)
if (context->can_write_appdata == PROP_ABLE) if (context->can_write_appdata == PROP_ABLE)
return 1; return 1;
else if (context->can_write_appdata == PROP_UNABLE) else if (context->can_write_appdata == PROP_UNABLE) {
return 0; if (_getdns_ms_until_expiry(
context->trust_anchors_backoff_expiry) > 0)
return 0;
context->can_write_appdata = PROP_UNKNOWN;
}
(void) snprintf( test_fn, sizeof(test_fn) (void) snprintf( test_fn, sizeof(test_fn)
, "write-test-%d.tmp", arc4random()); , "write-test-%d.tmp", arc4random());