[Netatalk-cvs] netatalk/man/man5 afpd.conf.5.tmpl, 1.3.8.10.2.4, 1.3.8.10.2.5

[franklahm <fra...@us...>]

Update of /cvsroot/netatalk/netatalk/man/man5
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12271/man/man5

Modified Files:
      Tag: branch-netatalk-2-0
	afpd.conf.5.tmpl 
Log Message:
Consistently set default UAMs to DHX,DHX2. From HAT.

Index: afpd.conf.5.tmpl
===================================================================
RCS file: /cvsroot/netatalk/netatalk/man/man5/afpd.conf.5.tmpl,v
retrieving revision 1.3.8.10.2.4
retrieving revision 1.3.8.10.2.5
diff -C2 -d -r1.3.8.10.2.4 -r1.3.8.10.2.5
*** afpd.conf.5.tmpl	24 Apr 2009 14:19:56 -0000	1.3.8.10.2.4
--- afpd.conf.5.tmpl	30 Apr 2009 09:35:06 -0000	1.3.8.10.2.5
***************
*** 80,84 ****
  \-uamlist \fI[uams list]\fR
  .RS 4
! Comma separated list of UAMs\&. (The default is uams_clrtxt\&.so,uams_dhx\&.so)\&.
  .sp
  The most commonly used UAMs are:
--- 80,84 ----
  \-uamlist \fI[uams list]\fR
  .RS 4
! Comma separated list of UAMs\&. (The default is uams_dhx\&.so,uams_dhx2\&.so)\&.
  .sp
  The most commonly used UAMs are:
***************
*** 107,110 ****
--- 107,115 ----
  .RE
  .PP
+ uams_dhx2\&.so
+ .RS 4
+ (uams_dhx2_pam\&.so or uams_dhx2_passwd\&.so) Allow Diffie\-Hellman eXchange 2 (DHX2) for authentication\&.
+ .RE
+ .PP
  uam_gss\&.so
  .RS 4
***************
*** 440,444 ****
  .\}
  .nf
! \- \-transall \-uamlist uams_clrtxt\&.so,uams_dhx\&.so
  .fi
  .if n \{\
--- 445,449 ----
  .\}
  .nf
! \- \-transall \-uamlist uams_dhx\&.so,uams_dhx2\&.so
  .fi
  .if n \{\
***************
*** 464,468 ****
  .\}
  .nf
! \- \-transall \-uamlist uams_clrtxt\&.so,uams_dhx\&.so,uams_guest\&.so,uams_gss\&.so \e 
  \-k5service afpserver \-k5keytab /path/to/afpserver\&.keytab \e 
  \-k5realm YOUR\&.REALM \-fqdn your\&.fqdn\&.namel:548
--- 469,473 ----
  .\}
  .nf
! \- \-transall \-uamlist uams_clrtxt\&.so,uams_dhx\&.so,uams_dhx2\&.so,uams_guest\&.so,uams_gss\&.so \e 
  \-k5service afpserver \-k5keytab /path/to/afpserver\&.keytab \e 
  \-k5realm YOUR\&.REALM \-fqdn your\&.fqdn\&.namel:548
***************
*** 479,483 ****
  .nf
  "Guest Server" \-uamlist uams_guest\&.so \-loginmesg "Welcome guest!"
! "User Server" \-uamlist uams_dhx\&.so \-port 12000
  "special" \-notcp \-defaultvol <path> \-systemvol <path>
  .fi
--- 484,488 ----
  .nf
  "Guest Server" \-uamlist uams_guest\&.so \-loginmesg "Welcome guest!"
! "User Server" \-uamlist uams_dhx2\&.so \-port 12000
  "special" \-notcp \-defaultvol <path> \-systemvol <path>
  .fi