Disable DDP, atalk and papd by default. From HAT

diff --git a/NEWS b/NEWS
index cda4e302a765c0677354d91e3d89cf8eda9bdc7e..f4c61c46aa715f61367fa0e197e625d34276c870 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ REMEMBER TO UPDATE the Changes in 2.0.x section !!!
 
 Changes in 2.1
 ==============
+* UPD: atalkd and papd are now disabled by default.
+       AppleTalk is legacy.
 * UPD: cdb/dbd CNID backend requires BerkeleyDB >= 4.6
 * FIX: rewritten logger
 * NEW: cnid_metad: options -l and -f to configure logging

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index d3d380cfe625888b3686760981e8ab2c1ca89836..2680b24c94402b712b153a03e89b8aab9a9f21e5 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -12,12 +12,12 @@
 #
 # The following options are available:
 #   Transport Protocols:
-#     -[no]tcp       Make AFP-over-TCP [not] available
-#     -[no]ddp       Make AFP over AppleTalk [not] available. if you
-#                    have -proxy specified, specify -uamlist "" to 
+#     -[no]tcp       Make "AFP over TCP" [not] available
+#     -[no]ddp       Make "AFP over AppleTalk" [not] available.
+#                    If you have -proxy specified, specify -uamlist "" to 
 #                    prevent ddp connections from working.
 #
-#     -transall      Make both available (default)
+#     -transall      Make both available
 #
 #   Transport Options:
 #     -ipaddr <w.x.y.z>   Specifies the IP address the server should respond
@@ -223,5 +223,6 @@
 #              "User Volume" -uamlist uams_clrtxt.so -port 12000
 #              "special" -notcp -defaultvol <path> -systemvol <path>
 #
+
 # default:
-# - -transall -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword
+# - -tcp -noddp -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 194cd3763fcce3ba8a9e1aca45f4a42f49f133b0..ea893433b50e507e313c0eb402afb473659b24bc 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -20,15 +20,19 @@ ATALK_UNIX_CHARSET='LOCALE'
 # Change this to set the id of the guest user
 AFPD_GUEST=nobody
 
-# Set which daemons to run (papd is dependent upon atalkd):
+# Set which daemons to run.
+# If you need legacy AppleTalk, run atalkd.
+# papd, timelord and a2boot are dependent upon atalkd.
+# If you use "AFP over TCP" server only, run only cnid_metad and afpd.
 ATALKD_RUN=no
-PAPD_RUN=NO
-CNID_METAD_RUN=yes
-AFPD_RUN=yes
+PAPD_RUN=no
 TIMELORD_RUN=no
 A2BOOT_RUN=no
+CNID_METAD_RUN=yes
+AFPD_RUN=yes
 
-# Control whether the daemons are started in the background
+# Control whether the daemons are started in the background.
+# If it is dissatisfied that atalkd starts slowly, set "yes".
 ATALK_BGROUND=no
 
 # export the charsets, read form ENV by apps

diff --git a/doc/DEVELOPER b/doc/DEVELOPER
index 888606af579e9746342f7a88338e8444c6f3da09..39eecd248a42ba5fea316b2ec44eb1b2c1168622 100644 (file)
--- a/doc/DEVELOPER
+++ b/doc/DEVELOPER
@@ -3,10 +3,11 @@ Information for Netatalk Developers
 
 For basic installation instructions, see the INSTALL file.
 
-Netatalk is an implementation of the AppleTalk Protocol Suite and
-the Apple Filing Protocol (AFP).  The current release contains support
-for EtherTalk Phase I and II, DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP
-and AFP.  The complete stack looks like this on a BSD-derived system:
+Netatalk is an implementation of "AFP over TCP".
+Netatalk also support the AppleTalk Protocol Suite for legacy Macs.
+The current release contains support for EtherTalk Phase I and II, 
+DDP, RTMP, NBP, ZIP, AEP, ATP, PAP, ASP, AFP and DSI.
+The complete stack looks like this on a BSD-derived system:
 
     AFP                          AFP
      |                            |
@@ -24,6 +25,7 @@ and AFP.  The complete stack looks like this on a BSD-derived system:
     |                Network-Interface                  |
     +---------------------------------------------------+
 
+DSI is a session layer used to carry AFP over TCP.
 DDP is in the kernel.  "atalkd" implements RTMP, NBP, ZIP, and AEP.  It
 is the AppleTalk equivalent of Unix "routed".  There is also a
 client-stub library for NBP.  ATP and ASP are implemented as
@@ -154,4 +156,4 @@ scalable, and mission-critical database support to software
 developers. BDB can downloaded from
 http://www.oracle.com/database/berkeley-db/index.html
 Netatalk's CNID database uses the library and header files from BDB.
-Currently, Netatalk supports BDB 4.4 and later.
+Currently, Netatalk supports BDB 4.6 and later.

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 2a73678566e8683fc7434ed671ca6b5cc8f86354..c078108c7bdd826df3f30afc7c7c23096c5233bb 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.44 2009-07-21 13:41:16 didg Exp $
+ * $Id: afp_options.c,v 1.45 2009-09-04 15:27:21 franklahm Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -167,7 +167,7 @@ void afp_options_init(struct afp_options *options)
     options->uamlist = "uams_dhx.so,uams_dhx2.so";
     options->guest = "nobody";
     options->loginmesg = "";
-    options->transports = AFPTRANS_ALL;
+    options->transports = AFPTRANS_TCP; /*  TCP only */
     options->passwdfile = _PATH_AFPDPWFILE;
     options->tickleval = 30;
     options->timeout = 4;