From: Ralph Boehme Date: Mon, 4 Mar 2013 20:50:58 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/develop' into spotlight X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=commitdiff_plain;h=42eb54de3f6373cd394fbd6abfb86d85c8dde935 Merge remote-tracking branch 'origin/develop' into spotlight Conflicts: include/atalk/globals.h --- 42eb54de3f6373cd394fbd6abfb86d85c8dde935 diff --cc include/atalk/globals.h index 455a92b5,96f062a0..6f8ff68f --- a/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 e56701ad,fdc7e556..53c29e28 --- a/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))