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

Conflicts:
	etc/netatalk/netatalk.c

diff --cc bin/ad/ad_cp.c
Simple merge

diff --cc bin/ad/ad_mv.c
Simple merge

diff --cc configure.ac
Simple merge

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

diff --cc etc/afpd/file.c
index 0ff57995f96b861a2f19dc71239b08b696efd49d,f62e05eeb7f52bd6cc5b10e787559aedf8e152e1..265d6356c248be73bdff5a8261fae67d5fe84b6a
--- 1/etc/afpd/file.c
--- 2/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@@ -749,10 -750,9 +751,9 @@@ createfile_iderr
      ad_flush(&ad);
      ad_close(&ad, ADFLAGS_DF|ADFLAGS_HF );
      fce_register(FCE_FILE_CREATE, fullpathname(upath), NULL, fce_file);
 +    sl_index_file(path);
  
- createfile_done:
      curdir->d_offcnt++;
 -
      setvoltime(obj, vol );
  
      return (retvalue);

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

diff --cc etc/netatalk/netatalk.c
index e2235a85ba649a5449ac9b648b0a94dfdf7c35b9,9ac72c5ad5d4cc8ebc5530f3f090d1305fd24c11..03bab4909628f75a6ee2f87a0080d2e60f30072f
--- 1/etc/netatalk/netatalk.c
--- 2/etc/netatalk/netatalk.c
+++ b/etc/netatalk/netatalk.c
@@@ -46,9 -52,8 +54,8 @@@ static void kill_childs(int sig, ...)
  
  /* static variables */
  static AFPObj obj;
- static sig_atomic_t got_chldsig;
 -static pid_t afpd_pid = -1,  cnid_metad_pid = -1;
 -static uint afpd_restarts, cnid_metad_restarts;
 +static pid_t afpd_pid = -1,  cnid_metad_pid = -1, dbus_pid = -1;
 +static uint afpd_restarts, cnid_metad_restarts, dbus_restarts;
  static struct event_base *base;
  struct event *sigterm_ev, *sigquit_ev, *sigchld_ev, *timer_ev;
  static int in_shutdown;
@@@ -168,9 -133,11 +175,9 @@@ static void sighup_cb(evutil_socket_t f
  /* SIGCHLD callback */
  static void sigchld_cb(evutil_socket_t fd, short what, void *arg)
  {
-     int status, i;
+     int status;
      pid_t pid;
  
 -    LOG(log_debug, logtype_afpd, "Got SIGCHLD event");
 -  
      while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
          if (WIFEXITED(status)) {
              if (WEXITSTATUS(status))

diff --cc etc/uams/uams_dhx2_pam.c
Simple merge

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

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

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

diff --cc macros/netatalk.m4
Simple merge