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

Conflicts:
	include/atalk/globals.h

diff --cc etc/afpd/main.c
Simple merge

diff --cc include/atalk/globals.h
index 455a92b5fc95977b39b1a6eefa682810838a8eba,96f062a06aa1600ea939280532c4eeb525b4463c..6f8ff68f7c79f0b10990120380f5abb4738705f3
--- 1/include/atalk/globals.h
--- 2/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@@ -55,7 -55,8 +55,9 @@@
  #define OPTION_ACL2MACCESS   (1 << 8)
  #define OPTION_NOZEROCONF    (1 << 9)
  #define OPTION_SHARE_RESERV  (1 << 11) /* whether to use Solaris fcntl F_SHARE locks */
- #define OPTION_SPOTLIGHT     (1 << 12) /* whether to enable Spotlight support */
+ #define OPTION_DBUS_AFPSTATS (1 << 12) /* whether to run dbus thread for afpstats */
++#define OPTION_SPOTLIGHT     (1 << 13) /* whether to enable Spotlight support */
+ 
  #define PASSWD_NONE     0
  #define PASSWD_SET     (1 << 0)
  #define PASSWD_NOSAVE  (1 << 1)

diff --cc libatalk/util/netatalk_conf.c
index e56701ad18c3eed122c87e7aacdb15ffd3721756,fdc7e556b2a646b95b1e51908b3465a0c2618646..53c29e2814fc7113572d9ff8ca5aecd73a5f2439
--- 1/libatalk/util/netatalk_conf.c
--- 2/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@@ -1725,10 -1719,10 +1725,12 @@@ int afp_config_parse(AFPObj *AFPObj, ch
          options->flags |= OPTION_NOSENDFILE;
      if (iniparser_getboolean(config, INISEC_GLOBAL, "solaris share reservations", 1))
          options->flags |= OPTION_SHARE_RESERV;
+     if (iniparser_getboolean(config, INISEC_GLOBAL, "afpstats", 0))
+         options->flags |= OPTION_DBUS_AFPSTATS;
      if (iniparser_getboolean(config, INISEC_GLOBAL, "afp read locks", 0))
          options->flags |= OPTION_AFP_READ_LOCK;
 +    if (iniparser_getboolean(config, INISEC_GLOBAL, "spotlight", 0))
 +        options->flags |= OPTION_SPOTLIGHT;
      if (!iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1))
          options->passwdbits |= PASSWD_NOSAVE;
      if (iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0))

diff --cc macros/netatalk.m4
Simple merge