From 723cc4eaf689b4a62f21101d265cbadcebcaf49a Mon Sep 17 00:00:00 2001 From: Steve French Date: Sat, 16 Aug 2008 14:30:18 -0400 Subject: cifs.upcall: fix manpage and comments The "cifs.resolver" key type has been changed to "dns_resolver". Fix the comments at the top of cifs.upcall and the manpage accordingly. Signed-off-by: Jeff Layton Signed-off-by: Steve French --- docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++-- source/client/cifs.upcall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (cherry picked from commit 34cf3c012e463d0ea04616308738aadea438f48b) --- docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++-- source/client/cifs.upcall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml index 8df776bbd4a..3c1bb247fa3 100644 --- a/docs-xml/manpages-3/cifs.upcall.8.xml +++ b/docs-xml/manpages-3/cifs.upcall.8.xml @@ -72,7 +72,7 @@ to be run that way. - cifs.resolve + dns_resolver This key type is for resolving hostnames into IP addresses @@ -83,7 +83,7 @@ to be run that way. #OPERATION TYPE D C PROGRAM ARG1 ARG2... #========= ============= = = ========================================== create cifs.spnego * * /usr/local/sbin/cifs.upcall -c %k -create cifs.resolver * * /usr/local/sbin/cifs.upcall %k +create dns_resolver * * /usr/local/sbin/cifs.upcall %k See request-key.conf5 for more info on each field. diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c index 70dae1a4123..d6c1ddcc0e8 100644 --- a/source/client/cifs.upcall.c +++ b/source/client/cifs.upcall.c @@ -5,11 +5,11 @@ * Used by /sbin/request-key for handling * cifs upcall for kerberos authorization of access to share and * cifs upcall for DFS srver name resolving (IPv4/IPv6 aware). -* You should have keyutils installed and add following line to -* /etc/request-key.conf file +* You should have keyutils installed and add something like the +* following lines to /etc/request-key.conf file: -create cifs.spnego * * /usr/local/sbin/cifs.upcall [-v][-c] %k -create cifs.resolver * * /usr/local/sbin/cifs.upcall [-v] %k +create cifs.spnego * * /usr/local/sbin/cifs.upcall %k +create dns_resolver * * /usr/local/sbin/cifs.upcall %k * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -- cgit