X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=slip.c;h=a75d50e5cab805f546a0e4eb7a06951ec83fd059;hp=4c0cac12ee635685ea9e7a1085cd884767cb2d51;hb=59a5b098bd17ae3202115e3436343ec6e58da1fb;hpb=ba703386fd742f46f83430a7c48a9bfe53167eae

diff --git a/slip.c b/slip.c
index 4c0cac1..a75d50e 100644
--- a/slip.c
+++ b/slip.c
@@ -3,6 +3,25 @@
    just whole packets.  When transmitting we need to bytestuff anyway,
    and may be part-way through receiving. */
 
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version d of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
 #include "secnet.h"
 #include "util.h"
 #include "netlink.h"
@@ -273,8 +292,6 @@ static void userv_entry(void *sst)
     dup2(st->out,1);
 
     setsid();
-    /* XXX We really should strdup() all of argv[] but because we'll just
-       exit anyway if execvp() fails it doesn't seem worth bothering. */
     execvp(st->path,(char *const*)st->argv);
     perror("userv-entry: execvp()");
     exit(1);
@@ -385,6 +402,9 @@ static void userv_invoke_userv(struct userv *st)
     }
     setnonblock(st->txfd);
     setnonblock(st->rxfd);
+
+    add_hook(PHASE_CHILDPERSIST,childpersist_closefd_hook,&st->txfd);
+    add_hook(PHASE_CHILDPERSIST,childpersist_closefd_hook,&st->rxfd);
 }
 
 static void userv_kill_userv(struct userv *st)
@@ -418,7 +438,7 @@ static list_t *userv_apply(closure_t *self, struct cloc loc, dict_t *context,
     item_t *item;
     dict_t *dict;
 
-    st=safe_malloc(sizeof(*st),"userv_apply");
+    NEW(st);
 
     /* First parameter must be a dict */
     item=list_elem(args,0);