Changeset 369

Timestamp:

Jan 15, 2010, 8:22:29 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (docs-xml)

Location:

branches/samba-3.3.x/docs-xml/manpages-3

Files:

• cifs.upcall.8.xml (modified) (3 diffs)
• mount.cifs.8.xml (modified) (1 diff)

branches/samba-3.3.x/docs-xml/manpages-3/cifs.upcall.8.xml

@@ -20 +20 @@
         <cmdsynopsis>
                 <command>cifs.upcall</command>
-                <arg choice="opt">-c</arg>
-                <arg choice="opt">-v</arg>
+                <arg choice="opt">--trust-dns|-t</arg>
+                <arg choice="opt">--version|-v</arg>
                 <arg choice="req">keyid</arg>
         </cmdsynopsis>
@@ -49 +49 @@
                 <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>
-
                 <varlistentry>
-                <term>-v</term>
+                <term>--trust-dns|-t</term>
+                <listitem><para>With krb5 upcalls, the name used as the host portion of the service principal defaults to the hostname portion of the UNC. This option allows the upcall program to reverse resolve the network address of the server in order to get the hostname.</para>
+                <para>This is less secure than not trusting DNS. When using this option, it's possible that an attacker could get control of DNS and trick the client into mounting a different server altogether. It's preferable to instead add server principals to the KDC for every possible hostname, but this option exists for cases where that isn't possible. The default is to not trust reverse hostname lookups in this fashion.
+                </para></listitem>
+                </varlistentry>
+                <varlistentry>
+                <term>--version|-v</term>
                 <listitem><para>Print version number and exit.
                 </para></listitem>
@@ -86 +91 @@
 <programlisting>
 #OPERATION  TYPE           D C PROGRAM ARG1 ARG2...
-#=========  =============  = = ==========================================
-create      cifs.spnego    * * /usr/local/sbin/cifs.upcall -c %k
+#=========  =============  = = ================================
+create      cifs.spnego    * * /usr/local/sbin/cifs.upcall %k
 create      dns_resolver   * * /usr/local/sbin/cifs.upcall %k
 </programlisting>

branches/samba-3.3.x/docs-xml/manpages-3/mount.cifs.8.xml

@@ -117 +117 @@
                 username=<replaceable>value</replaceable>
                 password=<replaceable>value</replaceable>
-                workgroup=<replaceable>value</replaceable>
+                domain=<replaceable>value</replaceable>
 </programlisting>