X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Documentation%2Fkeys.txt;h=3da586bc7859a3f982255547472fcfd5193eaf6a;hb=c92fd49c547c607e23b2687f0f65f762b7210035;hp=e373f02128434277bc53098185b393df0a7c36d5;hpb=0d1782144e81faf6203075c5fcd0a2f0db91af5b;p=linux-2.6 diff --git a/Documentation/keys.txt b/Documentation/keys.txt index e373f02128..3da586bc78 100644 --- a/Documentation/keys.txt +++ b/Documentation/keys.txt @@ -671,7 +671,7 @@ The keyctl syscall functions are: 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. @@ -708,14 +708,14 @@ The keyctl syscall functions are: If the specified key is 0, then any assumed authority will be divested. - The assumed authorititive key is inherited across fork and exec. + The assumed authoritative key is inherited across fork and exec. =============== KERNEL SERVICES =============== -The kernel services for key managment are fairly simple to deal with. They can +The kernel services for key management are fairly simple to deal with. They can be broken down into two areas: keys and key types. Dealing with keys is fairly straightforward. Firstly, the kernel service