Merge sf/master

diff --cc NEWS
index 3f4cf570d7a4b9102271f01e792019cbe9b44bbf,36fb0e14d8460da76a85de6314dc336f4341fccd..fa81acd9da9ba6d08a0452f745bc4a4ba5907b13
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,22 -1,4 +1,23 @@@
 +Changes in 2.2
 +==============
 +
 +* NEW: afpd: new volume option "nonetids"
 +* NEW: afpd: ACL access check caching
+ * NEW: afpd: FCE event notifications
 +* UPD: Support for Berkeley DB 5.1
 +* UPD: case-conversion is based on Unicode 6.0.0
 +* UPD: cnid_metad: allow up to 4096 volumes
 +* UPD: afpd: only forward SIGTERM and SIGUSR1 from parent to childs
 +* UPD: afpd: use internal function instead of popening du -sh in order to
 +       calculate the used size of a volume for option "volsizelimit"
 +* UPD: afpd: Add negative UUID caching, enhance local UUID handling
 +* FIX: afpd: configuration reload with SIGHUP
 +* FIX: afpd: crashes in the dircache
 +* FIX: afpd: Correct afp logout vs dsi eof behaviour
 +* FIX: afpd: new catsearch was broken
 +* FIX: afpd: only use volume UUIDs in master afpd
 +* FIX: dbd: Multiple fixes, reliable locking
 +* FIX: ad file suite: fix an error that resulted in CNID database inconsistencies
  
  Changes in 2.2beta4
  ===================

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

diff --cc etc/afpd/afp_options.c
index 5cb205dbe7199eb2d6966533490d4538af8ee75e,82db1c8e5bae81acf233e733b5fe96f8b96d719a..22cb2d3389be6e008439be6a3649137e3c9167ff
--- 1/etc/afpd/afp_options.c
--- 2/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@@ -34,8 -34,9 +34,9 @@@
  #include <atalk/paths.h>
  #include <atalk/util.h>
  #include <atalk/compat.h>
 +#include <atalk/globals.h>
+ #include <atalk/fce_api.h>
  
 -#include "globals.h"
  #include "status.h"
  #include "auth.h"
  #include "dircache.h"

diff --cc etc/afpd/directory.c
index fc0c56321ec14c39b0b7f3b09cc4740af689e457,7b25849114d0d9c1e079ca3f77446d5ade6fce36..fe628e0c61b9fc692420bed1c87171b7d9b2f2cf
--- 1/etc/afpd/directory.c
--- 2/etc/afpd/directory.c
+++ b/etc/afpd/directory.c
@@@ -29,7 -29,7 +29,8 @@@
  #include <atalk/bstrlib.h>
  #include <atalk/bstradd.h>
  #include <atalk/errchk.h>
 +#include <atalk/globals.h>
+ #include <atalk/fce_api.h>
  
  #include "directory.h"
  #include "dircache.h"

diff --cc etc/afpd/file.c
index 323642f9ce92f305e7b9b905fdf102c726119656,c165eb93f37680a0d6c10290d955e61c01d9c2b4..ec85f37a52e0dfdefb79335b05e447bb970138ea
--- 1/etc/afpd/file.c
--- 2/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@@ -37,7 -37,7 +37,8 @@@ char *strchr (), *strrchr ()
  #include <atalk/util.h>
  #include <atalk/cnid.h>
  #include <atalk/unix.h>
 +#include <atalk/globals.h>
+ #include <atalk/fce_api.h>
  
  #include "directory.h"
  #include "dircache.h"

diff --cc etc/afpd/filedir.c
index 356d82104cdadb69d910b651b92ff13632eab369,5f6e0f643e5987f101a2068123772eb8a50a21f8..7166c125d36c8af3cae56270fec3924a8e31037e
--- 1/etc/afpd/filedir.c
--- 2/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@@ -40,7 -40,7 +40,8 @@@ char *strchr (), *strrchr ()
  #include <atalk/bstrlib.h>
  #include <atalk/bstradd.h>
  #include <atalk/acl.h>
 +#include <atalk/globals.h>
+ #include <atalk/fce_api.h>
  
  #include "directory.h"
  #include "dircache.h"
@@@ -614,12 -623,12 +623,12 @@@ int afp_delete(AFPObj *obj, char *ibuf
           */
          if (s_path->st_valid && s_path->st_errno == ENOENT) {
              rc = AFPERR_NOOBJ;
-         }
-         else {
-             rc = deletefile(vol, -1, upath, 1);
+         } else {
+             if ((rc = deletefile(vol, -1, upath, 1)) == AFP_OK)
+                               fce_register_delete_file( s_path );
  
              struct dir *cachedfile;
 -            if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath), s_path->st.st_ctime))) {
 +            if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath)))) {
                  dircache_remove(vol, cachedfile, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX);
                  dir_free(cachedfile);
              }

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

diff --cc etc/afpd/ofork.c
index 6182fcff540f71d2bbbb1f32b33338a80b51af09,c4901285c9e9d248692d7841cc546e986321fa55..2d2600895cb5cc37a730a84a5bb1bdb1b9c6380e
--- 1/etc/afpd/ofork.c
--- 2/etc/afpd/ofork.c
+++ b/etc/afpd/ofork.c
@@@ -21,8 -21,9 +21,9 @@@
  #include <atalk/util.h>
  #include <atalk/bstrlib.h>
  #include <atalk/bstradd.h>
 +#include <atalk/globals.h>
+ #include <atalk/fce_api.h>
  
 -#include "globals.h"
  #include "volume.h"
  #include "directory.h"
  #include "fork.h"

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

diff --cc include/atalk/Makefile.am
index a75839c27f201bb943818c53e12a1b41b9c84091,80bdc14b7a94fc42842723543b06d8d6ba760f4d..e4939e29082a5954c7f5cac4eeac6da43f658d24
--- 1/include/atalk/Makefile.am
--- 2/include/atalk/Makefile.am
+++ b/include/atalk/Makefile.am
@@@ -8,4 -8,4 +8,4 @@@ atalkinclude_HEADERS = 
        server_ipc.h tdb.h uam.h unicode.h util.h uuid.h volinfo.h \
        zip.h ea.h acl.h unix.h directory.h hash.h volume.h
  
- noinst_HEADERS = cnid_dbd_private.h cnid_private.h bstradd.h bstrlib.h errchk.h ftw.h globals.h
 -noinst_HEADERS = cnid_dbd_private.h cnid_private.h bstradd.h bstrlib.h errchk.h ftw.h fce_api.h
++noinst_HEADERS = cnid_dbd_private.h cnid_private.h bstradd.h bstrlib.h errchk.h ftw.h globals.h fce_api.h

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