* nscd/nscd.c (termination_handler): Reset timestamp so that
	client immediately stop using the database.

	(__nscd_drop_map_ref): Change second parameter to be a reference to
	* nscd/nscd.h: Add declaration of addinitgroups and
This commit is contained in:
Ulrich Drepper 2004-09-30 08:27:48 +00:00
parent 0891f9706f
commit 74fef3bbcb
8 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,11 @@
2004-09-30 Ulrich Drepper <drepper@redhat.com> 2004-09-30 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd.c (termination_handler): Reset timestamp so that
client immediately stop using the database.
* nscd/nscd-client.h (__nscd_get_map_ref): Drop volatile from last * nscd/nscd-client.h (__nscd_get_map_ref): Drop volatile from last
parameter. parameter.
(__nscd_drop_map_ref): Change second parameter to be a referenc to (__nscd_drop_map_ref): Change second parameter to be a reference to
a variable. Update variable when cycle count changed. a variable. Update variable when cycle count changed.
* nscd/nscd_helper.c (__nscd_get_map_ref): Remove volatile here, too. * nscd/nscd_helper.c (__nscd_get_map_ref): Remove volatile here, too.
* nscd/nscd_getai.c: Correctly use __nscd_drop_map_ref. Reinitialize * nscd/nscd_getai.c: Correctly use __nscd_drop_map_ref. Reinitialize
@ -12,7 +15,7 @@
* nscd/nscd_getpw_r.c: Likewise. * nscd/nscd_getpw_r.c: Likewise.
* nscd/nscd_initgroups.c: Likewise. * nscd/nscd_initgroups.c: Likewise.
* nscd/nscd.h: Add declaretion of addinitgroups and * nscd/nscd.h: Add declaration of addinitgroups and
readdinitgroups. readdinitgroups.
2004-09-30 Andreas Jaeger <aj@suse.de> 2004-09-30 Andreas Jaeger <aj@suse.de>

View File

@ -66,6 +66,8 @@ include ../Rules
CFLAGS-nscd_getpw_r.c = -fexceptions CFLAGS-nscd_getpw_r.c = -fexceptions
CFLAGS-nscd_getgr_r.c = -fexceptions CFLAGS-nscd_getgr_r.c = -fexceptions
CFLAGS-nscd_gethst_r.c = -fexceptions CFLAGS-nscd_gethst_r.c = -fexceptions
CFLAGS-nscd_getai.c = -fexceptions
CFLAGS-nscd_initgroups.c = -fexceptions
ifeq (yesyes,$(have-fpie)$(build-shared)) ifeq (yesyes,$(have-fpie)$(build-shared))
CFLAGS-nscd.c = -fpie CFLAGS-nscd.c = -fpie
@ -89,7 +91,6 @@ CFLAGS-mem.c = -fpie
CFLAGS-nscd_setup_thread.c = -fpie CFLAGS-nscd_setup_thread.c = -fpie
CFLAGS-aicache.c = -fpie CFLAGS-aicache.c = -fpie
CFLAGS-selinux.c = -fpie CFLAGS-selinux.c = -fpie
CFLAGS-nscd_initgroups.c = -fpie
CFLAGS-initgrcache.c = -fpie CFLAGS-initgrcache.c = -fpie
$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o)) $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))

View File

@ -430,9 +430,14 @@ termination_handler (int signum)
/* Synchronize memory. */ /* Synchronize memory. */
for (int cnt = 0; cnt < lastdb; ++cnt) for (int cnt = 0; cnt < lastdb; ++cnt)
{
/* Make sure nobody keeps using the database. */
dbs[cnt].head->timestamp = 0;
if (dbs[cnt].persistent) if (dbs[cnt].persistent)
// XXX async OK? // XXX async OK?
msync (dbs[cnt].head, dbs[cnt].memsize, MS_ASYNC); msync (dbs[cnt].head, dbs[cnt].memsize, MS_ASYNC);
}
/* Shutdown the SELinux AVC. */ /* Shutdown the SELinux AVC. */
if (selinux_enabled) if (selinux_enabled)

View File

@ -39,7 +39,6 @@ libc_locked_map_ptr (map_handle);
handling. */ handling. */
libc_freeres_fn (ai_map_free) libc_freeres_fn (ai_map_free)
{ {
if (map_handle.mapped != NO_MAPPING) if (map_handle.mapped != NO_MAPPING)
free (map_handle.mapped); free (map_handle.mapped);
} }

View File

@ -73,7 +73,6 @@ libc_locked_map_ptr (map_handle);
handling. */ handling. */
libc_freeres_fn (gr_map_free) libc_freeres_fn (gr_map_free)
{ {
if (map_handle.mapped != NO_MAPPING) if (map_handle.mapped != NO_MAPPING)
free (map_handle.mapped); free (map_handle.mapped);
} }

View File

@ -93,7 +93,6 @@ libc_locked_map_ptr (map_handle);
handling. */ handling. */
libc_freeres_fn (gr_map_free) libc_freeres_fn (gr_map_free)
{ {
if (map_handle.mapped != NO_MAPPING) if (map_handle.mapped != NO_MAPPING)
free (map_handle.mapped); free (map_handle.mapped);
} }

View File

@ -72,7 +72,6 @@ libc_locked_map_ptr (map_handle);
handling. */ handling. */
libc_freeres_fn (gr_map_free) libc_freeres_fn (gr_map_free)
{ {
if (map_handle.mapped != NO_MAPPING) if (map_handle.mapped != NO_MAPPING)
free (map_handle.mapped); free (map_handle.mapped);
} }

View File

@ -35,7 +35,6 @@ libc_locked_map_ptr (map_handle);
handling. */ handling. */
libc_freeres_fn (gr_map_free) libc_freeres_fn (gr_map_free)
{ {
if (map_handle.mapped != NO_MAPPING) if (map_handle.mapped != NO_MAPPING)
free (map_handle.mapped); free (map_handle.mapped);
} }