X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/b0805b27d5bd10b44106a3aa3dd9e99d58aeaaf7..9df1a2f2b4e3af5e03f85aebea94e25d46231bf4:/exec.c

diff --git a/exec.c b/exec.c
index 1f0102b..60d1785 100644
--- a/exec.c
+++ b/exec.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: exec.c,v 1.6 2002/02/22 23:43:32 mdw Exp $
+ * $Id: exec.c,v 1.8 2003/11/29 20:36:07 mdw Exp $
  *
  * Source and target for executable programs
  *
@@ -29,6 +29,14 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: exec.c,v $
+ * Revision 1.8  2003/11/29 20:36:07  mdw
+ * Privileged outgoing connections.
+ *
+ * Revision 1.7  2003/01/24 20:12:26  mdw
+ * Correctly cast uid and gid sentinel values.  Parse full filenames in
+ * exec arguments (can't do it for program, unfortunately, since the die is
+ * cast).
+ *
  * Revision 1.6  2002/02/22 23:43:32  mdw
  * Call @xfree@ rather than @free@.
  *
@@ -591,7 +599,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);
@@ -605,7 +613,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);
@@ -787,7 +795,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);
@@ -892,8 +902,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 --- */
 
@@ -971,8 +983,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 --- */
@@ -982,6 +998,7 @@ static void exec_read(xdata *x, scanner *sc)
       token(sc);
       argc++;
     }
+    conf_undelim(sc, 0, 0);
 
     /* --- Expect the closing `]' --- */
 
@@ -1181,7 +1198,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 -------------------------------------------------*/