Build the mail proxies and FTP only when they are asked for

pop3p, imapp and smtpp are built with MAILPROXY=true, and ftppr and the
ftp:// scheme of the HTTP proxy with FTP=true; with CMake the switches are
3PROXY_USE_MAILPROXY and 3PROXY_USE_FTP. Neither is in a default build, and
the standalone binaries follow what was built.

A configuration naming one of them is still read either way. The three mail
protocols amount to a STARTTLS negotiation now that mail is carried over
TLS, so without a proxy of their own those names are tlspr speaking the
protocol: the file holds a stand-in which sets the protocol for the
connection and returns tlspr for the caller to run, which serves the
service name and a parent chain alike and leaves conf.c and the redirect
table untouched. FTP has no such fallback, so the service is known, answers
nothing and logs the refusal.

The Linux workflow builds both, so all of it is still compiled and run.
This commit is contained in:
Vladimir Dubrovin 2026-08-29 23:39:07 +03:00
parent d3b23ee1d9
commit f2ae920db2
17 changed files with 171 additions and 11 deletions

View file

@ -27,7 +27,7 @@ jobs:
if: ${{ startsWith(matrix.target, 'ubuntu') }}
run: sudo apt-get update && sudo apt-get install -y libssl-dev libpam-dev libpcre2-dev
- name: make
run: make -f Makefile.Linux
run: make -f Makefile.Linux MAILPROXY=true FTP=true
- name: regression tests
run: python3 tests/run.py
- name: mkdir