Update config files from newer upstream versions. (LP:704220)

debian/pptpd-options

@@ -13,7 +13,7 @@
 
 # Authentication
 
-# Name of the local system for authentication purposes 
+# Name of the local system for authentication purposes
 # (must match the second field in /etc/ppp/chap-secrets entries)
 name pptpd
 
@@ -26,8 +26,11 @@ name pptpd
 
 
 # Encryption
-# Debian: on systems with a kernel built with the package
-# kernel-patch-mppe >= 2.4.2 and using ppp >= 2.4.2, ...
+# (There have been multiple versions of PPP with encryption support,
+# choose with of the following sections you will use.)
+
+
+# BSD licensed ppp-2.4.2 upstream with MPPE only, kernel module ppp_mppe.o
 # {{{
 refuse-pap
 refuse-chap
@@ -71,6 +74,15 @@ require-mppe-128
 # packets to the clients -- James Cameron)
 proxyarp
 
+# Normally pptpd passes the IP address to pppd, but if pptpd has been
+# given the delegate option in pptpd.conf or the --delegate command line
+# option, then pppd will use chap-secrets or radius to allocate the
+# client IP address.  The default local IP address used at the server
+# end is often the same as the address of the server.  To override this,
+# specify the local IP address here.
+# (you must not use this unless you have used the delegate option)
+#10.8.0.100
+
 # Debian: do not replace the default route
 nodefaultroute
 
@@ -93,4 +105,18 @@ nodefaultroute
 lock
 
 # Disable BSD-Compress compression
-nobsdcomp 
+nobsdcomp
+
+# Disable Van Jacobson compression
+# (needed on some networks with Windows 9x/ME/XP clients, see posting to
+# poptop-server on 14th April 2005 by Pawel Pokrywka and followups,
+# http://marc.theaimsgroup.com/?t=111343175400006&r=1&w=2 )
+novj
+novjccomp
+
+# turn off logging to stderr, since this may be redirected to pptpd,
+# which may trigger a loopback
+nologfd
+
+# put plugins here
+# (putting them higher up may cause them to sent messages to the pty)

debian/pptpd.conf

@@ -43,10 +43,30 @@ logwtmp
 #
 #bcrelay eth1
 
+# TAG: delegate
+#	Delegates the allocation of client IP addresses to pppd.
+#
+#       Without this option, which is the default, pptpd manages the list of
+#       IP addresses for clients and passes the next free address to pppd.
+#       With this option, pptpd does not pass an address, and so pppd may use
+#       radius or chap-secrets to allocate an address.
+#
+#delegate
+
+# TAG: connections
+#       Limits the number of client connections that may be accepted.
+#
+#       If pptpd is allocating IP addresses (e.g. delegate is not
+#       used) then the number of connections is also limited by the
+#       remoteip option.  The default is 100.
+#connections 100
+
 # TAG: localip
 # TAG: remoteip
 #	Specifies the local and remote IP address ranges.
 #
+#	These options are ignored if delegate option is set.
+#
 #       Any addresses work as long as the local machine takes care of the
 #       routing.  But if you want to use MS-Windows networking, you should
 #       use IP addresses out of the LAN address space and use the proxyarp
@@ -61,9 +81,9 @@ logwtmp
 #
 #	1. No spaces are permitted between commas or within addresses.
 #
-#	2. If you give more IP addresses than MAX_CONNECTIONS, it will
-#	   start at the beginning of the list and go until it gets 
-#	   MAX_CONNECTIONS IPs. Others will be ignored.
+#	2. If you give more IP addresses than the value of connections,
+#	   it will start at the beginning of the list and go until it
+#	   gets connections IPs.  Others will be ignored.
 #
 #	3. No shortcuts in ranges! ie. 234-8 does not mean 234 to 238,
 #	   you must type 234-238 if you mean this.