~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/admin.c: Don't automatically mark `knock' peers as ephemeral.
[tripe]
/
server
/
privsep.c
diff --git
a/server/privsep.c
b/server/privsep.c
index
56b22be
..
ffe6404
100644
(file)
--- a/
server/privsep.c
+++ b/
server/privsep.c
@@
-163,13
+163,13
@@
static void reap(int sig, void *p)
*
* Arguments: @int detachp@ = whether to detach the child from its terminal
*
*
* Arguments: @int detachp@ = whether to detach the child from its terminal
*
- * Returns:
---
+ * Returns:
Zero on success, @-1@ on failure.
*
* Use: Separates off the privileged tunnel-opening service from the
* rest of the server.
*/
*
* Use: Separates off the privileged tunnel-opening service from the
* rest of the server.
*/
-
void
ps_split(int detachp)
+
int
ps_split(int detachp)
{
pid_t kid;
int fd[2];
{
pid_t kid;
int fd[2];
@@
-178,7
+178,7
@@
void ps_split(int detachp)
if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd)) {
a_warn("PRIVSEP", "socketpair-create-failed", "?ERRNO", A_END);
if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd)) {
a_warn("PRIVSEP", "socketpair-create-failed", "?ERRNO", A_END);
-
exit(EXIT_FAILURE
);
+
return (-1
);
}
helper = getenv("TRIPE_PRIVHELPER");
if (!helper) helper = PRIVSEP_HELPER;
}
helper = getenv("TRIPE_PRIVHELPER");
if (!helper) helper = PRIVSEP_HELPER;
@@
-200,6
+200,7
@@
void ps_split(int detachp)
T( trace(T_PRIVSEP, "privsep: forked child successfully"); )
close(fd[0]);
pc_fd = fd[1];
T( trace(T_PRIVSEP, "privsep: forked child successfully"); )
close(fd[0]);
pc_fd = fd[1];
+ return (0);
}
/* --- @ps_quit@ --- *
}
/* --- @ps_quit@ --- *