Merge 2-2

diff --git a/NEWS b/NEWS
index 3dac72943195c4b83ef5bb673af7bf081e817ec9..4c6e3dd2cf8aae37f878923a39e6c4e16577866d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -80,6 +80,12 @@ Changes in 3.0 alpha1
 * 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 --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c
index 58c37009ef501ee47313c057fcd9a07941bd82c8..8b1b1a8d7ce98624b41b0e0ae8edf22eaa195a06 100644 (file)
--- a/etc/afpd/afp_dsi.c
+++ b/etc/afpd/afp_dsi.c
@@ -76,7 +76,8 @@ static sigjmp_buf recon_jmp;
 static void afp_dsi_close(AFPObj *obj)
 {
     DSI *dsi = obj->dsi;
-
+    sigset_t sigs;
+    
     close(obj->ipc_fd);
     obj->ipc_fd = -1;
 
@@ -93,8 +94,12 @@ static void afp_dsi_close(AFPObj *obj)
     }
 
     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);