diff options
author | ulfvonbelow <striness@tilde.club> | 2023-02-02 19:29:52 +0000 |
---|---|---|
committer | Dale Mellor <mcron-lsfnyl@rdmp.org> | 2023-03-18 14:00:26 +0000 |
commit | 4727c770c2a723d46b4162cff21ab8f0b75c3998 (patch) | |
tree | 5cdd3a6c110d60d96892032b05edb60f0a77271c /Makefile.am | |
parent | 2ff4d0f44ec21332d13de8d8ab8c39c77450ff7d (diff) | |
download | mcron-4727c770c2a723d46b4162cff21ab8f0b75c3998.tar.gz mcron-4727c770c2a723d46b4162cff21ab8f0b75c3998.tar.bz2 mcron-4727c770c2a723d46b4162cff21ab8f0b75c3998.zip |
crontab-access: replace with wrapper, rename to crontab-access-real.
The wrapper has two purposes:
1. Not being a script, thereby eliminating the issues with setuid scripts.
2. Purging the environment. crontab-access-real has no need for any
environment variables to do its work, so to prevent tampering with dynamic
linker, libc, or guile, we may as well just unset them all.
This wrapper does introduce a requirement for a C compiler. Ideally it would
be conditional based on whether the wrapper is even going to be built, but
autoconf doesn't like that one bit. Someone with more experience with
autotools should sort that out. In the meantime I guess anyone wanting to
build without a C compiler being present is going to have to edit configure.ac
and re-run bootstrap.
* src/crontab-access.in: renamed to src/crontab-access-real.in
* src/crontab-access.c.in: new file, wrapper for crontab-access-real.
* Makefile.am: inform about crontab-access.c.in and name change to
crontab-access-real. Put crontab-access-real in libexecdir.
Diffstat (limited to 'Makefile.am')
-rwxr-xr-x | Makefile.am | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 4aff2ae..2a87d72 100755 --- a/Makefile.am +++ b/Makefile.am @@ -26,11 +26,18 @@ noinst_SCRIPTS = if MULTI_USER bin_SCRIPTS += bin/crontab -sbin_SCRIPTS = bin/cron bin/crontab-access +sbin_SCRIPTS = bin/cron +libexec_SCRIPTS = bin/crontab-access-real +sbin_PROGRAMS = bin/crontab-access else -noinst_SCRIPTS += bin/cron bin/crontab bin/crontab-access +noinst_SCRIPTS += bin/cron bin/crontab bin/crontab-access-real +noinst_PROGRAMS = bin/crontab-access endif +# The dynamic linker should detect that it's being run for a setuid program, +# but we take no chances. +bin_crontab_access_LDFLAGS = -static + # wrapper to be used in the build environment and for running tests. noinst_SCRIPTS += pre-inst-env @@ -81,6 +88,8 @@ compiled_modules = \ CLEANFILES = $(compiled_modules) \ bin/crontab \ bin/crontab-access \ + src/crontab-access.c \ + bin/crontab-access-real \ bin/cron \ bin/mcron DISTCLEANFILES = src/mcron/config.scm @@ -123,6 +132,9 @@ do_subst = sed -e 's,%PREFIX%,${prefix},g' \ src/mcron/config.scm: src/mcron/config.scm.in Makefile $(AM_V_GEN)$(do_subst) $< > $@ +src/crontab-access.c: src/crontab-access.c.in Makefile + $(AM_V_GEN)$(do_subst) $< > $@ + bin/% : src/%.in Makefile $(AM_V_GEN)$(MKDIR_P) bin ; \ $(do_subst) $< > $@ ; \ @@ -163,7 +175,8 @@ EXTRA_DIST = \ HACKING \ src/cron.in \ src/crontab.in \ - src/crontab-access.in \ + src/crontab-access-real.in \ + src/crontab-access.c.in \ src/mcron.in \ tests/init.sh \ $(TESTS) |