From 22fbfdb8f5958586116074e712fd81f4cacd206c Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 3 Oct 2018 17:06:33 +0200 Subject: last: make sure domain is zero terminated Signed-off-by: Karel Zak --- login-utils/last.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'login-utils') diff --git a/login-utils/last.c b/login-utils/last.c index 59dfdb2f5..6b25efd4c 100644 --- a/login-utils/last.c +++ b/login-utils/last.c @@ -508,15 +508,8 @@ static int list(const struct last_control *ctl, struct utmpx *p, time_t logout_t r = -1; if (ctl->usedns || ctl->useip) r = dns_lookup(domain, sizeof(domain), ctl->useip, (int32_t*)p->ut_addr_v6); - if (r < 0) { - size_t sz = sizeof(p->ut_host); - - if (sz > sizeof(domain)) - sz = sizeof(domain); - - xstrncpy(domain, p->ut_host, sz); - } - + if (r < 0) + mem2strcpy(domain, p->ut_host, sizeof(p->ut_host), sizeof(domain)); if (ctl->showhost) { if (!ctl->altlist) { -- cgit v1.2.3-55-g7522