X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/c511e1f925da3e735fb494d522ae3ae0f17ab9ce..179d81291e52ac1a163f404adaaa6b156aace11e:/server/tripe.c?ds=sidebyside diff --git a/server/tripe.c b/server/tripe.c index dd385fbd..f9cf0e86 100644 --- a/server/tripe.c +++ b/server/tripe.c @@ -96,10 +96,7 @@ static void usage(FILE *fp) [-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n"); } -static void version(FILE *fp) -{ - pquis(fp, "$, version " VERSION "\n"); -} +static void version(FILE *fp) { pquis(fp, "$, version " VERSION "\n"); } static void help(FILE *fp) { @@ -155,6 +152,8 @@ int main(int argc, char *argv[]) if ((p = getenv("TRIPEDIR")) != 0) dir = p; + if ((p = getenv("TRIPESOCK")) != 0) + csock = p; tun_default = tunnels[0]; for (;;) { @@ -331,7 +330,7 @@ int main(int argc, char *argv[]) km_init(kr_priv, kr_pub, tag_priv); a_init(csock); if (f & f_daemon) { - if (u_daemon()) + if (daemonize()) die(EXIT_FAILURE, "couldn't become a daemon: %s", strerror(errno)); a_daemon(); }