summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--doc/proxsmtpd.conf3
-rw-r--r--doc/proxsmtpd.conf.54
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9169d7f..38fa087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
1.0 ?????
+ - Added XCLIENT support.
+ - Drop XCLIENT and XFORWARD commands coming in from clients for security.
- Added big scary warnings to the sample scripts about escaping variables.
- Documentation fixes [Olivier Beyssac]
diff --git a/doc/proxsmtpd.conf b/doc/proxsmtpd.conf
index b963c8b..8c9d60a 100644
--- a/doc/proxsmtpd.conf
+++ b/doc/proxsmtpd.conf
@@ -31,6 +31,9 @@ OutAddress: 10026
# Keep Alives (ie: NOOP's to server)
#KeepAlives: 0
+# Send XCLIENT commands to receiving server
+#XClient: off
+
# Address to listen on (defaults to all local addresses on port 10025)
#Listen: 0.0.0.0:10025
diff --git a/doc/proxsmtpd.conf.5 b/doc/proxsmtpd.conf.5
index 436da7f..77480e3 100644
--- a/doc/proxsmtpd.conf.5
+++ b/doc/proxsmtpd.conf.5
@@ -123,6 +123,10 @@ The user to run as. If this option is specified then
.Xr proxsmtpd 8
must be started as root. It will then drop root privileges and run as the
specified user. The user can either be a name or a numerical user id.
+.It Ar XClient
+Send an XCLIENT command to the receiving server. This is useful for forwarding
+client addresses and connection info to servers that support this feature.
+[ Default: off ]
.El
.Sh ADDRESSES
Addresses can be specified in multiple formats: