upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-17 20:22:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- avoid warning about upcast on 32bit systems for autotrust.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2019-08-15 14:25:46 +02:00
parent 9d9884c442
commit 4700d79024
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,6 +1,7 @@
15 August 2019: Wouter
- iana portlist updated.
- Fix autotrust temp file uniqueness windows compile.
- avoid warning about upcast on 32bit systems for autotrust.
14 August 2019: George
- Fix #59, when compiled with systemd support check that we can properly

11
validator/autotrust.c
View file

@ -1175,6 +1175,7 @@ void autr_write_file(struct module_env* env, struct trust_anchor* tp)
{
FILE* out;
char* fname = tp->autr->file;
long long llvalue;
char tempf[2048];
log_assert(tp->autr);
if(!env) {
@ -1183,12 +1184,18 @@ void autr_write_file(struct module_env* env, struct trust_anchor* tp)
}
/* unique name with pid number, thread number, and struct pointer
* (the pointer uniquifies for multiple libunbound contexts) */
#if defined(SIZE_MAX) && defined(UINT32_MAX) && (UINT32_MAX == SIZE_MAX || INT32_MAX == SIZE_MAX)
/* avoid warning about upcast on 32bit systems */
llvalue = (unsigned long)tp;
#else
llvalue = (unsigned long long)tp;
#endif
#ifndef USE_WINSOCK
snprintf(tempf, sizeof(tempf), "%s.%d-%d-%llx", fname, (int)getpid(),
env->worker?*(int*)env->worker:0, (long long int)tp);
env->worker?*(int*)env->worker:0, llvalue);
#else
snprintf(tempf, sizeof(tempf), "%s.%d-%d-%I64x", fname, (int)getpid(),
env->worker?*(int*)env->worker:0, (long long int)tp);
env->worker?*(int*)env->worker:0, llvalue);
#endif
verbose(VERB_ALGO, "autotrust: write to disk: %s", tempf);
out = fopen(tempf, "w");