cifs.upcall: try getting a "cifs/" principal and fall back to "host/"

[sfrench/samba-autobuild/.git] / docs-xml / manpages-3 / cifs.upcall.8.xml

diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
index 8df776bbd4a6043f00f8129ab91d5346f69283b2..427bb44479e885968bd8298b3a7cb5026ca7f51d 100644 (file)
--- a/docs-xml/manpages-3/cifs.upcall.8.xml
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -8,7 +8,7 @@
         <manvolnum>8</manvolnum>
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-        <refmiscinfo class="version">3.2</refmiscinfo>
+        <refmiscinfo class="version">3.5</refmiscinfo>
 </refmeta>
 
 <refnamediv>
@@ -48,7 +48,7 @@ to be run that way.</para>
        <variablelist>
                <varlistentry>
                <term>-c</term>
-               <listitem><para>When handling a kerberos upcall, use a service principal that starts with "cifs/". The default is to use the "host/" service principal.
+               <listitem><para>This option is deprecated and is currently ignored.
                </para></listitem>
                </varlistentry>
 
@@ -62,7 +62,11 @@ to be run that way.</para>
 
 <refsect1>
        <title>CONFIGURATION FOR KEYCTL</title>
-       <para>cifs.upcall is designed to be called from the kernel via the request-key callout program. This requres that request-key be told where and how to call this program. The current cifs.upcall program handles two different key types:</para>
+       <para>cifs.upcall is designed to be called from the kernel via the
+       request-key callout program. This requires that request-key be told
+       where and how to call this program. The current cifs.upcall program
+       handles two different key types:
+       </para>
 
        <variablelist>
                <varlistentry>
@@ -72,7 +76,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>
@@ -82,8 +86,8 @@ to be run that way.</para>
 <programlisting>
 #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      cifs.spnego    * * /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.