From: franklahm <fra...@us...> - 2009-04-30 11:07:06
|
Update of /cvsroot/netatalk/netatalk-docs/manual/man/man5 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32558 Modified Files: Tag: branch-netatalk-2-0 afpd.conf.5.xml Log Message: Consistently set default UAMs to DHX,DHX2. From HAT. Index: afpd.conf.5.xml =================================================================== RCS file: /cvsroot/netatalk/netatalk-docs/manual/man/man5/afpd.conf.5.xml,v retrieving revision 1.17.2.3 retrieving revision 1.17.2.4 diff -C2 -d -r1.17.2.3 -r1.17.2.4 *** afpd.conf.5.xml 23 Apr 2009 08:44:38 -0000 1.17.2.3 --- afpd.conf.5.xml 30 Apr 2009 11:07:00 -0000 1.17.2.4 *************** *** 8,12 **** <manvolnum>5</manvolnum> ! <refmiscinfo class="date">1 Feb 2009</refmiscinfo> <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo> --- 8,12 ---- <manvolnum>5</manvolnum> ! <refmiscinfo class="date">30 Apr 2009</refmiscinfo> <refmiscinfo class="source">:NETATALK_VERSION:</refmiscinfo> *************** *** 97,101 **** <listitem> <para>Comma separated list of UAMs. (The default is ! uams_clrtxt.so,uams_dhx.so).</para> <para>The most commonly used UAMs are:</para> --- 97,101 ---- <listitem> <para>Comma separated list of UAMs. (The default is ! uams_dhx.so,uams_dhx2.so).</para> <para>The most commonly used UAMs are:</para> *************** *** 144,147 **** --- 144,156 ---- <varlistentry> + <term>uams_dhx2.so</term> + + <listitem> + <para>(uams_dhx2_pam.so or uams_dhx2_passwd.so) Allow + Diffie-Hellman eXchange 2 (DHX2) for authentication.</para> + </listitem> + </varlistentry> + + <varlistentry> <term>uam_gss.so</term> *************** *** 654,658 **** <title>afpd.conf default configuration</title> ! <programlisting>- -transall -uamlist uams_clrtxt.so,uams_dhx.so</programlisting> </example> --- 663,667 ---- <title>afpd.conf default configuration</title> ! <programlisting>- -transall -uamlist uams_dhx.so,uams_dhx2.so</programlisting> </example> *************** *** 666,670 **** <title>afpd.conf setup for Kerberos V auth with newline escaping</title> ! <programlisting>- -transall -uamlist uams_clrtxt.so,uams_dhx.so,uams_guest.so,uams_gss.so \ -k5service afpserver -k5keytab /path/to/afpserver.keytab \ -k5realm YOUR.REALM -fqdn your.fqdn.namel:548</programlisting> --- 675,679 ---- <title>afpd.conf setup for Kerberos V auth with newline escaping</title> ! <programlisting>- -transall -uamlist uams_dhx.so,uams_dhx2.so,uams_guest.so,uams_gss.so \ -k5service afpserver -k5keytab /path/to/afpserver.keytab \ -k5realm YOUR.REALM -fqdn your.fqdn.namel:548</programlisting> *************** *** 675,679 **** <programlisting>"Guest Server" -uamlist uams_guest.so -loginmesg "Welcome guest!" ! "User Server" -uamlist uams_dhx.so -port 12000 "special" -notcp -defaultvol <path> -systemvol <path></programlisting> </example> --- 684,688 ---- <programlisting>"Guest Server" -uamlist uams_guest.so -loginmesg "Welcome guest!" ! "User Server" -uamlist uams_dhx2.so -port 12000 "special" -notcp -defaultvol <path> -systemvol <path></programlisting> </example> |