summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/dns_resolver.txt
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-03-28 06:53:10 +0200
committerPaul Mundt <lethal@linux-sh.org>2012-03-28 06:53:10 +0200
commit18af30e259c25a64ad69bb749c661564bc886275 (patch)
tree996c89594fd20f25fcc15b5843625d99473f6982 /Documentation/networking/dns_resolver.txt
parentarch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and fr... (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff)
downloadlinux-18af30e259c25a64ad69bb749c661564bc886275.tar.xz
linux-18af30e259c25a64ad69bb749c661564bc886275.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
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