Merge remote-tracking branch 'origin/develop' into spotlight

diff --combined etc/afpd/main.c
index 516adf16c6f19d43941b9bf37071594fe2f219f0,cd65f7a9003358971df2d7c6566c0892519f28f7..ac1ce217b31904593f30b0ce4aa5d57617df323a
--- 1/etc/afpd/main.c
--- 2/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@@ -312,6 -312,11 +312,11 @@@ int main(int ac, char **av
      sigaddset(&sigs, SIGCHLD);
  
      pthread_sigmask(SIG_BLOCK, &sigs, NULL);
+ #ifdef HAVE_DBUS_GLIB
+     /* Run dbus AFP statics thread */
+     if (obj.options.flags & OPTION_DBUS_AFPSTATS)
+         (void)afpstats_init(server_children);
+ #endif
      if (configinit(&obj) != 0) {
          LOG(log_error, logtype_afpd, "main: no servers configured");
          afp_exit(EXITERR_CONF);
@@@ -320,19 -325,13 +325,13 @@@
  
      /* Initialize */
      cnid_init();
 -    
 +
      /* watch atp, dsi sockets and ipc parent/child file descriptor. */
      fd_set_listening_sockets(&obj);
  
      /* set limits */
      (void)setlimits();
  
- #ifdef HAVE_DBUS_GLIB
-     /* Run dbus AFP statics thread */
-     if (obj.options.flags & OPTION_DBUS_AFPSTATS)
-         (void)afpstats_init(server_children);
- #endif
- 
      afp_child_t *child;
      int recon_ipc_fd;
      pid_t pid;