Merge 2-2

diff --cc NEWS
index 3dac72943195c4b83ef5bb673af7bf081e817ec9,0f88863b1f853ac675babfc5f83e62a7c53d03df..4c6e3dd2cf8aae37f878923a39e6c4e16577866d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,85 -1,9 +1,91 @@@
 +Changes in 3.0 beta3
 +====================
 +* UPD: read only mode if cnid scheme is last
 +* REM: global option "icon"
 +
 +Changes in 3.0 beta2
 +====================
 +* UPD: Solaris and friends: Replace initscript with SMF manifest
 +* FIX: Solaris and friends: resource fork handling
 +
 +Changes in 3.0 beta1
 +====================
 +* UPD: afpd: Performance tuning of read/write AFP operations. New option
 +       "afp read locks" (default: no) which disables that the server
 +       applies UNIX byte range locks to regions of files in AFP read and
 +       write calls.
 +* UPD: apple_dump: Extended Attributes AppleDouble support.
 +       (*BSD is not supported yet)
 +
 +Changes in 3.0 alpha3
 +=====================
 +
 +* NEW: afpd: Per volume "login message", NetAFP bug ID #18
 +* NEW: afpd: Cross-platform locking (share modes) on Solaris and derivates
 +       with Solaris CIFS/SMB server. Uses new Solaris fcntl F_SHARE share
 +       reservation locking primitives. Enabled by default, set global
 +       "solaris share reservations" option to false to disable it.
 +* NEW: ad: ad set subcommand for changing Mac metadata on the server
 +* UPD: unix charset is UTF8 by default.
 +       vol charset is same value as unix charset by default.
 +* UPD: .AppleDesktop/ are stored in $localstatedir/netatalk/CNID
 +       (default: /var/netatalk/CNID), databases found in AFP volumes are
 +       automatically moved
 +* FIX: afpd: Server info packet was malformed resulting in broken
 +       server names being displayed on clients
 +* FIX: afpd: Byte order detection. Fixes an error where Netatalk on
 +       OpenIndiana returned wrong volume size information.
 +
 +Changes in 3.0 alpha2
 +=====================
 +
 +* UPD: afpd: Store '.' as is and '/' as ':' on the server, don't
 +       CAP hexencode as "2e" and "2f" respectively
 +* UPD: afdp: Automatic name conversion, renaming files and directories
 +       containing CAP sequences to their not enscaped forms
 +* UPD: afpd: Correct handling of user homes and users without homes
 +* UPD: afpd: Perform complete automatic adouble:v2 to adouble:ea conversion
 +       as root. Previously only unlinking the adouble:v2 file was done as root
 +* UPD: dbd: -C option removes CAP encoding
 +* UPD: Add graceful option to RedHat init script
 +* UPD: Add --disable-bundled-libevent configure options When set to yes,
 +       we rely on a properly installed version on libevent CPPFLAGS and LDFLAGS
 +       should be set properly to pick that up
 +* UPD: Run ldconfig on Linux at the end of make install
 +* FIX: afpd: ad cp on appledouble = ea volumes
 +* FIX: dbd: ignore ._ appledouble files
 +* REM: Volumes options "use dots" and "hex encoding"
 +
 +Changes in 3.0 alpha1
 +=====================
 +
 +* NEW: Central configuration file afp.conf which replaces all previous files
 +* NEW: netatalk: service controller starting and restarting afpd and cnid_metad
 +       as necessary
 +* NEW: afpd: Extended Attributes AppleDouble backend (default)
 +* UPD: CNID databases are stored in $localstatedir/netatalk/CNID
 +       (default: /var/netatalk/CNID), databases found in AFP volumes are
 +       automatically moved
 +* UPD: Start scripts and service manifests have been changed to only start
 +       the new netatalk service controller process
 +* UPD: afpd: UNIX privileges and use dots enabled by default
 +* UPD: afpd: Support for arbitrary AFP volumes using variable expansion has been
 +       removed
 +* UPD: afpd: afp_voluuid.conf and afp_signature.conf location has been
 +       changed to $localstatedir/netatalk/ (default: /var/netatalk/)
 +* UPD: afpd: default server messages dir changed to $localstatedir/netatalk/msg/
 +* UPD: dbd: new option -C for conversion from AppleDouble v2 to ea
 +* REM: AppleTalk support has been removed
 +* REM: afpd: SLP and AFP proxy support have been removed
 +* REM: afpd: legacy file extension to type/creator mapping has been removed
 +* REM: afpd: AppleDouble backends v1, osx and sfm have been removed
 +
+ Changes in 2.2.4
+ ================
+ 
+ * FIX: Missing UAM links
+ * FIX: Lockup in AFP logout on Fedora 17
+ 
  Changes in 2.2.3
  ================
  

diff --cc etc/afpd/afp_dsi.c
index 58c37009ef501ee47313c057fcd9a07941bd82c8,7779b2307f9ca16f8dbda74b8587e8391d5950ad..8b1b1a8d7ce98624b41b0e0ae8edf22eaa195a06
--- 1/etc/afpd/afp_dsi.c
--- 2/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@@ -75,8 -79,9 +75,9 @@@ static rc_elem_t replaycache[REPLAYCACH
  static sigjmp_buf recon_jmp;
  static void afp_dsi_close(AFPObj *obj)
  {
 -    DSI *dsi = obj->handle;
 +    DSI *dsi = obj->dsi;
- 
+     sigset_t sigs;
+     
      close(obj->ipc_fd);
      obj->ipc_fd = -1;
  
@@@ -92,9 -97,14 +93,13 @@@
          }
      }
  
 -    close_all_vol();
 -
 +    close_all_vol(obj);
-     if (obj->logout)
+     if (obj->logout) {
+         /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */
+         sigfillset(&sigs);
+         pthread_sigmask(SIG_BLOCK, &sigs, NULL);
          (*obj->logout)();
+     }
  
      LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written",
          dsi->read_count/1024.0, dsi->write_count/1024.0);