git: 102717f773f8 - stable/13 - cross-build: Provide _PASSWORD_EFMT1 for libcrypt on Linux
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Jan 2022 01:40:04 UTC
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=102717f773f8b7c54b2ba389e894aeeddbaae596 commit 102717f773f8b7c54b2ba389e894aeeddbaae596 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2021-12-06 23:25:53 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2022-01-24 23:59:24 +0000 cross-build: Provide _PASSWORD_EFMT1 for libcrypt on Linux Linux's pwd.h does not define _PASSWORD_EFMT1 (macOS's does), so we need to define it in order to be able to bootstrap libcrypt (crypt-des.c uses it) on non-FreeBSD, which will be done in a subsequent commit. MFC after: 1 week (cherry picked from commit e0cb1fe7dd34e9786320befa623b181d29d6bdf9) --- tools/build/cross-build/include/common/pwd.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/cross-build/include/common/pwd.h b/tools/build/cross-build/include/common/pwd.h index e167fe47701f..03814b62c254 100644 --- a/tools/build/cross-build/include/common/pwd.h +++ b/tools/build/cross-build/include/common/pwd.h @@ -41,6 +41,10 @@ #define user_from_uid __nbcompat_user_from_uid +#ifndef _PASSWORD_EFMT1 +#define _PASSWORD_EFMT1 '_' /* extended encryption format */ +#endif + int pwcache_userdb(int (*a_setpassent)(int), void (*a_endpwent)(void), struct passwd *(*a_getpwnam)(const char *), struct passwd *(*a_getpwuid)(uid_t));