summaryrefslogtreecommitdiff
path: root/Documentation/networking/dns_resolver.txt
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2012-02-09 10:02:34 +0400
committerJames Morris <jmorris@namei.org>2012-02-09 10:02:34 +0400
commit9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c (patch)
tree2750d9fc94b8fb78d9982ea4a62d586e7f0a7862 /Documentation/networking/dns_resolver.txt
parent2eb6038c51034bf7f9335b15ce9238a028fdd2d6 (diff)
parent4c2c392763a682354fac65b6a569adec4e4b5387 (diff)
downloadlinux-9e3ff38647a316e4f92d59b14c8f0eb13b33bb2c.tar.xz
Merge branch 'next-queue' into next
Diffstat (limited to 'Documentation/networking/dns_resolver.txt')
-rw-r--r--Documentation/networking/dns_resolver.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/networking/dns_resolver.txt b/Documentation/networking/dns_resolver.txt
index 7f531ad83285..d86adcdae420 100644
--- a/Documentation/networking/dns_resolver.txt
+++ b/Documentation/networking/dns_resolver.txt
@@ -102,6 +102,10 @@ implemented in the module can be called after doing:
If _expiry is non-NULL, the expiry time (TTL) of the result will be
returned also.
+The kernel maintains an internal keyring in which it caches looked up keys.
+This can be cleared by any process that has the CAP_SYS_ADMIN capability by
+the use of KEYCTL_KEYRING_CLEAR on the keyring ID.
+
===============================
READING DNS KEYS FROM USERSPACE