d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't ignore the return value from gethostname(3). It probably

Browse Source 
cannot happen, but it silences Coverity.

Reviewed by:	mav
MFC after:	2 weeks
Sponsored by:	NetApp, Inc.
Sponsored by:	Klara, Inc.
Differential Revision:	https://reviews.freebsd.org/D26606
This commit is contained in:
Edward Tomasz Napierala 2020-10-01 18:56:44 +00:00
parent 4c6f466cb4
commit ba2548b7bf
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.sbin/ctld/ctld.c
View File

@ -931,7 +931,7 @@ void
isns_register(struct isns *isns, struct isns *oldisns)
{
struct conf *conf = isns->i_conf;
int s;
int error, s;
char hostname[256];
if (TAILQ_EMPTY(&conf->conf_targets) ||
@ -943,8 +943,10 @@ isns_register(struct isns *isns, struct isns *oldisns)
set_timeout(0, false);
return;
}
gethostname(hostname, sizeof(hostname));
error = gethostname(hostname, sizeof(hostname));
if (error != 0)
log_err(1, "gethostname");
if (oldisns == NULL || TAILQ_EMPTY(&oldisns->i_conf->conf_targets))
oldisns = isns;
isns_do_deregister(oldisns, s, hostname);
@ -957,7 +959,7 @@ void
isns_check(struct isns *isns)
{
struct conf *conf = isns->i_conf;
int s, res;
int error, s, res;
char hostname[256];
if (TAILQ_EMPTY(&conf->conf_targets) ||
@ -969,8 +971,10 @@ isns_check(struct isns *isns)
set_timeout(0, false);
return;
}
gethostname(hostname, sizeof(hostname));
error = gethostname(hostname, sizeof(hostname));
if (error != 0)
log_err(1, "gethostname");
res = isns_do_check(isns, s, hostname);
if (res < 0) {
isns_do_deregister(isns, s, hostname);
@ -984,7 +988,7 @@ void
isns_deregister(struct isns *isns)
{
struct conf *conf = isns->i_conf;
int s;
int error, s;
char hostname[256];
if (TAILQ_EMPTY(&conf->conf_targets) ||
@ -994,8 +998,10 @@ isns_deregister(struct isns *isns)
s = isns_do_connect(isns);
if (s < 0)
return;
gethostname(hostname, sizeof(hostname));
error = gethostname(hostname, sizeof(hostname));
if (error != 0)
log_err(1, "gethostname");
isns_do_deregister(isns, s, hostname);
close(s);
set_timeout(0, false);