The branch, v3-3-test has been updated via 24a93d03c2ca4e718968e2024604e0f398c96659 (commit) from 92fad0fc537e75c726d5d6794dd0c4fd61edca2d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log ----------------------------------------------------------------- commit 24a93d03c2ca4e718968e2024604e0f398c96659 Author: Steve French <[EMAIL PROTECTED]> Date: Tue Aug 5 13:27:07 2008 -0500 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 <[EMAIL PROTECTED]> Signed-off-by: Steve French <[EMAIL PROTECTED]> --- docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++-- source/client/cifs.upcall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++-- source/client/cifs.upcall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml index 8df776b..3c1bb24 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 70dae1a..d6c1ddc 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 -- Samba Shared Repository