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

Conflicts:
	include/atalk/globals.h
	libatalk/util/netatalk_conf.c

diff --cc NEWS
Simple merge

diff --cc doc/manpages/man5/afp.conf.5.xml
Simple merge

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

diff --cc include/atalk/globals.h
index 232f5392a1dc52b0599394453f9723cdc2fad7da,d863df0c5fc084b1a2b4d2895ab74899bd36c06f..6c29ee02d71430db7cb1afe532233e28fc0010e9
--- 1/include/atalk/globals.h
--- 2/include/atalk/globals.h
+++ b/include/atalk/globals.h
@@@ -119,7 -117,7 +119,8 @@@ struct afp_options 
      char *logfile;
      char *mimicmodel;
      char *adminauthuser;
+     char *ignored_attr;
 +    char *slmod_path;
      struct afp_volume_name volfile;
  };
  

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

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

diff --cc libatalk/Makefile.am
index c932076cae5d9f24db8fb5bddf7af6b5aa826c30,06e869a332e97583d5052a33acfb787a929494de..f7206d30017358d325026647e42f69a83d240275
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -32,8 -32,9 +32,9 @@@ VERSION_INFO = 6:0:
  #   3.0.2           3:0:0
  #   3.0.3           4:0:0
  #   3.0.4           5:0:0
+ #   3.0.5           6: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/util/netatalk_conf.c
index f86eab67cde240ba9ef2ce7c9611ef316471a408,70e1d6be34343236ac1cf4e84a97698594823f00..c0133edb95c3f7047726a684978e276d1be3997c
--- 1/libatalk/util/netatalk_conf.c
--- 2/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@@ -1976,8 -1998,8 +2010,10 @@@ void afp_config_free(AFPObj *obj
          CONFIG_ARG_FREE(obj->options.Cnid_port);
      if (obj->options.fqdn)
          CONFIG_ARG_FREE(obj->options.fqdn);
+     if (obj->options.ignored_attr)
+         CONFIG_ARG_FREE(obj->options.ignored_attr);
 +    if (obj->options.slmod_path)
 +        CONFIG_ARG_FREE(obj->options.slmod_path);
  
      if (obj->options.unixcodepage)
          CONFIG_ARG_FREE(obj->options.unixcodepage);

diff --cc man/man5/afp.conf.5.in
Simple merge