summarylogtreecommitdiffstats
path: root/handle_nscd_excision.patch
blob: c5703d33bb646f8e073cad90bd11c09b3748edbb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
--- nscd-0.54.c	2020-10-05 23:20:25.000000000 +0000
+++ nscd-0.54.c	2026-02-12 16:35:24.000000000 +0000
@@ -2459,25 +2459,6 @@
 }
 
 
-/* Callback for glibc-2.15 */
-struct traced_file;
-static void do_nothing(size_t dbidx, struct traced_file *finfo)
-{
-	/* nscd from glibc-2.15 does something like this:
-	if (!dbs[dbidx].enabled || !dbs[dbidx].check_file)
-		return;
-	add_file_to_watch_list(finfo->fname);
-	*/
-}
-
-/* This internal glibc function is called to disable trying to contact nscd.
- * We _are_ nscd, so we need to do the lookups, and not recurse.
- * Until 2.14, this function was taking no parameters.
- * In 2.15, it takes a function pointer from hell.
- */
-void __nss_disable_nscd(void (*hell)(size_t, struct traced_file*));
-
-
 int main(int argc, char **argv)
 {
 	int n;
@@ -2485,9 +2466,6 @@
 	const char *env_U;
 	const char *conffile;
 
-	/* make sure we don't get recursive calls */
-	__nss_disable_nscd(do_nothing);
-
 	if (argv[0][0] == 'w') /* "worker_nscd" */
 		worker(argv[1]);