diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-08-13 12:09:32 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-08-13 12:09:32 +0200 |
| commit | a33b817f13170b5c24263b92e7e09880fe797d7e (patch) | |
| tree | 232dc87b4dcfaacf85cc9b01f9c72f5602e38307 /sysdeps/generic | |
| parent | 9b9670fcd8ca92d6f53465e98173e3b33a76182c (diff) | |
| download | glibc-a33b817f13170b5c24263b92e7e09880fe797d7e.tar.gz glibc-a33b817f13170b5c24263b92e7e09880fe797d7e.tar.xz glibc-a33b817f13170b5c24263b92e7e09880fe797d7e.zip | |
login: Assume that _HAVE_UT_* constants are true
Make the GNU version of bits/utmp.h the generic version because all remaining ports use it (with a sysdeps override for Linux s390/s390x).
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/utmp-equal.h | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/sysdeps/generic/utmp-equal.h b/sysdeps/generic/utmp-equal.h index d077147a7a..d61cbb3300 100644 --- a/sysdeps/generic/utmp-equal.h +++ b/sysdeps/generic/utmp-equal.h @@ -27,26 +27,16 @@ static int __utmp_equal (const struct utmp *entry, const struct utmp *match) { - return - ( -#if _HAVE_UT_TYPE - 0 - (entry->ut_type == INIT_PROCESS - || entry->ut_type == LOGIN_PROCESS - || entry->ut_type == USER_PROCESS - || entry->ut_type == DEAD_PROCESS) - && - (match->ut_type == INIT_PROCESS - || match->ut_type == LOGIN_PROCESS - || match->ut_type == USER_PROCESS - || match->ut_type == DEAD_PROCESS) - && -#endif -#if _HAVE_UT_ID - 0 - (entry->ut_id[0] && match->ut_id[0] - ? strncmp (entry->ut_id, match->ut_id, sizeof match->ut_id) == 0 - : strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0) -#else - strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0 -#endif - ); + return (entry->ut_type == INIT_PROCESS + || entry->ut_type == LOGIN_PROCESS + || entry->ut_type == USER_PROCESS + || entry->ut_type == DEAD_PROCESS) + && (match->ut_type == INIT_PROCESS + || match->ut_type == LOGIN_PROCESS + || match->ut_type == USER_PROCESS + || match->ut_type == DEAD_PROCESS) + && (entry->ut_id[0] && match->ut_id[0] + ? strncmp (entry->ut_id, match->ut_id, sizeof match->ut_id) == 0 + : (strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) + == 0)); } |