Merge branch-2-1

diff --cc NEWS
index 3d56a87832eaba3e7328ff6633fcdd9eaed1319d,1b32911b8d35f69df9524c87e2de7c929bedcb8c..00674250acfa2f16ab36f228404bcea34cd2b0f4
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,13 -1,3 +1,12 @@@
- * UPD: Support for BerkeleyDB 5.0.
 +Changes in 2.2
 +==============
 +
 +* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
 +* NEW: afpd: dynamic directoy cache
 +* NEW: afpd: POSIX 1e ACL support
 +* NEW: afpd: automagic Zeroconf registration with avahi, registering both
 +       the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
 +
  Changes in 2.1.3
  ================
  

diff --cc libatalk/dsi/dsi_tcp.c
index 659ea7e561b3050a0dfe99a31f4d1ea0a6eee4f3,74d92de1db91183e245a02ca857af8d7ebd4edb2..ee6d0a92ee59b797239631e301d50068188c201c
--- 1/libatalk/dsi/dsi_tcp.c
--- 2/libatalk/dsi/dsi_tcp.c
+++ b/libatalk/dsi/dsi_tcp.c
@@@ -271,14 -271,14 +271,14 @@@ static void guess_interface(DSI *dsi, c
  
          memset(&dsi->server, 0, sizeof(struct sockaddr_storage));
          sa->sin_family = AF_INET;
 -        sa->sin_port = htons(548);
 +        sa->sin_port = htons(atoi(port));
          sa->sin_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
  
-         LOG(log_info, logtype_default, "dsi_tcp: '%s:%s' on interface '%s' will be used instead.",
 -        LOG(log_info, logtype_dsi, "dsi_tcp: '%s' on interface '%s' will be used instead.",
 -                  getip_string((struct sockaddr *)&dsi->server), ifr.ifr_name);
++        LOG(log_info, logtype_dsi, "dsi_tcp: '%s:%s' on interface '%s' will be used instead.",
 +            getip_string((struct sockaddr *)&dsi->server), port, ifr.ifr_name);
          goto iflist_done;
      }
-     LOG(log_info, logtype_default, "dsi_tcp (Chooser will not select afp/tcp) "
+     LOG(log_info, logtype_dsi, "dsi_tcp (Chooser will not select afp/tcp) "
          "Check to make sure %s is in /etc/hosts and the correct domain is in "
          "/etc/resolv.conf: %s", hostname, strerror(errno));