Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[linux-2.6] / Documentation / keys.txt

diff --git a/Documentation/keys.txt b/Documentation/keys.txt
index 693ef0c63b9cfc52806457ba8d3df70aeae335eb..947d57d53453be799851155b0231cce1c9593217 100644 (file)
--- a/Documentation/keys.txt
+++ b/Documentation/keys.txt
@@ -304,7 +304,7 @@ about the status of the key service:
        R       Revoked
        D       Dead
        Q       Contributes to user's quota
        R       Revoked
        D       Dead
        Q       Contributes to user's quota

-       U       Under contruction by callback to userspace
+       U       Under construction by callback to userspace

        N       Negative key
 
      This file must be enabled at kernel configuration time as it allows anyone
        N       Negative key
 
      This file must be enabled at kernel configuration time as it allows anyone


@@ -671,7 +671,7 @@ The keyctl syscall functions are:
 
      Note that this setting is inherited across fork/exec.
 
 
      Note that this setting is inherited across fork/exec.
 

-     [1] The default default is: the thread keyring if there is one, otherwise
+     [1] The default is: the thread keyring if there is one, otherwise

      the process keyring if there is one, otherwise the session keyring if
      there is one, otherwise the user default session keyring.
 
      the process keyring if there is one, otherwise the session keyring if
      there is one, otherwise the user default session keyring.
 


@@ -859,6 +859,17 @@ payload contents" for more information.
        void unregister_key_type(struct key_type *type);
 
 
        void unregister_key_type(struct key_type *type);
 
 

+Under some circumstances, it may be desirable to deal with a bundle of keys.
+The facility provides access to the keyring type for managing such a bundle:
+
+       struct key_type key_type_keyring;
+
+This can be used with a function such as request_key() to find a specific
+keyring in a process's keyrings.  A keyring thus found can then be searched
+with keyring_search().  Note that it is not possible to use request_key() to
+search a specific keyring, so using keyrings in this way is of limited utility.
+
+

 ===================================
 NOTES ON ACCESSING PAYLOAD CONTENTS
 ===================================
 ===================================
 NOTES ON ACCESSING PAYLOAD CONTENTS
 ===================================