Rev version to 2.0.5rc3

[netatalk.git] / config / afpd.conf.tmpl

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 47d4b03a5e501faab629fe78526cd2cb202064c4..983f7c4aa15a9324f7e439c3c116ddda6ee89131 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -57,7 +57,7 @@
 #     -uampath <path>  Use this path to look for User Authentication Modules.
 #                     (default: :UAMS_PATH:)
 #     -uamlist <a,b,c> Comma-separated list of UAMs. (default:
-#                     uams_guest.so,uams_clrtxt.so,uams_dhx.so) 
+#                     uams_dhx.so,uams_dhx2.so) 
 #
 #                     some commonly available UAMs:
 #                      uams_guest.so: Allow guest logins
@@ -74,6 +74,10 @@
 #                                  Allow Diffie-Hellman eXchange
 #                                  (DHX) for authentication.
 #
+#                     uams_dhx2.so: (uams_dhx2_pam.so or uams_dhx2_passwd.so)
+#                                   Allow Diffie-Hellman eXchange 2
+#                                   (DHX2) for authentication.
+#
 #   Password Options:
 #     -[no]savepassword   [Don't] Allow clients to save password locally
 #     -passwdfile <path>  Use this path to store Randnum
@@ -98,8 +102,6 @@
 #                         (same as -u on command line)
 #     -[no]uservol        [Don't] Read the user's volume file
 #
-#     -nlspath <path>     Prepend this path to each code page filename
-#                         in volume options (default: :NLS_PATH:).
 #
 #   Miscellaneous:
 #     -authprintdir <path> Specifies the path to be used (per server) to 
@@ -173,6 +175,22 @@
 #     -k5service <service>
 #     -k5realm <realm>
 #               These are required if the server supports Kerberos 5 authentication
+#
+#   Codepage Options:
+#      -unixcodepage <CODEPAGE>     Specifies the servers unix codepage, e.g. "ISO-8859-15" or "UTF8".
+#                                  This is used to convert strings to/from the systems locale, e.g.
+#                                   for authenthication. Defaults to LOCALE if your system supports it, 
+#                                   otherwise ASCII will be used.
+#
+#      -maccodepage <CODEPAGE>      Specifies the mac clients codepage, e.g. "MAC_ROMAN".
+#                                  This is used to convert strings to the systems locale, e.g. 
+#                                   for authenthication and SIGUSR2 messaging. This will also be
+#                                   the default for volumes maccharset.
+#
+#   CNID related options:
+#      -cnidserver ipaddress:port   Specifies the IP address and port of a cnid_metad server.
+#
+
  
 #              
 # Some examples:
@@ -194,4 +212,4 @@
 #              "special" -notcp -defaultvol <path> -systemvol <path>
 #
 # default:
-# - -transall -uamlist uams_clrtxt.so,uams_dhx.so -nosavepassword
+# - -transall -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword