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

Conflicts:
	config/Makefile.am
	etc/afpd/afp_dsi.c
	etc/afpd/auth.c
	include/atalk/Makefile.am

diff --cc config/Makefile.am
index d7a0906e02c46e03b3025c19cbfe2059fa2eea67,e72c38f39f3044065f772f7e4c79e7562b1b0cf4..3fd2872c160ffda0b0066e385f006480369852d9
--- 1/config/Makefile.am
--- 2/config/Makefile.am
+++ b/config/Makefile.am
@@@ -3,10 -3,10 +3,10 @@@
  SUBDIRS = pam
  SUFFIXES = .tmpl .
  
 -TMPLFILES = afp.conf.tmpl
 -GENFILES = afp.conf
 +TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
 +GENFILES = afp.conf dbus-session.conf
  CLEANFILES = $(GENFILES)
- EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl
 -EXTRA_DIST = afp.conf.tmpl extmap.conf netatalk-dbus.conf
++EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl netatalk-dbus.conf
  
  OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
  

diff --cc configure.ac
Simple merge

diff --cc etc/afpd/Makefile.am
index 6372f7ea4ddc97dc85d24a33e070902bcdf5eb12,2e242d957ae43463e96bcaf896ecd5fedf609c29..47b8e2760bc39c66d75c6d40f326cde29574dc0c
--- 1/etc/afpd/Makefile.am
--- 2/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@@ -1,9 -1,13 +1,13 @@@
  # Makefile.am for etc/afpd/
  
  pkgconfdir = @PKGCONFDIR@
+ BUILT_SOURCES =
+ EXTRA_DIST =
+ CLEANFILES =
+ DISTCLEANFILES =
  
  sbin_PROGRAMS = afpd
 -noinst_PROGRAMS = hash fce
 +noinst_PROGRAMS = hash fce spot
  
  afpd_SOURCES = \
        afp_avahi.c \

diff --cc etc/afpd/afp_dsi.c
index 7549fbdf9c5d38d5e71bbb552ce089480a72b6ee,5082ee70fea0f83d6d528fcc49a875520376d99c..63d2f286499db68372e57bfa1e285e7fa9273b06
--- 1/etc/afpd/afp_dsi.c
--- 2/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@@ -474,10 -473,8 +474,12 @@@ void afp_over_dsi(AFPObj *obj
      int flag = 1;
      setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag));
  
 +    /* Initialize Spotlight */
 +    if ((obj->options.flags & OPTION_SPOTLIGHT) && (obj->options.slmod_path))
 +        sl_mod_load(obj->options.slmod_path);
 +
+     ipc_child_state(obj, DSI_RUNNING);
+ 
      /* get stuck here until the end */
      while (1) {
          if (sigsetjmp(recon_jmp, 1) != 0)

diff --cc etc/afpd/auth.c
index 7a211bb815a4c1910888c45af60532ebae229a7e,bec624dc6cd32efc72b9838381a5b8f12ad6593b..dcb36a2ce4701f260273cafeab5a859fd9ab664a
--- 1/etc/afpd/auth.c
--- 2/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@@ -39,7 -39,7 +39,8 @@@ extern void afp_get_cmdline( int *ac, c
  #include <atalk/server_ipc.h>
  #include <atalk/uuid.h>
  #include <atalk/globals.h>
 +#include <atalk/spotlight.h>
+ #include <atalk/unix.h>
  
  #include "auth.h"
  #include "uam_auth.h"

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

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

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

diff --cc include/atalk/Makefile.am
index 8c58f0e9d8a35821956981e4bae67426d019c063,42085187de9665cefac9ca580b6c2ce541b59270..2f63e0f676e76edea239c6738f93c6751e3522e4
--- 1/include/atalk/Makefile.am
--- 2/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@@ -40,8 -42,13 +42,17 @@@ noinst_HEADERS = 
        ftw.h \
        dsi.h \
        ldapconfig.h \
 -      fce_api.h
 +      talloc.h \
 +      dalloc.h \
 +      byteorder.h \
 +      fce_api.h \
 +      spotlight.h
+ 
+ EXTRA_DIST = afp_dtrace.d
+ 
+ if WITH_DTRACE
+ BUILT_SOURCES += afp_dtrace.h
+ CLEANFILES += afp_dtrace.h
+ afp_dtrace.h: $(top_srcdir)/include/atalk/afp_dtrace.d
+       $(LIBTOOL) --mode=execute dtrace -o afp_dtrace.h -h -s $(top_srcdir)/include/atalk/afp_dtrace.d
+ endif

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

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

diff --cc libatalk/util/logger.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

diff --cc test/afpd/Makefile.am
Simple merge