Merge master

[netatalk.git] / libatalk / util / server_child.c

diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c
index 47e9baa2549bee28b42cbf1695f855e534476d89..34cec28d17d5b0d601a5fef0daacf0c8b3bbbe90 100644 (file)
--- a/libatalk/util/server_child.c
+++ b/libatalk/util/server_child.c
@@ -273,6 +273,16 @@ int server_child_transfer_session(server_child *children,
     fork = (server_child_fork *) children->fork + forkid;
     if ((child = resolve_child(fork->table, pid)) == NULL) {
         LOG(log_note, logtype_default, "Reconnect: no child[%u]", pid);
+        if (kill(pid, 0) == 0) {
+            LOG(log_note, logtype_default, "Reconnect: terminating old session[%u]", pid);
+            kill(pid, SIGTERM);
+            sleep(2);
+            if (kill(pid, 0) == 0) {
+                LOG(log_error, logtype_default, "Reconnect: killing old session[%u]", pid);
+                kill(pid, SIGKILL);
+                sleep(2);
+            }
+        }
         return 0;
     }