commit c649655b96196a545730ebcbc6f8c2319e27775f from: Thomas Adam date: Tue Sep 10 15:35:27 2024 UTC portable: update for gotd-secrets commit - d128e1f1bff035422955db8ab3003aa3ff69e58e commit + c649655b96196a545730ebcbc6f8c2319e27775f blob - e97d0abc66e19425a0c943c92b7871805b724b76 blob + 4ba34b4a9cce1af6d3d9c04072dbcba32542e047 --- gotd/Makefile.am +++ gotd/Makefile.am @@ -62,6 +62,7 @@ gotd_SOURCES = gotd.c \ repo_imsg.c \ repo_read.c \ repo_write.c \ + secrets.c \ session_read.c \ session_write.c @@ -72,9 +73,9 @@ gotd_SOURCES += chroot-openbsd.c endif gotd_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a -EXTRA_DIST = gotd.8 gotd.conf.5 *.h +EXTRA_DIST = gotd.8 gotd.conf.5 gotd-secrets.conf.5 *.h -man5_MANS = gotd.conf.5 +man5_MANS = gotd.conf.5 gotd-secrets.conf.5 man8_MANS = gotd.8 LDADD = -L$(top_builddir)/compat -lopenbsd-compat -lm blob - c0e169b02c8fe6943adf8240cec97c1a03a69576 blob + acefa6519debfc5c87690b651960279456a9ac9d --- gotd/gotd.h +++ gotd/gotd.h @@ -21,6 +21,7 @@ #define GOTD_USER "_gotd" #define GOTD_CONF_PATH "/etc/gotd.conf" #define GOTD_SECRETS_PATH "/etc/gotd-secrets.conf" +#ifndef GOTD_EMPTY_PATH #define GOTD_EMPTY_PATH "/var/empty" #endif @@ -490,6 +491,7 @@ struct gotd_imsg_notify { /* Followed by username_len data bytes. */ }; +int enter_chroot(const char *); int parse_config(const char *, enum gotd_procid, struct gotd_secrets *, struct gotd *); struct gotd_repo *gotd_find_repo_by_name(const char *, struct gotd_repolist *); blob - 3407009d5a8a939edea8ac031e24af4b599e567c blob + 8d52aa065b596da2723e7e140aed6788e33ece2f --- gotd/secrets.c +++ gotd/secrets.c @@ -13,6 +13,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include "got_compat.h" #include #include