Fixed serious memory leak during each sandbox-server spawn.
[captive.git] / src / libcaptive / sandbox / split.c
index 780ca64..72107a1 100644 (file)
@@ -32,7 +32,7 @@
 #include "server-Directory.h"
 #include "server-Vfs.h"
 #include "../client/vfs.h"
-#include "captive/parent-Vfs.h"
+#include "parent-Vfs.h"
 #include <dirent.h>
 #include "server-CaptiveIOChannel.h"
 #include <errno.h>
@@ -76,7 +76,7 @@ gchar *orb_argv[]={
        g_return_val_if_fail(poap!=NULL,FALSE);
 
        if (done)
-               return TRUE;
+               return TRUE;    /* FIXME: '*poap' is left invalid! */
 
        /* Init 'ev' */
        CORBA_exception_init(evp);
@@ -331,11 +331,12 @@ static void options_module_captive_to_options_module_corba
 
        g_return_if_fail(src_options_module_captive->type==CAPTIVE_OPTIONS_MODULE_TYPE_PE32);
 
-       dest_options_module_corba->pathname_utf8=g_strdup(src_options_module_captive->pathname_utf8);
-       dest_options_module_corba->data._buffer=g_memdup(src_options_module_captive->u.pe32.base,
-                       src_options_module_captive->u.pe32.length);
+       dest_options_module_corba->pathname_utf8=CORBA_string_dup(src_options_module_captive->pathname_utf8);
        dest_options_module_corba->data._maximum=src_options_module_captive->u.pe32.length;
        dest_options_module_corba->data._length =src_options_module_captive->u.pe32.length;
+       dest_options_module_corba->data._buffer=Captive_Bytes_allocbuf(dest_options_module_corba->data._maximum);
+       memcpy(dest_options_module_corba->data._buffer,src_options_module_captive->u.pe32.base,
+                       src_options_module_captive->u.pe32.length);
        dest_options_module_corba->data._release=TRUE;
 }
 
@@ -373,6 +374,7 @@ static void sandbox_parent_own_orbit_dir_cleanup_atexit(void)
 static gboolean done=FALSE;
 
        g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s; done=%d",G_STRLOC,(int)done);
+
        if (done)
                return;
        done=TRUE;
@@ -408,11 +410,15 @@ struct sandbox_parent_own_orbit_dir_cleanup_signal *sigstructp;
        signal(signum,sigstructp->sighandler_orig);
 
        /* Prevent recursive fatal logging before signal restore: */
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: signum=%d,sighandler_orig=%p",G_STRLOC,signum,sigstructp->sighandler_orig);
+       /* Do not: g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: signum=%d,sighandler_orig=%p",G_STRLOC,signum,sigstructp->sighandler_orig);
+        * as it is dangerous to g_log() from sighandler.
+        */
 
        sandbox_parent_own_orbit_dir_cleanup_atexit();
 
-       g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: re-raising...",G_STRLOC);
+       /* Do not: g_log(G_LOG_DOMAIN,G_LOG_LEVEL_DEBUG,"%s: re-raising...",G_STRLOC);
+        * as it is dangerous to g_log() from sighandler.
+        */
        raise(signum);
 }
 
@@ -430,7 +436,8 @@ struct sandbox_parent_own_orbit_dir_cleanup_signal *sigstructp;
                }
 }
 
