Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
	libatalk/util/netatalk_conf.c

diff --cc NEWS
index c3bd7e90fd311f4e6adb92671555a51fc9e6e50f,c867445593a9dcd3e57cd1c3fa270847a73750be..c92c8c6c0ceb1a1ea3b3d7fe21a2dd763e0259a5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,6 +1,17 @@@
 +Changes in 3.1.0
 +================
 +* NEW: AFP Spotlight support with Gnome Tracker
 +* NEW: New option "spotlight" (G/V)
 +* NEW: Configure option --with-tracker-pkgconfig-version
 +* NEW: Configure option --with-tracker-prefix
 +* NEW: If Spotlight is enabled, launch our own dbus instance
 +* NEW: New option "dbus daemon" (G)
 +* UPD: Add configure option --with-afpstats for overriding the
 +       result of autodetecting dbus-glib presence
 +
  Changes in 3.0.5
  ================
+ * FIX: Fix a crash when using pam_winbind. Fixes bug #516.
  
  Changes in 3.0.4
  ================

diff --cc libatalk/util/netatalk_conf.c
index 88bf6aa364921030306eb51a21774b8f93634eb5,fdc80d6333d3c692b7e9adc5034a54e3990ef804..f86eab67cde240ba9ef2ce7c9611ef316471a408
--- 1/libatalk/util/netatalk_conf.c
--- 2/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@@ -1698,15 -1694,9 +1698,15 @@@ int afp_config_parse(AFPObj *AFPObj, ch
      options->configfile  = AFPObj->cmdlineconfigfile ? strdup(AFPObj->cmdlineconfigfile) : strdup(_PATH_CONFDIR "afp.conf");
      options->sigconffile = strdup(_PATH_STATEDIR "afp_signature.conf");
      options->uuidconf    = strdup(_PATH_STATEDIR "afp_voluuid.conf");
 +#ifdef HAVE_TRACKER_SPARQL
 +    options->slmod_path  = strdup(_PATH_AFPDUAMPATH "slmod_sparql.so");
 +#endif
 +#ifdef HAVE_TRACKER_RDF
 +    options->slmod_path  = strdup(_PATH_AFPDUAMPATH "slmod_rdf.so");
 +#endif
      options->flags       = OPTION_UUID | AFPObj->cmdlineflags;
      
-     if ((config = iniparser_load(AFPObj->options.configfile)) == NULL)
+     if ((config = atalk_iniparser_load(AFPObj->options.configfile)) == NULL)
          return -1;
      AFPObj->iniconfig = config;
  
@@@ -1717,27 -1707,25 +1717,27 @@@
      setuplog(options->logconfig, options->logfile);
  
      /* "server options" boolean options */
-     if (!iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1))
+     if (!atalk_iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1))
          options->flags |= OPTION_NOZEROCONF;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "advertise ssh", 0))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "advertise ssh", 0))
          options->flags |= OPTION_ANNOUNCESSH;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "close vol", 0))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "close vol", 0))
          options->flags |= OPTION_CLOSEVOL;
-     if (!iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 0))
+     if (!atalk_iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 0))
          options->flags |= OPTION_SERVERNOTIF;
-     if (!iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1))
+     if (!atalk_iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1))
          options->flags |= OPTION_NOSENDFILE;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "solaris share reservations", 1))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "solaris share reservations", 1))
          options->flags |= OPTION_SHARE_RESERV;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "afpstats", 0))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "afpstats", 0))
          options->flags |= OPTION_DBUS_AFPSTATS;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "afp read locks", 0))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "afp read locks", 0))
          options->flags |= OPTION_AFP_READ_LOCK;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "spotlight", 0))
++    if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "spotlight", 0))
 +        options->flags |= OPTION_SPOTLIGHT_VOL;
-     if (!iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1))
+     if (!atalk_iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1))
          options->passwdbits |= PASSWD_NOSAVE;
-     if (iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0))
+     if (atalk_iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0))
          options->passwdbits |= PASSWD_SET;
  
      /* figure out options w values */