Fix Debian bug #544748 - document the correct defaults.

diff --git a/changelog b/changelog
index 05eecae4b9615d9aca208dafa90084861ff47e08..c08a4679fe32116714b3e187caaab2ece4ae1fa8 100644 (file)
--- a/changelog
+++ b/changelog
@@ -66,6 +66,9 @@ dma (0.0.2010.06.17-1) unstable; urgency=low
   * Fix the 25-unsupported-starttls patch to actually error out if the SSL
     negotiation fails.
   * Forward all the non-Debian-specific patches upstream to Simon Schubert.
+  * Add the 34-manpage-defaults patch to properly document what dma will use
+    as default values if not specified in the config file instead of what
+    the default config file specifies.  Closes: #544748
 
  -- Peter Pentchev <roam@ringlet.net>  Tue, 22 Jun 2010 10:46:53 +0300
 

diff --git a/patches/34-manpage-defaults.patch b/patches/34-manpage-defaults.patch
new file mode 100644 (file)
index 0000000..10be672
--- /dev/null
+++ b/patches/34-manpage-defaults.patch
@@ -0,0 +1,27 @@
+Description: Let the manpage document the real dma(8) defaults.
+ Correct the VIRTUSERTABLE and AUTHPATH default settings to reflect what
+ dma(8) will consider as defaults if not specified in the config file
+ instead of what the default config file specifies.
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/544748
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2010-06-23
+
+--- a/dma.8
++++ b/dma.8
+@@ -193,13 +193,13 @@
+ spool directory.
+ Just stick with the default.
+ .It Ic VIRTPATH Xo
+-(string, default=/etc/dma/virtusertable)
++(string, default=commented)
+ .Xc
+ Path to the
+ .Sq virtusertable
+ file.
+ .It Ic AUTHPATH Xo
+-(string, default=/etc/dma/auth.conf)
++(string, default=commented)
+ .Xc
+ Path to the
+ .Sq auth.conf

diff --git a/patches/series b/patches/series
index 47728ca289b3f9c4cc5ddd6edb12df8976031c49..a52e4e4a5cb97e8aba535b2f57a48a887b773cd4 100644 (file)
--- a/patches/series
+++ b/patches/series
@@ -15,3 +15,4 @@
 31-sigalrm-backoff.patch
 32-comment-uncomment.patch
 33-opportunistic-tls.patch
+34-manpage-defaults.patch