diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 15:22:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-19 15:22:14 +0000 |
| commit | ce85d65bae842fad22fa8e9cb4ad122daeef7831 (patch) | |
| tree | 88b5d68fe4b1be9132a7a85840f001ff1a86c1b7 /nscd | |
| parent | 816e6eb5a786594223586976c08e337bc08b6f4e (diff) | |
Update.
1998-10-19 Ulrich Drepper <drepper@cygnus.com>
* include/ldsodefs.h: New file.
* iconv/gconv.c: Include ldsodefs.h, not elf/ldsodefs.h.
Remove change to avoid using _CALL_DL_FCT.
* iconv/gconv_db.c: Likewise.
* iconv/gconv_dl.c: Likewise.
* iconv/skeleton.c: Likewise, here for DL_CALL_FCT.
* malloc/mtrace.c: Include ldsodefs.h, not elf/ldsodefs.h.
* nss/nsswitch.c: Likewise.
* nss/nsswitch.h: Likewise.
1998-10-19 Philip Blundell <pb@nexus.co.uk>
* sunrpc/Makefile (otherlibs): If static NSS is in use, set to the
required libraries.
* login/Makefile (otherlibs): Likewise.
* nscd/Makefile (otherlibs): Likewise.
* Makeconfig (link-libc) [! build_shared]: Add $(otherlibs).
* debug/Makefile (install-bin): Only build catchsegv if using ELF.
* inet/Makefile: Add -DSTATIC_NSS to CFLAGS.
1998-10-19 Philip Blundell <pb@nexus.co.uk>
* sysdeps/unix/sysv/linux/arm/syscalls.list: Added setfsgid
and setfsuid.
1998-10-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nscd/connections.c: Fix typos in comments and strings.
* nscd/nscd.conf: Update according to recent changes to nscd.
* nscd/cache.c (prune_cache): Remove wrong comment.
copy_posix.mask for copy instruction.
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/Makefile | 5 | ||||
| -rw-r--r-- | nscd/cache.c | 4 | ||||
| -rw-r--r-- | nscd/connections.c | 6 | ||||
| -rw-r--r-- | nscd/nscd.conf | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 278bca6bbe..d915aa70f4 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -38,6 +38,11 @@ extra-objs := $(nscd-modules:=.o) endif +ifeq (yes,$(build-static-nss)) +otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \ + $(resolvobjdir)/libresolv.a +endif + distribute := nscd.h nscd-client.h dbg_log.h \ $(nscd-modules:=.c) TODO nscd.conf nscd.init \ nscd_proto.h diff --git a/nscd/cache.c b/nscd/cache.c index e957a577c0..4ab83db6e2 100644 --- a/nscd/cache.c +++ b/nscd/cache.c @@ -118,9 +118,7 @@ cache_add (int type, void *key, size_t len, const void *packet, size_t total, must be invalidated and remember them. Then we get the lock and actually remove them. This is complicated by the way we have to free the data structures since some hash table entries share the same - data. - - This function must be called with the write-lock held. */ + data. */ void prune_cache (struct database *table, time_t now) { diff --git a/nscd/connections.c b/nscd/connections.c index 5ef13bf850..591e300511 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -197,7 +197,7 @@ static void handle_request (int fd, request_header *req, void *key) { if (debug_level > 0) - dbg_log (_("handle_requests: request received (Version = %d)"), + dbg_log (_("handle_request: request received (Version = %d)"), req->version); if (req->version != NSCD_VERSION) @@ -219,7 +219,7 @@ cannot handle old request version %d; current version is %d"), /* Is this service enabled? */ if (!db->enabled) { - /* No sent the prepared record. */ + /* No, sent the prepared record. */ if (TEMP_FAILURE_RETRY (write (fd, db->disabled_iov->iov_base, db->disabled_iov->iov_len)) != db->disabled_iov->iov_len) @@ -372,7 +372,7 @@ nscd_run (void *p) to 1kb. */ if (req.key_len < 0 || req.key_len > 1024) { - dbg_log (_("key length in request to long: %Zd"), req.key_len); + dbg_log (_("key length in request too long: %Zd"), req.key_len); close (fd); continue; } diff --git a/nscd/nscd.conf b/nscd/nscd.conf index 5e327e86fe..d2b53a7aa3 100644 --- a/nscd/nscd.conf +++ b/nscd/nscd.conf @@ -7,6 +7,7 @@ # # logfile <file> # debug-level <level> +# threads <#threads to use> # # enable-cache <service> <yes|no> # positive-time-to-live <service> <time in seconds> @@ -14,11 +15,12 @@ # suggested-size <service> <prime number> # check-files <service> <yes|no> # -# Currently supported cache names (services): passwd, group +# Currently supported cache names (services): passwd, group, hosts # # logfile /var/adm/nscd.log +# threads 6 debug-level 0 |