public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Steve Dickson <steved@redhat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 2/2] idmapper.txt: Fix the upcall binary name.
Date: Thu, 10 Nov 2011 15:26:03 -0500	[thread overview]
Message-ID: <1320956763-17935-3-git-send-email-steved@redhat.com> (raw)
In-Reply-To: <1320956763-17935-1-git-send-email-steved@redhat.com>

The binary that handles the upcalls from is kernel is called
nfsidmap not nfs.idmap.

Signed-off-by: Steve Dickson <steved@redhat.com>
---
 Documentation/filesystems/nfs/idmapper.txt |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt
index 120fd3c..9c1925a 100644
--- a/Documentation/filesystems/nfs/idmapper.txt
+++ b/Documentation/filesystems/nfs/idmapper.txt
@@ -6,7 +6,7 @@ Id mapper is used by NFS to translate user and group ids into names, and to
 translate user and group names into ids.  Part of this translation involves
 performing an upcall to userspace to request the information.  Id mapper will
 user request-key to perform this upcall and cache the result.  The program
-/usr/sbin/nfs.idmap should be called by request-key, and will perform the
+/usr/sbin/nfsidmap should be called by request-key, and will perform the
 translation and initialize a key with the resulting information.
 
  NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
@@ -20,12 +20,12 @@ direct the upcall.  The following line should be added:
 
 #OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
 #======	=======	===============	===============	===============================
-create	id_resolver	*	*		/usr/sbin/nfs.idmap %k %d 600
+create	id_resolver	*	*		/usr/sbin/nfsidmap %k %d 600
 
-This will direct all id_resolver requests to the program /usr/sbin/nfs.idmap.
+This will direct all id_resolver requests to the program /usr/sbin/nfsidmap.
 The last parameter, 600, defines how many seconds into the future the key will
-expire.  This parameter is optional for /usr/sbin/nfs.idmap.  When the timeout
-is not specified, nfs.idmap will default to 600 seconds.
+expire.  This parameter is optional for /usr/sbin/nfsidmap.  When the timeout
+is not specified, nfsidmap will default to 600 seconds.
 
 id mapper uses for key descriptions:
 	  uid:  Find the UID for the given user
@@ -40,28 +40,28 @@ would edit your request-key.conf so it look similar to this:
 #OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
 #======	=======	===============	===============	===============================
 create	id_resolver	uid:*	*		/some/other/program %k %d 600
-create	id_resolver	*	*		/usr/sbin/nfs.idmap %k %d 600
+create	id_resolver	*	*		/usr/sbin/nfsidmap %k %d 600
 
 Notice that the new line was added above the line for the generic program.
 request-key will find the first matching line and corresponding program.  In
 this case, /some/other/program will handle all uid lookups and
-/usr/sbin/nfs.idmap will handle gid, user, and group lookups.
+/usr/sbin/nfsidmap will handle gid, user, and group lookups.
 
 See <file:Documentation/security/keys-request-key.txt> for more information
 about the request-key function.
 
 
 =========
-nfs.idmap
+nfsidmap
 =========
-nfs.idmap is designed to be called by request-key, and should not be run "by
+nfsidmap is designed to be called by request-key, and should not be run "by
 hand".  This program takes two arguments, a serialized key and a key
 description.  The serialized key is first converted into a key_serial_t, and
 then passed as an argument to keyctl_instantiate (both are part of keyutils.h).
 
-The actual lookups are performed by functions found in nfsidmap.h.  nfs.idmap
+The actual lookups are performed by functions found in nfsidmap.h.  nfsidmap
 determines the correct function to call by looking at the first part of the
 description string.  For example, a uid lookup description will appear as
 "uid:user@domain".
 
-nfs.idmap will return 0 if the key was instantiated, and non-zero otherwise.
+nfsidmap will return 0 if the key was instantiated, and non-zero otherwise.
-- 
1.7.6.4


  parent reply	other threads:[~2011-11-10 20:26 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-10 20:26 [PATCH 0/2] Enable the in-kernel id mapping to be on by default Steve Dickson
2011-11-10 20:26 ` [PATCH 1/2] Enable the in-kernel ID mapping upcall mechanism Steve Dickson
2011-11-10 20:26 ` Steve Dickson [this message]
2011-11-10 20:42   ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Bryan Schumaker
2011-11-10 20:52 ` [PATCH 0/2] Enable the in-kernel id mapping to be on by default Trond Myklebust
2011-11-10 21:32   ` Steve Dickson
  -- strict thread matches above, loose matches on Subject: below --
2011-11-12 15:53 [PATCH 0/2] Enable the in-kernel id mapping to be on by default (ver #2) Steve Dickson
2011-11-12 15:53 ` [PATCH 2/2] idmapper.txt: Fix the upcall binary name Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320956763-17935-3-git-send-email-steved@redhat.com \
    --to=steved@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox