ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agetty: cleanup code to copy to log strings 

man utmp:
  String fields are terminated by a null byte ('\0') if they are shorter
  than the size of the field.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-10-03 17:08:11 +02:00
parent 7f76bc8a75
commit c0c4feec88
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
term-utils/agetty.c
View File

@ -957,7 +957,7 @@ static void update_utmp(struct options *op)
memset(&ut, 0, sizeof(ut));
if (vcline && *vcline)
/* Standard virtual console devices */
strncpy(ut.ut_id, vcline, sizeof(ut.ut_id));
str2memcpy(ut.ut_id, vcline, sizeof(ut.ut_id));
else {
size_t len = strlen(line);
char * ptr;
@ -965,14 +965,14 @@ static void update_utmp(struct options *op)
ptr = line + len - sizeof(ut.ut_id);
else
ptr = line;
strncpy(ut.ut_id, ptr, sizeof(ut.ut_id));
str2memcpy(ut.ut_id, ptr, sizeof(ut.ut_id));
}
}
strncpy(ut.ut_user, "LOGIN", sizeof(ut.ut_user));
strncpy(ut.ut_line, line, sizeof(ut.ut_line));
str2memcpy(ut.ut_user, "LOGIN", sizeof(ut.ut_user));
str2memcpy(ut.ut_line, line, sizeof(ut.ut_line));
if (fakehost)
strncpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
str2memcpy(ut.ut_host, fakehost, sizeof(ut.ut_host));
time(&t);
ut.ut_tv.tv_sec = t;
ut.ut_type = LOGIN_PROCESS;