aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
Diffstat (limited to 'nscd')
-rw-r--r--nscd/Makefile1
-rw-r--r--nscd/nscd-client.h4
-rw-r--r--nscd/nscd_getai.c1
-rw-r--r--nscd/nscd_helper.c4
-rw-r--r--nscd/nscd_proto.h5
5 files changed, 9 insertions, 6 deletions
diff --git a/nscd/Makefile b/nscd/Makefile
index a6a08a3ab8..3e6a8b5182 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -82,6 +82,7 @@ CFLAGS-xmalloc.c = -fpie
CFLAGS-xstrdup.c = -fpie
CFLAGS-mem.c = -fpie
CFLAGS-nscd_setup_thread.c = -fpie
+CFLAGS-aicache.c = -fpie
$(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
$(LINK.o) -pie -Wl,-O1 \
diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index 1a0dd732db..4451349278 100644
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -294,8 +294,4 @@ extern const struct datahead *__nscd_cache_search (request_type type,
size_t keylen,
const struct mapped_database *mapped);
-/* Look up in addrinfo cache. */
-extern int __nscd_getai (const char *key, struct nscd_ai_result **result,
- int *h_errnop);
-
#endif /* nscd.h */
diff --git a/nscd/nscd_getai.c b/nscd/nscd_getai.c
index 453f459425..627fe8cf9d 100644
--- a/nscd/nscd_getai.c
+++ b/nscd/nscd_getai.c
@@ -27,6 +27,7 @@
#include <not-cancel.h>
#include "nscd-client.h"
+#include "nscd_proto.h"
/* Define in nscd_gethst_r.c. */
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index e40500c83c..ae8dd6c91f 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -72,7 +72,7 @@ void
__nscd_unmap (struct mapped_database *mapped)
{
assert (mapped->counter == 0);
- munmap ((void *) mapped->head, mapped->mapsize);
+ __munmap ((void *) mapped->head, mapped->mapsize);
free (mapped);
}
@@ -180,7 +180,7 @@ get_mapping (request_type type, const char *key,
if (newp == NULL)
{
/* Ugh, after all we went through the memory allocation failed. */
- munmap (result, size);
+ __munmap (result, size);
goto out_close;
}
diff --git a/nscd/nscd_proto.h b/nscd/nscd_proto.h
index 0c3cc73296..b0ee03cd84 100644
--- a/nscd/nscd_proto.h
+++ b/nscd/nscd_proto.h
@@ -24,6 +24,9 @@
#include <netdb.h>
#include <pwd.h>
+/* Interval in which we transfer retry to contact the NSCD. */
+#define NSS_NSCD_RETRY 100
+
/* Variables for communication between NSCD handler functions and NSS. */
extern int __nss_not_use_nscd_passwd attribute_hidden;
extern int __nss_not_use_nscd_group attribute_hidden;
@@ -53,5 +56,7 @@ extern int __nscd_gethostbyaddr_r (const void *addr, socklen_t len, int type,
struct hostent *resultbuf,
char *buffer, size_t buflen,
struct hostent **result, int *h_errnop);
+extern int __nscd_getai (const char *key, struct nscd_ai_result **result,
+ int *h_errnop);
#endif /* _NSCD_PROTO_H */