1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore upper bits of pw_change on macOS too

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-04-09 12:23:15 +09:00
parent f099bb040c
commit 97f73bd0e2
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/etc/etc.c
View File

@ -126,9 +126,9 @@ safe_setup_filesystem_str(const char *str)
#ifdef HAVE_GETPWENT #ifdef HAVE_GETPWENT
# ifdef __APPLE__ # ifdef __APPLE__
# define PW_EXPIRE2VAL(t) INT2NUM((int)(t)) # define PW_TIME2VAL(t) INT2NUM((int)(t))
# else # else
# define PW_EXPIRE2VAL(t) TIMET2NUM(t) # define PW_TIME2VAL(t) TIMET2NUM(t)
# endif # endif
static VALUE static VALUE
@ -148,7 +148,7 @@ setup_passwd(struct passwd *pwd)
safe_setup_filesystem_str(pwd->pw_dir), safe_setup_filesystem_str(pwd->pw_dir),
safe_setup_filesystem_str(pwd->pw_shell), safe_setup_filesystem_str(pwd->pw_shell),
#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE #ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
TIMET2NUM(pwd->pw_change), PW_TIME2VAL(pwd->pw_change),
#endif #endif
#ifdef HAVE_STRUCT_PASSWD_PW_QUOTA #ifdef HAVE_STRUCT_PASSWD_PW_QUOTA
INT2NUM(pwd->pw_quota), INT2NUM(pwd->pw_quota),
@ -163,7 +163,7 @@ setup_passwd(struct passwd *pwd)
safe_setup_locale_str(pwd->pw_comment), safe_setup_locale_str(pwd->pw_comment),
#endif #endif
#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE #ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
PW_EXPIRE2VAL(pwd->pw_expire), PW_TIME2VAL(pwd->pw_expire),
#endif #endif
0 /*dummy*/ 0 /*dummy*/
); );