Attachment #72204 for bug #137793

View | Details | Raw Unified | Return to bug 137793
Collapse All | Expand All

Lines 266-271 Link Here

(-)configure.in (+4 lines)
266	AC_SUBST(EXTRA_SBIN_PROGS)	266	AC_SUBST(EXTRA_SBIN_PROGS)
267	AC_SUBST(EXTRA_ALL_TARGETS)	267	AC_SUBST(EXTRA_ALL_TARGETS)
268	AC_SUBST(CONFIG_LIBS)	268	AC_SUBST(CONFIG_LIBS)
		269	AC_SUBST(NSCD_LIBS)
269		270
270	# Set defaults	271	# Set defaults
271	PIE_CFLAGS=""	272	PIE_CFLAGS=""
Lines 3551-3556 Link Here
3551	esac ])	3568	esac ])
3552		3569
3553	AC_MSG_RESULT($with_kcm_support)	3570	AC_MSG_RESULT($with_kcm_support)
		3571
		3572	AC_CHECK_LIB_EXT(nscd, NSCD_LIBS, nscd_flush_cache)
		3573
3554	#################################################	3574	#################################################
3555	# check for automount support	3575	# check for automount support
3556	AC_MSG_CHECKING(whether to use automount)	3576	AC_MSG_CHECKING(whether to use automount)

Lines 35-40 Link Here

(-)Makefile.in (-1 / +2 lines)
35	IDMAP_LIBS=@IDMAP_LIBS@	35	IDMAP_LIBS=@IDMAP_LIBS@
36	KRB5LIBS=@KRB5_LIBS@	36	KRB5LIBS=@KRB5_LIBS@
37	LDAP_LIBS=@LDAP_LIBS@	37	LDAP_LIBS=@LDAP_LIBS@
		38	NSCD_LIBS=@NSCD_LIBS@
38		39
39	INSTALLCMD=@INSTALL@	40	INSTALLCMD=@INSTALL@
40	INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@	41	INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
Lines 1209-1215 Link Here
1209	bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy	1213	bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
1210	@echo "Linking $@"	1214	@echo "Linking $@"
1211	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \	1215	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
1212	@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS)	1216	@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
1213		1217
1214	# Please don't add .o files to libnss_winbind, libnss_wins, or the pam_winbind	1218	# Please don't add .o files to libnss_winbind, libnss_wins, or the pam_winbind
1215	# libraries. Add to the appropriate PICOBJ variable instead.	1219	# libraries. Add to the appropriate PICOBJ variable instead.

Lines 29-34 Link Here

(-)nsswitch/winbindd.h (+4 lines)
29		29
30	#include "winbindd_nss.h"	30	#include "winbindd_nss.h"
31		31
		32	#ifdef HAVE_LIBNSCD
		33	#include "libnscd.h"
		34	#endif
		35
32	#undef DBGC_CLASS	36	#undef DBGC_CLASS
33	#define DBGC_CLASS DBGC_WINBIND	37	#define DBGC_CLASS DBGC_WINBIND
34		38




static void child_msg_online(int msg_type, struct process_id src, void *buf, size_t len)
{
	struct winbindd_domain *domain;
	int ret;

	DEBUG(5,("child_msg_online received.\n"));


	/* Set our global state as online. */
	set_global_winbindd_state_online();

#ifdef HAVE_LIBNSCD
	/* Flush nscd caches to get accurate new information */
	ret = nscd_flush_cache("passwd");
	if (ret) {
		DEBUG(5,("failed to flush nscd cache for 'passwd' service: %s\n",
			error_message(ret)));
	}

	ret = nscd_flush_cache("group");
	if (ret) {
		DEBUG(5,("failed to flush nscd cache for 'group' service: %s\n",
			error_message(ret)));
	}
#endif

	/* Mark everything online - delete any negative cache entries
	   to force an immediate reconnect. */


Return to bug 137793

Lines 559-564 Link Here

(-)nsswitch/winbindd_dual.c (+16 lines)
559	static void child_msg_online(int msg_type, struct process_id src, void *buf, size_t len)	621	static void child_msg_online(int msg_type, struct process_id src, void *buf, size_t len)
560	{	622	{
561	struct winbindd_domain *domain;	623	struct winbindd_domain *domain;
		624	int ret;
562		625
563	DEBUG(5,("child_msg_online received.\n"));	626	DEBUG(5,("child_msg_online received.\n"));
564		627
Lines 570-575 Link Here
570	/* Set our global state as online. */	633	/* Set our global state as online. */
571	set_global_winbindd_state_online();	634	set_global_winbindd_state_online();
572		635
		636	#ifdef HAVE_LIBNSCD
		637	/* Flush nscd caches to get accurate new information */
		638	ret = nscd_flush_cache("passwd");
		639	if (ret) {
		640	DEBUG(5,("failed to flush nscd cache for 'passwd' service: %s\n",
		641	error_message(ret)));
		642	}
		643
		644	ret = nscd_flush_cache("group");
		645	if (ret) {
		646	DEBUG(5,("failed to flush nscd cache for 'group' service: %s\n",
		647	error_message(ret)));
		648	}
		649	#endif
		650
573	/* Mark everything online - delete any negative cache entries	651	/* Mark everything online - delete any negative cache entries
574	to force an immediate reconnect. */	652	to force an immediate reconnect. */
575		653