Merge master

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

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

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

diff --cc etc/afpd/directory.h
Simple merge

diff --cc etc/afpd/file.c
index 009ec195f02d1150d3f0c5a7bd663d602380f1ae,75dbb6c7b393ae96ee863c00312061071cbf0c50..b5a896373683c88e7380af2da72c36e6ca06f98c
--- 1/etc/afpd/file.c
--- 2/etc/afpd/file.c
+++ b/etc/afpd/file.c
@@@ -732,14 -768,20 +741,14 @@@ int afp_createfile(AFPObj *obj, char *i
          return AFPERR_MISC;
      }
  
 -    (void)get_id(vol, adp, &st, dir->d_did, upath, strlen(upath));
 +    (void)get_id(vol, &ad, &st, dir->d_did, upath, strlen(upath));
  
 -    ad_flush( adp);
 -    ad_close( adp, ADFLAGS_DF|ADFLAGS_HF );
 +    ad_flush(&ad);
 +    ad_close(&ad, ADFLAGS_DF|ADFLAGS_HF );
  
  createfile_done:
-     curdir->offcnt++;
+     curdir->d_offcnt++;
  
 -#ifdef DROPKLUDGE
 -    if (vol->v_flags & AFPVOL_DROPBOX) {
 -        retvalue = matchfile2dirperms(upath, vol, did);
 -    }
 -#endif /* DROPKLUDGE */
 -
      setvoltime(obj, vol );
  
      return (retvalue);
@@@ -1324,8 -1371,14 +1333,8 @@@ int afp_copyfile(AFPObj *obj, char *ibu
          retvalue = err;
          goto copy_exit;
      }
-     curdir->offcnt++;
+     curdir->d_offcnt++;
  
 -#ifdef DROPKLUDGE
 -    if (vol->v_flags & AFPVOL_DROPBOX) {
 -        retvalue=matchfile2dirperms(upath, vol, ddid); /* FIXME sdir or ddid */
 -    }
 -#endif /* DROPKLUDGE */
 -
      setvoltime(obj, d_vol );
  
  copy_exit:

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

diff --cc etc/afpd/main.c
index c926c36899ebeaa529e0d8ec81bc752057c41b64,9e34712e79f6b12887dd15a52f39a8c707b7b47d..37bb4bd4a0916ba6c54ce5b074fa081edca47fe1
--- 1/etc/afpd/main.c
--- 2/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@@ -113,9 -109,12 +112,6 @@@ static void fd_reset_listening_sockets(
  /* ------------------ */
  static void afp_goaway(int sig)
  {
-     if (server_children)
-         server_child_kill(server_children, CHILD_DSIFORK, sig);
 -
 -#ifndef NO_DDP
 -    asp_kill(sig);
 -#endif /* ! NO_DDP */
 -
--
      switch( sig ) {
  
      case SIGTERM :

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

diff --cc etc/cnid_dbd/cnid_metad.c
Simple merge

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