From 3b8ecac722c7fedf2231d4ac85d0d8c7e8082262 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Mar 13 2022 08:14:36 +0000 Subject: Improved mutex fix --- diff --git a/globus-gridftp-server-warn.patch b/globus-gridftp-server-warn.patch index 5793d65..ff78ec2 100644 --- a/globus-gridftp-server-warn.patch +++ b/globus-gridftp-server-warn.patch @@ -42,7 +42,7 @@ index b3531e1393..ac49e7d247 100644 result = gfs_l_gfork_opts_kmgint(opt[0], &val); if(result != GLOBUS_SUCCESS) diff --git a/gridftp/server/src/globus_gridftp_server.c b/gridftp/server/src/globus_gridftp_server.c -index 0aff2fd1d6..9704775842 100644 +index 0aff2fd1d6..52ed0db3f6 100644 --- a/gridftp/server/src/globus_gridftp_server.c +++ b/gridftp/server/src/globus_gridftp_server.c @@ -535,7 +535,6 @@ globus_l_gfs_spawn_child( @@ -53,17 +53,16 @@ index 0aff2fd1d6..9704775842 100644 result = globus_xio_register_close( handle, NULL, -@@ -543,7 +542,9 @@ globus_l_gfs_spawn_child( +@@ -543,7 +542,7 @@ globus_l_gfs_spawn_child( NULL); if(result != GLOBUS_SUCCESS) { -+ globus_mutex_unlock(&globus_l_gfs_mutex); - globus_l_gfs_close_cb(handle, result, NULL); -+ globus_mutex_lock(&globus_l_gfs_mutex); +- globus_l_gfs_close_cb(handle, result, NULL); ++ globus_i_gfs_connection_closed(); } } -@@ -613,7 +614,8 @@ globus_l_gfs_ipc_closed( +@@ -613,7 +612,8 @@ globus_l_gfs_ipc_closed( } handle = (globus_xio_handle_t) user_arg; diff --git a/globus-gridftp-server.spec b/globus-gridftp-server.spec index 1e9691f..406ec99 100644 --- a/globus-gridftp-server.spec +++ b/globus-gridftp-server.spec @@ -9,7 +9,7 @@ Name: globus-gridftp-server %global _name %(tr - _ <<< %{name}) Version: 13.22 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Grid Community Toolkit - Globus GridFTP Server License: ASL 2.0 @@ -254,6 +254,9 @@ fi %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Mar 13 2022 Mattias Ellert - 13.22-9 +- Improved mutex fix + * Sat Mar 12 2022 Mattias Ellert - 13.22-8 - Use sha256 hash when generating test certificates - Fix some compiler warnings