diff options
| author | Steve French <stevef@smf-t60p.smfdom> | 2008-08-16 14:30:18 -0400 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-08-18 15:08:43 +0200 |
| commit | 723cc4eaf689b4a62f21101d265cbadcebcaf49a (patch) | |
| tree | 40deffedd0ef590e63d15f2b209bd4347397976c | |
| parent | 9bd25250509fb83f014a6d9ad1c5429daf23b047 (diff) | |
| download | samba-723cc4eaf689b4a62f21101d265cbadcebcaf49a.tar.gz samba-723cc4eaf689b4a62f21101d265cbadcebcaf49a.tar.xz samba-723cc4eaf689b4a62f21101d265cbadcebcaf49a.zip | |
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 <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@samba.org>
---
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)
| -rw-r--r-- | docs-xml/manpages-3/cifs.upcall.8.xml | 4 | ||||
| -rw-r--r-- | 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.</para> </varlistentry> <varlistentry> - <term>cifs.resolve</term> + <term>dns_resolver</term> <listitem><para>This key type is for resolving hostnames into IP addresses </para></listitem> </varlistentry> @@ -83,7 +83,7 @@ to be run that way.</para> #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 </programlisting> <para> See <citerefentry><refentrytitle>request-key.conf<manvolnum>5</manvolnum></refentrytitle></citerefentry> 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 |