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

diff --cc include/atalk/globals.h
index a095b103ad484a02f88496ce589156798b705a9c,6f8ff68f7c79f0b10990120380f5abb4738705f3..faadc71333d4ef2fcd5f4d4ec51128859b889743
--- 1/include/atalk/globals.h
--- 2/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@@ -54,9 -54,9 +54,10 @@@
  #define OPTION_UUID          (1 << 7)
  #define OPTION_ACL2MACCESS   (1 << 8)
  #define OPTION_NOZEROCONF    (1 << 9)
 +#define OPTION_ACL2MODE      (1 << 10)
  #define OPTION_SHARE_RESERV  (1 << 11) /* whether to use Solaris fcntl F_SHARE locks */
  #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)

diff --cc libatalk/util/netatalk_conf.c
index fdb0bfc9afb4484cb5dfcb2ea312b802d11562b0,5b1100a3548956583ae6b89da3c181a52ef3082c..ce06b9d8a9fd7e28fd063ca74adda7caf0fce03f
--- 1/libatalk/util/netatalk_conf.c
--- 2/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@@ -1758,19 -1768,8 +1766,20 @@@ int afp_config_parse(AFPObj *AFPObj, ch
      options->fce_fmodwait   = iniparser_getint   (config, INISEC_GLOBAL, "fce holdfmod",   60);
      options->sleep          = iniparser_getint   (config, INISEC_GLOBAL, "sleep time",     10);
      options->disconnected   = iniparser_getint   (config, INISEC_GLOBAL, "disconnect time",24);
+     options->tracker_loglevel = iniparser_getint (config, INISEC_GLOBAL, "tracker loglevel", 1);
  
 +    p = iniparser_getstring(config, INISEC_GLOBAL, "map acls", "rights");
 +    if (STRCMP(p, ==, "rights"))
 +        options->flags |= OPTION_ACL2MACCESS;
 +    else if (STRCMP(p, ==, "mode"))
 +        options->flags |= OPTION_ACL2MODE | OPTION_ACL2MACCESS;
 +    else {
 +        if (STRCMP(p, !=, "none")) {
 +            LOG(log_error, logtype_afpd, "bad ACL mapping option: %s, defaulting to 'rights'", p);
 +            options->flags |= OPTION_ACL2MACCESS;
 +        }
 +    }
 +
      if ((p = iniparser_getstring(config, INISEC_GLOBAL, "hostname", NULL))) {
          EC_NULL_LOG( options->hostname = strdup(p) );
      } else {