D47145.id189513.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47145.id189513.diff
View Options

	diff --git a/usr.sbin/nscd/nscd.c b/usr.sbin/nscd/nscd.c
	--- a/usr.sbin/nscd/nscd.c
	+++ b/usr.sbin/nscd/nscd.c
	@@ -577,17 +577,14 @@
	}

	/*
	- * The idea of _nss_cache_cycle_prevention_function is that nsdispatch
	+ * The idea of _nss_cache_cycle_prevention_symbol is that nsdispatch
	* will search for this symbol in the executable. This symbol is the
	* attribute of the caching daemon. So, if it exists, nsdispatch won't try
	* to connect to the caching daemon and will just ignore the 'cache'
	* source in the nsswitch.conf. This method helps to avoid cycles and
	* organize self-performing requests.
	- *
	- * (not actually a function; it used to be, but it doesn't make any
	- * difference, as long as it has external linkage)
	*/
	-void *_nss_cache_cycle_prevention_function;
	+void *_nss_cache_cycle_prevention_symbol;

	int
	main(int argc, char *argv[])
	diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
	--- a/usr.sbin/nscd/query.c
	+++ b/usr.sbin/nscd/query.c
	@@ -800,8 +800,13 @@
	CELT_NEGATIVE);

	read_response->error_code = 0;
	- read_response->data = NULL;
	- read_response->data_size = 0;
	+ read_response->data_size =
	+ sizeof(negative_data);
	+ read_response->data =
	+ malloc(read_response->data_size);
	+ memcpy(read_response->data,
	+ negative_data,
	+ read_response->data_size);
	}
	}
	}