Disabled sandbox child shutdown process exit as it is killed by its parent

 - otherwise COMM_FAILURE occured on shutdown() method call by parent

diff --git a/src/libcaptive/sandbox/server-Vfs.c b/src/libcaptive/sandbox/server-Vfs.c
index 9dd2054..1114bc2 100644 (file)
--- a/src/libcaptive/sandbox/server-Vfs.c
+++ b/src/libcaptive/sandbox/server-Vfs.c
@@ -163,16 +163,20 @@ struct captive_options_module *options_module;
 }
 
 
+#if 0  /* Currently unused - see impl_Captive_Vfs_shutdown() */
 static gboolean impl_Captive_Vfs_shutdown_idle(gpointer data /* unused */)
 {
        sandbox_child_shutdown();
 
        return FALSE;   /* remove me */
 }
+#endif
 
 static void impl_Captive_Vfs_shutdown(impl_POA_Captive_Vfs *servant,CORBA_Environment *ev)
 {
+#if 0  /* Currently unused - see impl_Captive_Vfs_shutdown() */
 GSource *source;
+#endif
 
        /* Shutdown 'servant->captive_vfs_object' synchronously as it may
         * flush its buffers needed to be transferred to our parent.
@@ -180,6 +184,12 @@ GSource *source;
        impl_Captive_Vfs_fini(servant,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));
 
+       /* Currently we do not do any sandbox child shutdown here as it sometimes
+        * crashes the parent with COMM_FAILURE without proper finish of this
+        * shutdown() CORBA method call. Parent will kill(2) us soon
+        * from its parent-Vfs.c:captive_sandbox_parent_vfs_close() anyway.
+        */
+#if 0
        sandbox_child_prepare_shutdown();
 
        /* Do not call sandbox_child_shutdown() directly as we would fail
@@ -196,4 +206,5 @@ GSource *source;
   g_source_attach(source,
                        g_main_loop_get_context(linc_main_get_loop())); /* context; NULL means 'default context' */
   g_source_unref(source);
+#endif
 }