-gchar *sandbox_parent_read_ior(int Vfs_IOR_fd_read,gchar **child_chroot_pid_hashkey_dirp)
+static gchar *sandbox_parent_read_ior
+               (int Vfs_IOR_fd_read,gchar **child_chroot_pid_hashkey_dirp,CaptiveVfsParentObject *captive_vfs_parent_object)
 {
 gchar *data;
 gsize data_size;
@@ -446,7 +453,8 @@ gboolean errbool;
 
        /* FIXME: Security: Duplicate giop_tmpdir_init() here. */
        if (!sandbox_parent_own_orbit_dir) {
-               sandbox_parent_own_orbit_dir=g_strdup_printf("/tmp/captive-orbit-%d",getpid());
+               /* FIXME: Make 'CAPTIVE_SANDBOX_CHROOT' configurable. */
+               sandbox_parent_own_orbit_dir=g_strdup_printf("%s/tmp/captive-orbit-%d",CAPTIVE_SANDBOX_CHROOT,getpid());
                if (mkdir(sandbox_parent_own_orbit_dir,0700)) {
                        g_assert(errno==EEXIST);
                        sandbox_parent_own_orbit_dir_cleanup_init();
@@ -485,17 +493,23 @@ const gchar *chrooted_orbit_dir;
                /* IOR contains the full pathname with the setuid username encoded. */
                chrooted_orbit_dir=g_hash_table_lookup(hash,"chrooted_orbit_dir");
                g_assert(chrooted_orbit_dir!=NULL);
-               if (mkdir(chrooted_orbit_dir,S_ISVTX|0777)) {
+               captive_vfs_parent_object->corba_chrooted_orbit_dir=g_strdup(chrooted_orbit_dir);
+               /* 0700 as this directory will not be reused
+                * to commuicate with any other sandbox child.
+                */
+               if (mkdir(chrooted_orbit_dir,0700)) {
                        g_assert(errno==EEXIST);
                        }
 
                socketname=g_hash_table_lookup(hash,"socketname");
                g_assert(socketname!=NULL);
+               captive_vfs_parent_object->corba_socketname=g_strdup(socketname);
 
                socketpathname_src=captive_printf_alloca("%s/%s/%s",child_chroot_pid_hashkey_dir,chrooted_orbit_dir,socketname);
-               socketpathname_dest=captive_printf_alloca("%s/%s",chrooted_orbit_dir,socketname);
+               socketpathname_dest=g_strdup_printf("%s/%s",chrooted_orbit_dir,socketname);
                errint=link(socketpathname_src,socketpathname_dest);
-               g_assert(errint==0);
+               if (errint)
+                       g_error("link(\"%s\",\"%s\")=%d:%m",socketpathname_src,socketpathname_dest,errint);
                }
        if (child_chroot_pid_hashkey_dirp)
                *child_chroot_pid_hashkey_dirp=g_strdup(child_chroot_pid_hashkey_dir);
@@ -518,7 +532,8 @@ static xmlNode *options_module_captive_to_xml
        g_return_val_if_fail(src_options_module_captive!=NULL,NULL);
 
        { xmlNode *module=xmlNewTextChild(dest_xml_parent,NULL,"module",NULL);
-       const gchar *type_string,*basename,*cgs;
+       const gchar *type_string="???"; /* Prevent: ... might be used uninitialized in this function */
+       const gchar *basename,*cgs;
 
                basename=src_options_module_captive->pathname_utf8;
                if ((cgs=strrchr(basename,'/')))
@@ -541,25 +556,25 @@ static xmlNode *options_module_captive_to_xml
 }
 
 
-static void sandbox_parent_bug_doc_make(CaptiveVfsObject *captive_vfs_object)
+static void sandbox_parent_bug_doc_make(CaptiveVfsParentObject *captive_vfs_parent_object)
 {
        { xmlDoc *doc=xmlNewDoc("1.0");
-               captive_vfs_object->corba_bug_doc=doc;
-               { xmlNode *bug=xmlNewDocNode(captive_vfs_object->corba_bug_doc,NULL,"bug",NULL);
-                       xmlDocSetRootElement(captive_vfs_object->corba_bug_doc,bug);
-                       captive_vfs_object->corba_bug=bug;
+               captive_vfs_parent_object->corba_bug_doc=doc;
+               { xmlNode *bug=xmlNewDocNode(captive_vfs_parent_object->corba_bug_doc,NULL,"bug",NULL);
+                       xmlDocSetRootElement(captive_vfs_parent_object->corba_bug_doc,bug);
+                       captive_vfs_parent_object->corba_bug=bug;
                        { xmlNode *bug_captive=xmlNewTextChild(bug,NULL,"captive",NULL);
                                xmlNewProp(bug_captive,"version",VERSION);
                                }
                        { xmlNode *bug_filesystem=xmlNewTextChild(bug,NULL,"filesystem",NULL);
-                               options_module_captive_to_xml(bug_filesystem,&captive_vfs_object->options.filesystem);
+                               options_module_captive_to_xml(bug_filesystem,&CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.filesystem);
                                }
                        { xmlNode *bug_load_module=xmlNewTextChild(bug,NULL,"load_module",NULL);
                        guint load_moduleui;
                        struct captive_options_module *options_module;
                        GList *load_module_node;
 
-                               for (load_moduleui=0,load_module_node=captive_vfs_object->options.load_module;
+                               for (load_moduleui=0,load_module_node=CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.load_module;
                                                load_module_node;
                                                load_moduleui++,load_module_node=load_module_node->next) {
                                        options_module=load_module_node->data;
@@ -567,17 +582,17 @@ static void sandbox_parent_bug_doc_make(CaptiveVfsObject *captive_vfs_object)
                                        }
                                }
                        { xmlNode *bug_action=xmlNewTextChild(bug,NULL,"action",NULL);
-                               captive_vfs_object->corba_bug_action=bug_action;
+                               captive_vfs_parent_object->corba_bug_action=bug_action;
                                }
                        { xmlNode *bug_log=xmlNewTextChild(bug,NULL,"log",NULL);
-                               captive_vfs_object->corba_bug_log=bug_log;
+                               captive_vfs_parent_object->corba_bug_log=bug_log;
                                }
                        }
                }
 }
 
 
-static void sandbox_parent(const gchar *Vfs_IOR,const gchar *child_chroot_pid_hashkey_dir,CaptiveVfsObject *captive_vfs_object)
+static void sandbox_parent(const gchar *Vfs_IOR,const gchar *child_chroot_pid_hashkey_dir,CaptiveVfsParentObject *captive_vfs_parent_object)
 {
 Captive_Vfs Vfs_object;
 Captive_GLogFunc GLogFunc_object;
@@ -591,35 +606,35 @@ int errint;
 
        g_return_if_fail(Vfs_IOR!=NULL);
        /* 'child_chroot_pid_hashkey_dir' may be NULL */
-       g_return_if_fail(captive_vfs_object!=NULL);
+       g_return_if_fail(CAPTIVE_VFS_PARENT_IS_OBJECT(captive_vfs_parent_object));
 
        Vfs_object=CORBA_ORB_string_to_object(captive_corba_orb,Vfs_IOR,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));
 
        /* Init 'GLogFunc_object' */
-       GLogFunc_object=impl_Captive_GLogFunc__create(captive_corba_poa,captive_vfs_object,&captive_corba_ev);
+       GLogFunc_object=impl_Captive_GLogFunc__create(captive_corba_poa,captive_vfs_parent_object,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));
 
        /* Init 'CaptiveIOChannel_object' */
-       if (!captive_vfs_object->corba_parent_giochanel_blind_source)
-               switch (captive_vfs_object->options.rwmode) {
+       if (!captive_vfs_parent_object->corba_parent_giochanel_blind_source)
+               switch (CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.rwmode) {
                        case CAPTIVE_OPTION_RWMODE_RO:
                        case CAPTIVE_OPTION_RWMODE_RW:
-                               captive_vfs_object->corba_parent_giochanel_blind_source=captive_vfs_object->options.image_iochannel;
+                               captive_vfs_parent_object->corba_parent_giochanel_blind_source=CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.image_iochannel;
                                break;
                        case CAPTIVE_OPTION_RWMODE_BLIND:
-                               captive_vfs_object->corba_parent_giochanel_blind_source=(GIOChannel *)captive_giochannel_blind_new(
-                                               captive_vfs_object->options.image_iochannel,    /* giochannel_orig */
+                               captive_vfs_parent_object->corba_parent_giochanel_blind_source=(GIOChannel *)captive_giochannel_blind_new(
+                                               CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.image_iochannel, /* giochannel_orig */
                                                TRUE); /* writeable */
                                break;
                        default: g_assert_not_reached();
                        }
-       if (!captive_vfs_object->corba_parent_giochanel_blind)
-               captive_vfs_object->corba_parent_giochanel_blind=(GIOChannel *)captive_giochannel_blind_new(
-                               captive_vfs_object->corba_parent_giochanel_blind_source,  /* giochannel_orig */
-                               (captive_vfs_object->options.rwmode!=CAPTIVE_OPTION_RWMODE_RO)); /* writeable */
+       if (!captive_vfs_parent_object->corba_parent_giochanel_blind)
+               captive_vfs_parent_object->corba_parent_giochanel_blind=(GIOChannel *)captive_giochannel_blind_new(
+                               captive_vfs_parent_object->corba_parent_giochanel_blind_source,  /* giochannel_orig */
+                               (CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.rwmode!=CAPTIVE_OPTION_RWMODE_RO)); /* writeable */
        CaptiveIOChannel_object=impl_Captive_CaptiveIOChannel__create(captive_corba_poa,
-                       captive_vfs_object->corba_parent_giochanel_blind,&captive_corba_ev);
+                       captive_vfs_parent_object->corba_parent_giochanel_blind,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));
 
        /* Create the socket needed for 'sandbox_parent_own_orbit_socket' below
@@ -653,9 +668,29 @@ struct dirent *dirent;
                }
 
        if (child_chroot_pid_hashkey_dir) {
+gchar *s;
+
                child_chroot_parent_own_orbit_dir=captive_printf_alloca("%s/%s",child_chroot_pid_hashkey_dir,sandbox_parent_own_orbit_dir);
-               errint=mkdir(child_chroot_parent_own_orbit_dir,0777);
-               g_assert(errint==0);
+               s=(/* de-const */ gchar *)child_chroot_parent_own_orbit_dir;
+               do {
+                       s=strchr(s,'/');
+                       if (s)
+                               *s=0;
+                       if (*child_chroot_parent_own_orbit_dir) {
+                               errint=mkdir(child_chroot_parent_own_orbit_dir,0777);
+                               if (errint)
+                                       g_assert(errno==EEXIST);
+                               else {
+                                       /* chmod(2) it to prevent mode limitation by
+                                        * active ulimit(2) of being executed by mount(8).
+                                        */
+                                       errint=chmod(child_chroot_parent_own_orbit_dir,0777);
+                                       g_assert(errint==0);
+                                       }
+                               }
+                       if (s)
+                               *s++='/';
+                       } while (s);
                child_chroot_parent_own_orbit_socket=captive_printf_alloca("%s/%s",
                                child_chroot_pid_hashkey_dir,sandbox_parent_own_orbit_socket);
                errint=link(sandbox_parent_own_orbit_socket,child_chroot_parent_own_orbit_socket);
@@ -665,23 +700,27 @@ struct dirent *dirent;
                g_assert(errint==0);
                }
 
-       options_corba.g_log_func=GLogFunc_object;
-       options_module_captive_to_options_module_corba(&options_corba.filesystem,&captive_vfs_object->options.filesystem);
+       options_corba.g_log_func=CORBA_Object_duplicate(GLogFunc_object,&captive_corba_ev);
+       g_assert(validate_CORBA_Environment(&captive_corba_ev));
+
+       options_module_captive_to_options_module_corba(&options_corba.filesystem,&CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.filesystem);
        /* Prevent secondary captive_giochannel_blind inside of our sandbox child
         * as we already have one captive_giochannel_blind in the parent.
         */
-       options_corba.rwmode        =(captive_vfs_object->options.rwmode == CAPTIVE_OPTION_RWMODE_BLIND ? CAPTIVE_OPTION_RWMODE_RW
-                       : captive_vfs_object->options.rwmode);
-       options_corba.media         =captive_vfs_object->options.media;
-       options_corba.debug_messages=captive_vfs_object->options.debug_messages;
-       options_corba.image_iochannel=CaptiveIOChannel_object;
-
-       load_module_length=g_list_length(captive_vfs_object->options.load_module);
-       captive_newn(options_corba.load_module._buffer,load_module_length);
+       options_corba.rwmode        =(CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.rwmode == CAPTIVE_OPTION_RWMODE_BLIND ? CAPTIVE_OPTION_RWMODE_RW
+                       : CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.rwmode);
+       options_corba.media         =CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.media;
+       options_corba.debug_messages=CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.debug_messages;
+
+       options_corba.image_iochannel=CORBA_Object_duplicate(CaptiveIOChannel_object,&captive_corba_ev);
+       g_assert(validate_CORBA_Environment(&captive_corba_ev));
+
+       load_module_length=g_list_length(CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.load_module);
        options_corba.load_module._maximum=load_module_length;
        options_corba.load_module._length=load_module_length;
+       options_corba.load_module._buffer=Captive_CaptiveOptionsModuleList_allocbuf(options_corba.load_module._maximum);
        options_corba.load_module._release=TRUE;
-       for (load_moduleui=0,load_module_node=captive_vfs_object->options.load_module;
+       for (load_moduleui=0,load_module_node=CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.load_module;
                        load_module_node;
                        load_moduleui++,load_module_node=load_module_node->next) {
                options_module=load_module_node->data;
@@ -691,14 +730,15 @@ struct dirent *dirent;
        Captive_Vfs_init(Vfs_object,&options_corba,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));
 
-       /* FIXME: Free 'options_corba' - LEAK */
+       Captive_CaptiveOptions__freekids(&options_corba,
+                       NULL);  /* d; unused */
 
-       captive_vfs_object->corba_Vfs_object=Vfs_object;
-       captive_vfs_object->corba_GLogFunc_object=GLogFunc_object;
-       captive_vfs_object->corba_CaptiveIOChannel_object=CaptiveIOChannel_object;
+       captive_vfs_parent_object->corba_Vfs_object=Vfs_object;
+       captive_vfs_parent_object->corba_GLogFunc_object=GLogFunc_object;
+       captive_vfs_parent_object->corba_CaptiveIOChannel_object=CaptiveIOChannel_object;
 
-       if (captive_vfs_object->options.bug_pathname)
-               sandbox_parent_bug_doc_make(captive_vfs_object);
+       if (CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.bug_pathname)
+               sandbox_parent_bug_doc_make(captive_vfs_parent_object);
 }
 
 static void fd_shiftup(int *fdp)
@@ -750,7 +790,7 @@ char *endptr;
        close(dir_fd); g_assert(errno==EBADF);  /* just a bit of paranoia; it should be already closed by closedir() */
 }
 
-gboolean captive_sandbox_spawn(CaptiveVfsObject *captive_vfs_object)
+gboolean captive_sandbox_spawn(CaptiveVfsParentObject *captive_vfs_parent_object)
 {
 /* Vfs_IOR_fds[0] for reading by sandbox_parent() - client,
  * Vfs_IOR_fds[1] for writing by sandbox_child()  - server
@@ -759,7 +799,7 @@ int Vfs_IOR_fds[2],parentheart_fds[2];
 int errint;
 gboolean errbool;
 
-       g_return_val_if_fail(captive_vfs_object!=NULL,FALSE);
+       g_return_val_if_fail(CAPTIVE_VFS_PARENT_IS_OBJECT(captive_vfs_parent_object),FALSE);
 
        errint=pipe(Vfs_IOR_fds);
        g_return_val_if_fail(errint==0,FALSE);
@@ -771,23 +811,23 @@ gboolean errbool;
         *     g_assert(errbool==TRUE);
         */
 
-       if (captive_vfs_object->options.sandbox_server_ior) {
-               g_assert(captive_vfs_object->options.sandbox_server_argv==NULL);
+       if (CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_ior) {
+               g_assert(CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv==NULL);
 
                errbool=corba_init("captive-sandbox-parent",&captive_corba_ev,&captive_corba_orb,&captive_corba_poa);
                g_assert(errbool==TRUE);
 
-               captive_vfs_object->corba_parentheart_fds_1=-1;
-               captive_vfs_object->corba_child_pid=-1;
+               captive_vfs_parent_object->corba_parentheart_fds_1=-1;
+               captive_vfs_parent_object->corba_child_pid=-1;
                sandbox_parent(
-                               captive_vfs_object->options.sandbox_server_ior, /* Vfs_IOR */
+                               CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_ior,      /* Vfs_IOR */
                                NULL,   /* child_chroot_pid_hashkey_dir */
-                               captive_vfs_object);    /* captive_vfs_object */
+                               captive_vfs_parent_object);     /* captive_vfs_parent_object */
                return TRUE;
                }
 
-       g_assert(captive_vfs_object->options.sandbox_server_argv!=NULL);
-       switch ((captive_vfs_object->corba_child_pid=fork())) {
+       g_assert(CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv!=NULL);
+       switch ((captive_vfs_parent_object->corba_child_pid=fork())) {
                case -1:        /* error */
                        g_return_val_if_reached(FALSE);
 
@@ -807,8 +847,8 @@ gboolean errbool;
 
                        captive_sandbox_fd_closeup(2 /* STDERR */ +1);
 
-                       execv(captive_vfs_object->options.sandbox_server_argv[0],
-                                       /* re-const */ (char * const *)captive_vfs_object->options.sandbox_server_argv);
+                       execv(CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv[0],
+                                       /* re-const */ (char * const *)CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv);
                        g_return_val_if_reached(FALSE);
                        } /* NOTREACHED */
 
@@ -827,16 +867,17 @@ gchar *child_chroot_pid_hashkey_dir;
                         * Currently I am not aware such case would occur.
                         */
                        g_return_val_if_fail(errint==0,FALSE);
-                       captive_vfs_object->corba_parentheart_fds_1=parentheart_fds[1];
+                       captive_vfs_parent_object->corba_parentheart_fds_1=parentheart_fds[1];
 
                        Vfs_IOR=sandbox_parent_read_ior(
                                        Vfs_IOR_fds[0], /* Vfs_IOR_fd_read */
-                                       &child_chroot_pid_hashkey_dir);
+                                       &child_chroot_pid_hashkey_dir,
+                                       captive_vfs_parent_object);
 
                        sandbox_parent(
                                        Vfs_IOR,        /* Vfs_IOR */
                                        child_chroot_pid_hashkey_dir,   /* child_chroot_pid_hashkey_dir */
-                                       captive_vfs_object);    /* captive_vfs_object */
+                                       captive_vfs_parent_object);     /* captive_vfs_parent_object */
 
                        g_free(Vfs_IOR);
                        g_free(child_chroot_pid_hashkey_dir);
@@ -850,15 +891,27 @@ gchar *child_chroot_pid_hashkey_dir;
 }
 
 
