Merge branch 'develop' into spotlight

Conflicts:
	VERSION
	configure.ac

diff --cc VERSION
index e75d958ee0bda16f7d0dc84f95e7b8549669647b,226bf92485b4048556d26f4cec9276e56629434c..2f3822079b4b4ba7a44071d779d45dce8726382e
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
- stp3
 -3.0.3dev
++stp4dev

diff --cc configure.ac
index b148d4fa9021bf93de31ffe20fd55a8c21412177,3c8843d15bea9f3336cdfec0c42f6745b3ca0284..0b5a752e520d84f1da9133964c9e0816b17cec47
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -182,9 -180,9 +182,12 @@@ AC_NETATALK_SENDFIL
  dnl Check whether bundled libevent shall not be used
  AC_NETATALK_LIBEVENT
  
 +dnl Check for Tracker
 +AC_NETATALK_SPOTLIGHT
 +
+ dnl libatalk API checks
+ AC_DEVELOPER
+ 
  dnl FHS stuff has to be done last because it overrides other defaults
  AC_NETATALK_FHS
  

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

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

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

diff --cc etc/afpd/main.c
index 3e991c28e30cb4c8ca77e1f49a82433d84ac5754,a66e4a86f47dae01bd3a23d6a05a5db8bbc2b07e..268643c0c73d0a233102841974ba62b81f619020
--- 1/etc/afpd/main.c
--- 2/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@@ -348,14 -319,8 +319,8 @@@ int main(int ac, char **av
  
      /* Initialize */
      cnid_init();
 -    
 +
      /* watch atp, dsi sockets and ipc parent/child file descriptor. */
- 
-     if (obj.options.flags & OPTION_KEEPSESSIONS) {
-         LOG(log_note, logtype_afpd, "Activating continous service");
-         disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
-     }
- 
      fd_set_listening_sockets(&obj);
  
      /* set limits */

diff --cc etc/netatalk/netatalk.c
Simple merge

diff --cc include/atalk/dsi.h
Simple merge

diff --cc include/atalk/globals.h
index aadbb13ae40d0dbdbe0fbc9850579ee2460d02c9,925f4560c5991dab6e5d0d8d77aa74c67dd799c1..3fb8e4f65c4819f79527e85be836d9abda17f29c
--- 1/include/atalk/globals.h
--- 2/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@@ -41,9 -41,8 +41,8 @@@
  #define OPTION_UUID          (1 << 7)
  #define OPTION_ACL2MACCESS   (1 << 8)
  #define OPTION_NOZEROCONF    (1 << 9)
- #define OPTION_KEEPSESSIONS  (1 << 10) /* preserve sessions across master afpd restart with SIGQUIT */
  #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 PASSWD_NONE     0
  #define PASSWD_SET     (1 << 0)
  #define PASSWD_NOSAVE  (1 << 1)

diff --cc include/atalk/util.h
Simple merge

diff --cc libatalk/Makefile.am
index 15324ac190b6efe56a8ef0d949997daf3250a106,732aeea89267b8706bc8175d5066837068c07de8..4ad799bf7ba38164462b2f4a9bec31e82e84525c
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -29,9 -29,9 +29,9 @@@ VERSION_INFO = 3:0:
  #   3.0.0-beta2     1:0:0
  #   3.0             1:0:0
  #   3.0.1           2:0:0
- #   3.0.2           3:0:1
+ #   3.0.2           3:0:0
  
 -SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
 +SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
  
  lib_LTLIBRARIES = libatalk.la
  

diff --cc libatalk/unicode/charcnv.c
Simple merge

diff --cc libatalk/util/netatalk_conf.c
Simple merge

diff --cc macros/netatalk.m4
Simple merge

diff --cc macros/summary.m4
Simple merge