qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nis: Build libnsl with 64 bit time_t 

And remove the usage of glibc reserved names.
Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Adhemerval Zanella Netto 2022-10-26 16:04:23 -03:00 committed by Adhemerval Zanella
parent f4f2ca1509
commit 545eefc2f5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makeconfig
View File

@ -884,7 +884,7 @@ endif
# Use 64 bit time_t support for installed programs # Use 64 bit time_t support for installed programs
installed-modules = nonlib nscd ldconfig locale_programs \ installed-modules = nonlib nscd ldconfig locale_programs \
iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \ iconvprogs libnss_files libnss_compat libnss_db libnss_hesiod \
libutil libpcprofile libutil libpcprofile libnsl
+extra-time-flags = $(if $(filter $(installed-modules),\ +extra-time-flags = $(if $(filter $(installed-modules),\
$(in-module)),-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64) $(in-module)),-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64)

10
nis/nis_call.c
View File

@ -574,7 +574,7 @@ static struct nis_server_cache
unsigned int size; unsigned int size;
unsigned int server_used; unsigned int server_used;
unsigned int current_ep; unsigned int current_ep;
__time64_t expires; time_t expires;
char name[]; char name[];
} *nis_server_cache[16]; } *nis_server_cache[16];
static time_t nis_cold_start_mtime; static time_t nis_cold_start_mtime;
@ -583,7 +583,7 @@ __libc_lock_define_initialized (static, nis_server_cache_lock)
static directory_obj * static directory_obj *
nis_server_cache_search (const_nis_name name, int search_parent, nis_server_cache_search (const_nis_name name, int search_parent,
unsigned int *server_used, unsigned int *current_ep, unsigned int *server_used, unsigned int *current_ep,
struct __timespec64 *now) struct timespec *now)
{ {
directory_obj *ret = NULL; directory_obj *ret = NULL;
int i; int i;
@ -641,7 +641,7 @@ nis_server_cache_search (const_nis_name name, int search_parent,
static void static void
nis_server_cache_add (const_nis_name name, int search_parent, nis_server_cache_add (const_nis_name name, int search_parent,
directory_obj *dir, unsigned int server_used, directory_obj *dir, unsigned int server_used,
unsigned int current_ep, struct __timespec64 *now) unsigned int current_ep, struct timespec *now)
{ {
struct nis_server_cache **loc; struct nis_server_cache **loc;
struct nis_server_cache *new; struct nis_server_cache *new;
@ -707,7 +707,7 @@ __nisfind_server (const_nis_name name, int search_parent,
nis_error result = NIS_SUCCESS; nis_error result = NIS_SUCCESS;
nis_error status; nis_error status;
directory_obj *obj; directory_obj *obj;
struct __timespec64 ts; struct timespec ts;
unsigned int server_used = ~0; unsigned int server_used = ~0;
unsigned int current_ep = ~0; unsigned int current_ep = ~0;
@ -717,7 +717,7 @@ __nisfind_server (const_nis_name name, int search_parent,
if (*dir != NULL) if (*dir != NULL)
return NIS_SUCCESS; return NIS_SUCCESS;
__clock_gettime64 (CLOCK_REALTIME, &ts); clock_gettime (CLOCK_REALTIME, &ts);
if ((flags & NO_CACHE) == 0) if ((flags & NO_CACHE) == 0)
*dir = nis_server_cache_search (name, search_parent, &server_used, *dir = nis_server_cache_search (name, search_parent, &server_used,