-GnomeVFSResult captive_sandbox_parent_return_from_CORBA_Environment(CORBA_Environment *evp)
+GnomeVFSResult captive_sandbox_parent_return_from_CORBA_Environment
+               (CORBA_Environment *evp,CaptiveVfsParentObject *captive_vfs_parent_object)
 {
 GnomeVFSResult r;
 
        if (evp->_major==CORBA_NO_EXCEPTION)
                return GNOME_VFS_OK;
 
-       if (evp->_major==CORBA_USER_EXCEPTION && !strcmp(ex_Captive_GnomeVFSResultException,CORBA_exception_id(evp)))
+       /* If !CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv it is CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_ior
+        * where we cannot do any restart anyway.
+        */
+       if (captive_vfs_parent_object && CAPTIVE_VFS_OBJECT(captive_vfs_parent_object)->options.sandbox_server_argv
+                       && (evp->_major==CORBA_SYSTEM_EXCEPTION && !strcmp(ex_CORBA_COMM_FAILURE,CORBA_exception_id(evp)))) {
+               r=GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE;
+               if (captive_vfs_parent_object->corba_Vfs_object!=CORBA_OBJECT_NIL)
+                       captive_vfs_parent_object_aborted(captive_vfs_parent_object);   /* errors ignored */
+               }
+       else if (evp->_major==CORBA_USER_EXCEPTION && !strcmp(ex_Captive_GnomeVFSResultException,CORBA_exception_id(evp))) {
                r=((Captive_GnomeVFSResultException *)CORBA_exception_value(evp))->gnome_vfs_result;
+               g_assert(r!=GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE);     /* code reserved for sandbox restarts */
+               }
        else {
                r=GNOME_VFS_ERROR_GENERIC;
                g_warning(_("CORBA Exception occured: id=\"%s\", value=%p"),
@@ -870,31 +923,6 @@ GnomeVFSResult r;
 }
 
 
-gboolean captive_sandbox_parent_query_vfs_retry(CORBA_Environment *evp,CaptiveVfsObject *captive_vfs_object)
-{
-GnomeVFSResult errvfsresult;
-gboolean want_retry;
-
-       g_return_val_if_fail(evp!=NULL,FALSE);
-       g_return_val_if_fail(captive_vfs_object!=NULL,FALSE);
-
-       /* If !captive_vfs_object->options.sandbox_server_argv it is captive_vfs_object->options.sandbox_server_ior
-        * where we cannot do any restart anyway.
-        */
-       want_retry=(captive_vfs_object->options.sandbox_server_argv
-                       && (evp->_major==CORBA_SYSTEM_EXCEPTION && !strcmp(ex_CORBA_COMM_FAILURE,CORBA_exception_id(evp))));
-       /* Never free 'evp' if returning as no-retry - 'evp' will be reevaluated by the caller! */
-       if (!want_retry)
-               return FALSE;   /* no retry */
-       CORBA_exception_free(evp);
-
-       captive_sandbox_parent_vfs_close(captive_vfs_object);   /* errors ignored */
-       errvfsresult=captive_sandbox_parent_vfs_new(captive_vfs_object);
-
-       return errvfsresult==GNOME_VFS_OK;      /* retry if restart succeeded */
-}
-
-
 void captive_sandbox_child_GnomeVFSResultException_throw(CORBA_Environment *evp,GnomeVFSResult errvfsresult)
 {
 Captive_GnomeVFSResultException *gnome_vfs_result_exception;