upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-12 15:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '249-address-gcc-8-compilation-warnings' into 'master'

Browse source 
Address GCC 8 compilation warnings

Closes #249

See merge request isc-projects/bind9!252
This commit is contained in:
Michał Kępień 2018-05-10 04:51:23 -04:00
commit 770235900e
7 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/named/server.c
View file

@ -13836,7 +13836,8 @@ named_server_zonestatus(named_server_t *server, isc_lex_t *lex,
const char *type, *file;
char zonename[DNS_NAME_FORMATSIZE];
isc_uint32_t serial, signed_serial, nodes;
char serbuf[16], sserbuf[16], nodebuf[16], resignbuf[512];
char serbuf[16], sserbuf[16], nodebuf[16];
char resignbuf[DNS_NAME_FORMATSIZE + DNS_RDATATYPE_FORMATSIZE + 2];
char lbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
char xbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];
char rbuf[ISC_FORMATHTTPTIMESTAMP_SIZE];

37
bin/tests/system/dlzexternal/driver.c
View file

@ -397,31 +397,42 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
isc_sockaddr_t *src;
char full_name[256];
char buf[512];
static char last[256] = { 0 };
static char last[256];
static int count = 0;
int i;
int i, size;
UNUSED(zone);
if (state->putrr == NULL)
if (state->putrr == NULL) {
return (ISC_R_NOTIMPLEMENTED);
}
if (strcmp(name, "@") == 0) {
strncpy(full_name, state->zone_name, 255);
full_name[255] = '\0';
} else if (strcmp(state->zone_name, ".") == 0)
snprintf(full_name, 255, "%s.", name);
else
snprintf(full_name, 255, "%s.%s", name, state->zone_name);
size = snprintf(full_name, sizeof(full_name),
"%s", state->zone_name);
} else if (strcmp(state->zone_name, ".") == 0) {
size = snprintf(full_name, sizeof(full_name),
"%s.", name);
} else {
size = snprintf(full_name, sizeof(full_name),
"%s.%s", name, state->zone_name);
}
if (size < 0 ||
(size_t)size >= sizeof(full_name) ||
(size_t)size >= sizeof(last))
{
return (ISC_R_NOSPACE);
}
/*
* For test purposes, log all calls to dlz_lookup()
*/
if (strncasecmp(full_name, last, 255) == 0)
if (strcasecmp(full_name, last) == 0) {
count++;
else {
} else {
count = 1;
strncpy(last, full_name, 255);
memcpy(last, full_name, size + 1);
}
state->log(ISC_LOG_INFO, "lookup #%d for %s", count, full_name);
@ -450,7 +461,7 @@ dlz_lookup(const char *zone, const char *name, void *dbdata,
}
if (strcmp(name, "source-addr") == 0) {
strcpy(buf, "unknown");
strncpy(buf, "unknown", sizeof(buf));
if (methods != NULL &&
methods->sourceip != NULL &&
(methods->version - methods->age <=

8
lib/dns/dnssec.c
View file

@ -776,7 +776,9 @@ dns_dnssec_findzonekeys(dns_db_t *db, dns_dbversion_t *ver,
}
if (result != ISC_R_SUCCESS) {
char filename[ISC_DIR_NAMEMAX];
char filename[DNS_NAME_FORMATSIZE +
DNS_SECALG_FORMATSIZE +
sizeof("key file for //65535")];
isc_result_t result2;
isc_buffer_t buf;
@ -1668,7 +1670,9 @@ dns_dnssec_keylistfromrdataset(const dns_name_t *origin,
}
if (result != ISC_R_SUCCESS) {
char filename[ISC_DIR_NAMEMAX];
char filename[DNS_NAME_FORMATSIZE +
DNS_SECALG_FORMATSIZE +
sizeof("key file for //65535")];
isc_result_t result2;
isc_buffer_t buf;

2
lib/dns/rdata/generic/loc_29.c
View file

@ -459,7 +459,7 @@ totext_loc(ARGS_TOTEXT) {
isc_boolean_t below;
isc_region_t sr;
char buf[sizeof("89 59 59.999 N 179 59 59.999 E "
"42849672.95m 90000000m 90000000m 90000000m")];
"-42849672.95m 90000000m 90000000m 90000000m")];
char sbuf[sizeof("90000000m")];
char hbuf[sizeof("90000000m")];
char vbuf[sizeof("90000000m")];

2
lib/isc/unix/file.c
View file

@ -714,7 +714,7 @@ isc_result_t
isc_file_sanitize(const char *dir, const char *base, const char *ext,
char *path, size_t length)
{
char buf[PATH_MAX], hash[PATH_MAX];
char buf[PATH_MAX], hash[ISC_SHA256_DIGESTSTRINGLENGTH];
size_t l = 0;
REQUIRE(base != NULL);

2
lib/isc/win32/file.c
View file

@ -785,7 +785,7 @@ isc_result_t
isc_file_sanitize(const char *dir, const char *base, const char *ext,
char *path, size_t length)
{
char buf[PATH_MAX], hash[PATH_MAX];
char buf[PATH_MAX], hash[ISC_SHA256_DIGESTSTRINGLENGTH];
size_t l = 0;
REQUIRE(base != NULL);

2
lib/ns/notify.c
View file

@ -73,7 +73,7 @@ ns_notify_start(ns_client_t *client) {
dns_rdataset_t *zone_rdataset;
dns_zone_t *zone = NULL;
char namebuf[DNS_NAME_FORMATSIZE];
char tsigbuf[DNS_NAME_FORMATSIZE + sizeof(": TSIG ''")];
char tsigbuf[DNS_NAME_FORMATSIZE * 2 + sizeof(": TSIG '' ()")];
dns_tsigkey_t *tsigkey;
/*