From a8da8a0241e9e8bbe4d2c2be2e33f3053b95f94f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 6 May 2019 01:50:56 +0000
Subject:  Fix hpr_wall utmp access, so is ut_id entirely unused?

---
 src/shutdown/hpr_wall.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/shutdown/hpr_wall.c b/src/shutdown/hpr_wall.c
index cc6da5e..e63ddea 100644
--- a/src/shutdown/hpr_wall.c
+++ b/src/shutdown/hpr_wall.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <string.h>
-#include <errno.h>
 #include <utmpx.h>
 
 #include <skalibs/posixishard.h>
@@ -25,23 +24,18 @@ void hpr_wall (char const *s)
   setutxent() ;
   for (;;)
   {
-    size_t linelen, idlen ;
-    struct utmpx *utx ;
+    size_t linelen ;
     int fd ;
-    errno = 0 ;
-    utx = getutxent() ;
+    struct utmpx *utx = getutxent() ;
     if (!utx) break ;
     if (utx->ut_type != USER_PROCESS) continue ;
     linelen = strnlen(utx->ut_line, UT_LINESIZE) ;
-    idlen = strnlen(utx->ut_id, 4) ;
     memcpy(tty + 5, utx->ut_line, linelen) ;
-    memcpy(tty + 5 + linelen, utx->ut_id, idlen) ;
-    tty[5 + linelen + idlen] = 0 ;
+    tty[5 + linelen] = 0 ;
     fd = open_append(tty) ;
     if (fd == -1) continue ;
     allwrite(fd, msg, n) ;
     fd_close(fd) ;
   }
-  if (errno) strerr_warnwu1sys("getutxent") ;
   endutxent() ;
 }
-- 
cgit v1.2.3