X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/f00786b95788b67ab6afec0f825edeb6f53c80c3..a9bd543ab4ebe415bca9d6f27b90f16ddac79bc0:/exec.c diff --git a/exec.c b/exec.c index 28c9cd8..f7c96ef 100644 --- a/exec.c +++ b/exec.c @@ -1,13 +1,11 @@ /* -*-c-*- * - * $Id: exec.c,v 1.5 2002/01/13 14:49:03 mdw Exp $ - * * Source and target for executable programs * * (c) 1999 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the `fw' port forwarder. * @@ -15,91 +13,18 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * `fw' 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 * along with `fw'; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: exec.c,v $ - * Revision 1.5 2002/01/13 14:49:03 mdw - * Track @lbuf@ changes in mLib. - * - * Revision 1.4 2001/02/03 20:30:03 mdw - * Support re-reading config files on SIGHUP. - * - * Revision 1.3 2000/07/01 11:28:52 mdw - * Use new mLib selbuf features. - * - * Revision 1.2 1999/10/22 22:46:17 mdw - * When a non-file endpoint is attached to a file, keep the file endpoint - * open until the nonfile is done. This stops socket sources from - * resetting their connection limits too early. - * - * Revision 1.1 1999/07/26 23:33:32 mdw - * New sources and targets. - * - */ - -/*----- Header files ------------------------------------------------------*/ - -#include "config.h" - -#define _GNU_SOURCE - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#ifdef HAVE_SETRLIMIT -# include -#endif - -#ifndef DECL_ENVIRON - extern char **environ; -#endif - -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "conf.h" -#include "endpt.h" -#include "exec.h" -#include "fattr.h" #include "fw.h" -#include "reffd.h" -#include "scan.h" -#include "source.h" -#include "target.h" /*----- Data structures ---------------------------------------------------*/ @@ -474,9 +399,9 @@ static void xenv_destroy(xenv *xe) while (xe) { xenv *xxe = xe; xe = xe->next; - free(xxe->name); + xfree(xxe->name); if (xxe->value) - free(xxe->value); + xfree(xxe->value); DESTROY(xxe); } } @@ -497,7 +422,7 @@ static void x_tidy(xargs *xa, xopts *xo) { xa->ref--; if (!xa->ref) - free(xa); + xfree(xa); xo->ref--; if (!xo->ref) { @@ -588,7 +513,7 @@ static void xept_attach(endpt *e, reffd *in, reffd *out) /* --- Set group id --- */ - if (xo->gid != -1) { + if (xo->gid != (gid_t)-1) { if (setgid(xo->gid)) { moan("couldn't set gid %i: %s", xo->gid, strerror(errno)); _exit(1); @@ -602,7 +527,7 @@ static void xept_attach(endpt *e, reffd *in, reffd *out) /* --- Set uid --- */ - if (xo->uid != -1) { + if (xo->uid != (uid_t)-1) { if (setuid(xo->uid)) { moan("couldn't set uid %i: %s", xo->uid, strerror(errno)); _exit(1); @@ -703,7 +628,7 @@ static void xept_destroy(xept *xe) else xept_list = xe->next; - free(xe->desc); + xfree(xe->desc); if (xe->f) xe->f->ops->close(xe->f); x_tidy(xe->xa, xe->xo); @@ -784,7 +709,9 @@ static endpt_ops xept_ops = { xept_attach, xept_file, 0, xept_close }; void exec_init(void) { +#ifdef HAVE_SETRLIMIT rlimit_get(&exec_opts.xl); +#endif sig_add(&xept_sig, SIGCHLD, xept_chld, 0); sym_create(&env); env_import(&env, environ); @@ -834,7 +761,7 @@ static int exec_option(xdata *x, scanner *sc) /* --- Set a chroot prison --- */ if (strcmp(sc->d.buf, "root") == 0 || - strcmp(sc->d.buf, "chroot") == 0) { + strcmp(sc->d.buf, "chroot") == 0) { dstr d = DSTR_INIT; token(sc); if (sc->t == '=') @@ -889,8 +816,10 @@ static int exec_option(xdata *x, scanner *sc) /* --- Now try resource limit settings --- */ +#ifdef HAVE_SETRLIMIT if (rlimit_option(&xo->xl, sc)) CONF_ACCEPT; +#endif /* --- And then environment settings --- */ @@ -968,8 +897,12 @@ static void exec_read(xdata *x, scanner *sc) char *p, *q; char **v; - /* --- Strip off the leading `[' --- */ + /* --- Strip off the leading `[' --- * + * + * Allow various handy filename characters to be entered without quoting. + */ + conf_undelim(sc, "=:/.", "=:/."); token(sc); /* --- Read a sequence of arguments --- */ @@ -979,6 +912,7 @@ static void exec_read(xdata *x, scanner *sc) token(sc); argc++; } + conf_undelim(sc, 0, 0); /* --- Expect the closing `]' --- */ @@ -1115,7 +1049,7 @@ tidy: static void xsource_destroy(source *s) { xsource *xs = (xsource *)s; - free(xs->s.desc); + xfree(xs->s.desc); exec_destroy(&xs->x); DESTROY(xs); } @@ -1169,7 +1103,7 @@ static endpt *xtarget_create(target *t, const char *desc) static void xtarget_destroy(target *t) { xtarget *xt = (xtarget *)t; - free(xt->t.desc); + xfree(xt->t.desc); exec_destroy(&xt->x); DESTROY(xt); } @@ -1178,7 +1112,7 @@ static void xtarget_destroy(target *t) target_ops xtarget_ops = { "exec", - xtarget_option, xtarget_read, xtarget_create, xtarget_destroy + xtarget_option, xtarget_read, 0, xtarget_create, xtarget_destroy }; /*----- That's all, folks -------------------------------------------------*/