mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'each-cleanup-gethostname' into 'main'

Browse Source 
remove named_os_gethostname()

See merge request isc-projects/bind9!7555
This commit is contained in:
Evan Hunt
2023-02-18 20:23:56 +00:00
parent 345dc4d505 197334464e
commit 1efbca6856
6 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/named/builtin.c
View File

@@ -379,9 +379,8 @@ do_hostname_lookup(dns_sdblookup_t *lookup) {
} }
} else { } else {
char buf[256]; char buf[256];
isc_result_t result = named_os_gethostname(buf, sizeof(buf)); if (gethostname(buf, sizeof(buf)) != 0) {
if (result != ISC_R_SUCCESS) { return (ISC_R_FAILURE);
return (result);
} }
return (put_txt(lookup, buf)); return (put_txt(lookup, buf));
} }
@@ -419,13 +418,10 @@ do_authors_lookup(dns_sdblookup_t *lookup) {
static isc_result_t static isc_result_t
do_id_lookup(dns_sdblookup_t *lookup) { do_id_lookup(dns_sdblookup_t *lookup) {
if (named_g_server->sctx->gethostname != NULL) { if (named_g_server->sctx->usehostname) {
char buf[256]; char buf[256];
isc_result_t result; if (gethostname(buf, sizeof(buf)) != 0) {
return (ISC_R_FAILURE);
result = named_g_server->sctx->gethostname(buf, sizeof(buf));
if (result != ISC_R_SUCCESS) {
return (result);
} }
return (put_txt(lookup, buf)); return (put_txt(lookup, buf));
} else if (named_g_server->sctx->server_id != NULL) { } else if (named_g_server->sctx->server_id != NULL) {

3
bin/named/include/named/os.h
View File

@@ -62,9 +62,6 @@ named_os_issingleton(const char *filename);
void void
named_os_shutdown(void); named_os_shutdown(void);
isc_result_t
named_os_gethostname(char *buf, size_t len);
void void
named_os_shutdownmsg(char *command, isc_buffer_t *text); named_os_shutdownmsg(char *command, isc_buffer_t *text);

8
bin/named/os.c
View File

@@ -971,14 +971,6 @@ named_os_shutdown(void) {
cleanup_lockfile(); cleanup_lockfile();
} }
isc_result_t
named_os_gethostname(char *buf, size_t len) {
int n;
n = gethostname(buf, len);
return ((n == 0) ? ISC_R_SUCCESS : ISC_R_FAILURE);
}
void void
named_os_shutdownmsg(char *command, isc_buffer_t *text) { named_os_shutdownmsg(char *command, isc_buffer_t *text) {
char *last, *ptr; char *last, *ptr;

10
bin/named/server.c
View File

@@ -3908,8 +3908,7 @@ configure_dnstap(const cfg_obj_t **maps, dns_view_t *view) {
if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) { if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) {
/* "hostname" is interpreted as boolean true */ /* "hostname" is interpreted as boolean true */
char buf[256]; char buf[256];
result = named_os_gethostname(buf, sizeof(buf)); if (gethostname(buf, sizeof(buf)) == 0) {
if (result == ISC_R_SUCCESS) {
dns_dt_setidentity(named_g_server->dtenv, buf); dns_dt_setidentity(named_g_server->dtenv, buf);
} }
} else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { } else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) {
@@ -9543,10 +9542,10 @@ load_configuration(const char *filename, named_server_t *server,
obj = NULL; obj = NULL;
result = named_config_get(maps, "server-id", &obj); result = named_config_get(maps, "server-id", &obj);
server->sctx->gethostname = NULL; server->sctx->usehostname = false;
if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) { if (result == ISC_R_SUCCESS && cfg_obj_isboolean(obj)) {
/* The parser translates "hostname" to true */ /* The parser translates "hostname" to true */
server->sctx->gethostname = named_os_gethostname; server->sctx->usehostname = true;
result = ns_server_setserverid(server->sctx, NULL); result = ns_server_setserverid(server->sctx, NULL);
} else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) { } else if (result == ISC_R_SUCCESS && !cfg_obj_isvoid(obj)) {
/* Found a quoted string */ /* Found a quoted string */
@@ -12190,8 +12189,7 @@ named_server_status(named_server_t *server, isc_buffer_t **text) {
cb); cb);
CHECK(putstr(text, line)); CHECK(putstr(text, line));
result = named_os_gethostname(hostname, sizeof(hostname)); if (gethostname(hostname, sizeof(hostname)) == 0) {
if (result != ISC_R_SUCCESS) {
strlcpy(hostname, "localhost", sizeof(hostname)); strlcpy(hostname, "localhost", sizeof(hostname));
} }
snprintf(line, sizeof(line), "running on %s: %s\n", hostname, snprintf(line, sizeof(line), "running on %s: %s\n", hostname,

6
lib/ns/client.c
View File

@@ -979,10 +979,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message,
if (WANTNSID(client)) { if (WANTNSID(client)) {
if (client->manager->sctx->server_id != NULL) { if (client->manager->sctx->server_id != NULL) {
nsidp = client->manager->sctx->server_id; nsidp = client->manager->sctx->server_id;
} else if (client->manager->sctx->gethostname != NULL) { } else if (client->manager->sctx->usehostname) {
result = client->manager->sctx->gethostname( if (gethostname(nsid, sizeof(nsid)) != 0) {
nsid, sizeof(nsid));
if (result != ISC_R_SUCCESS) {
goto no_nsid; goto no_nsid;
} }
nsidp = nsid; nsidp = nsid;

4
lib/ns/include/ns/server.h
View File

@@ -97,8 +97,8 @@ struct ns_server {
dns_tkeyctx_t *tkeyctx; dns_tkeyctx_t *tkeyctx;
/*% Server id for NSID */ /*% Server id for NSID */
char *server_id; char *server_id;
ns_hostnamecb_t gethostname; bool usehostname;
/*% Fuzzer callback */ /*% Fuzzer callback */
isc_fuzztype_t fuzztype; isc_fuzztype_t fuzztype;