oidentd: Allow the vserver host to forward connections.

diff --git a/etc/default/oidentd b/etc/default/oidentd
index 14bec1eb98ae0134830bc528b1bbf8d4c8dbb949..f807bd575e5a87496458460a79ee8ccdffc0171a 100644 (file)
--- a/etc/default/oidentd
+++ b/etc/default/oidentd
@@ -2,16 +2,19 @@
 # -m   lookup masquaraded connections in /etc/oidentd_masq.users
 # -f   forward requests for masquaraded connections to real host
 # -q   don't log connections to oidentd
+# -P    allow forwarded connectsions from this host. We use our own
+#       hostname here, since connections will be forwarded from oidentd
+#       on the vserver host. Those connections will appear to originate
+#       from our own (and only) IP address.
 # see oidentd(8) for detailed list
-OIDENT_OPTIONS="-mf"
+OIDENT_OPTIONS="-mf -P `hostname`"
 
 # user / group
 OIDENT_USER=oident
 OIDENT_GROUP=oident
 
 # Allow the default router to act as an oidentd proxy? (yes/no)
-# this is needed behind a masquarading router that runs oidentd -f
-# if your identd proxy is not the default router, you have to
-# manually specify it via -P
-OIDENT_BEHIND_PROXY=yes
+# Since the vserver stuff messes up this autodetection, we pass in -P
+# above instead.
+OIDENT_BEHIND_PROXY=no