From patchwork Wed Jul 13 06:45:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Guntsche X-Patchwork-Id: 970732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6D6qoam005365 for ; Wed, 13 Jul 2011 06:52:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758688Ab1GMGwh (ORCPT ); Wed, 13 Jul 2011 02:52:37 -0400 Received: from lvps87-230-0-242.dedicated.hosteurope.de ([87.230.0.242]:39413 "EHLO lvps87-230-0-242.dedicated.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758044Ab1GMGwf (ORCPT ); Wed, 13 Jul 2011 02:52:35 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 13 Jul 2011 06:52:50 +0000 (UTC) X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org; Wed, 13 Jul 2011 02:52:35 EDT Received: (qmail 25760 invoked from network); 13 Jul 2011 08:45:53 +0200 Received: from unknown (HELO gibson.comsick.at) (91.119.4.90) by lvps87-230-0-242.dedicated.hosteurope.de with (DHE-RSA-AES128-SHA encrypted) SMTP; 13 Jul 2011 08:45:53 +0200 Date: Wed, 13 Jul 2011 08:45:46 +0200 From: Michael Guntsche To: Steve Dickson Cc: "linux-nfs@vger.kernel.org" Subject: Manpage corrections for nfs-utils 1.2.4 Message-ID: <20110713083828@it-loops.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Good morning, I recently upgraded to 1.2.4 to use the new nfsidmap feature. While following the manpage and the kernel documentation I noticed a --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html difference. Kernel docs mention key TYPE id_resolver while the manpage states nfs_idmap. The following patch changes the manpage to the proper type. Kind regards, Michael Guntsche diff --git a/utils/nfsidmap/nfsidmap.man b/utils/nfsidmap/nfsidmap.man index 6c1a2d4..2381908 100644 --- a/utils/nfsidmap/nfsidmap.man +++ b/utils/nfsidmap/nfsidmap.man @@ -25,9 +25,9 @@ will need to be modified so can properly direct the upcall. The following line should be added before a call to keyctl negate: .PP -create nfs_idmap * * /usr/sbin/nfsidmap %k %d 600 +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 .PP -This will direct all nfs_idmap requests to the program +This will direct all id_resolver requests to the program .I /usr/sbin/nfsidmap The last parameter, 600, defines how many seconds into the future the key will expire. This is an optional parameter for @@ -48,9 +48,9 @@ You can choose to handle any of these individually, rather than using the generic upcall program. If you would like to use your own program for a uid lookup then you would edit your request-key.conf so it looks similar to this: .PP -create nfs_idmap uid:* * /some/other/program %k %d 600 +create id_resolver uid:* * /some/other/program %k %d 600 .br -create nfs_idmap * * /usr/sbin/nfsidmap %k %d 600 +create id_resolver * * /usr/sbin/nfsidmap %k %d 600 .PP Notice that the new line was added above the line for the generic program. request-key will find the first matching line and run the corresponding program.