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

diff --git a/NEWS b/NEWS
index fcec63817fe549fb4895f7babcd11753a8969525..a3ae506beadbddc7b5f118a83b247802f3d03bf4 100644 (file)
--- 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 ad66d36a0ca32a88f7e0468c171f9bae531961ab..4b92f18f6f96dfbc2b7957211686ba241ab46e87 100644 (file)
--- 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 790ee2fffbf9e7b0e0c9afa98ae2de32444fb544..7f5fd1f1fc9e32d10f3adc16c85da1cfdfdae4b6 100644 (file)
--- 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;
 }