/* -*-c-*-
*
- * $Id: exec.c,v 1.6 2002/02/22 23:43:32 mdw Exp $
+ * $Id: exec.c,v 1.9 2004/04/08 01:36:25 mdw Exp $
*
* Source and target for executable programs
*
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: exec.c,v $
- * Revision 1.6 2002/02/22 23:43:32 mdw
- * Call @xfree@ rather than @free@.
- *
- * 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"
/* --- 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);
/* --- 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);
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);
/* --- Now try resource limit settings --- */
+#ifdef HAVE_SETRLIMIT
if (rlimit_option(&xo->xl, sc))
CONF_ACCEPT;
+#endif
/* --- And then environment settings --- */
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 --- */
token(sc);
argc++;
}
+ conf_undelim(sc, 0, 0);
/* --- Expect the closing `]' --- */
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 -------------------------------------------------*/