From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 4 Apr 2011 05:12:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44471507ef33fba7b5e278b04fb28b8b710424e9;hp=923005213b0684a164ed506bfff081990690c85c;p=netatalk.git

Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
---

diff --git a/NEWS b/NEWS
index fcec6381..a3ae506b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
 Changes in 2.2beta4
 ===================
 
-* NEW: afpd: new afpd.conf optinos "tcprcvbuf" and "tcpsndbuf" to customize
+* NEW: afpd: new afpd.conf options "tcprcvbuf" and "tcpsndbuf" to customize
        the corresponding TCP socket options.
+* NEW: afpd: new afpd.conf option "nozeroconf" which disabled automatic
+       Zeroconf service registration.
 * FIX: afpd: generate mersenne primes for DHX2 UAM once at startup,
        not for every login
+* FIX: afpd: DSI streaming deadlock
+* FIX: afpd: extended sleep
+* FIX: afpd: directory cache
 * FIX: Support for platforms that do not have the *at functions
 * UPD: afpd: put POSIX write lock on volume files while reading them
 
diff --git a/VERSION b/VERSION
index ad66d36a..4b92f18f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2beta4-dev
\ No newline at end of file
+2.2-beta4
\ No newline at end of file
diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index 790ee2ff..7f5fd1f1 100644
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -591,8 +591,10 @@ AFPConfig *configinit(struct afp_options *cmdline)
         first = AFPConfigInit(cmdline, cmdline);
 
     /* Now register with zeroconf, we also need the volumes for that */
-    load_volumes(&first->obj);
-    zeroconf_register(first);
+    if (! (first->obj.options.flags & OPTION_NOZEROCONF)) {
+        load_volumes(&first->obj);
+        zeroconf_register(first);
+    }
 
     return first;
 }