isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For legacy utmp, strip the /dev/ prefix before trying to determine

Browse Source 
slot since the ttys file does not include the /dev/ prefix.
This commit is contained in:
Todd C. Miller
2011-03-15 15:51:44 -04:00
parent 5e6bc4017b
commit 07968755aa
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/utmp.c
View File

@@ -259,6 +259,10 @@ utmp_login(const char *from_line, const char *to_line, int ttyfd)
int slot, rval = FALSE; int slot, rval = FALSE;
FILE *fp; FILE *fp;
/* Strip off /dev/ prefix from line as needed. */
if (strncmp(to_line, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
to_line += sizeof(_PATH_DEV) - 1;
/* Find slot for new entry. */ /* Find slot for new entry. */
slot = utmp_slot(to_line, ttyfd); slot = utmp_slot(to_line, ttyfd);
if (slot <= 0) if (slot <= 0)
@@ -267,9 +271,6 @@ utmp_login(const char *from_line, const char *to_line, int ttyfd)
if ((fp = fopen(_PATH_UTMP, "r+")) == NULL) if ((fp = fopen(_PATH_UTMP, "r+")) == NULL)
goto done; goto done;
/* Strip off /dev/ prefix from line as needed. */
if (strncmp(to_line, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
to_line += sizeof(_PATH_DEV) - 1;
if (from_line != NULL) { if (from_line != NULL) {
if (strncmp(from_line, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) if (strncmp(from_line, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
from_line += sizeof(_PATH_DEV) - 1; from_line += sizeof(_PATH_DEV) - 1;