[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.5-11-g26d6f49

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 26d6f496a1e97063318972c24c754ab93d5d2fa0
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Jul 22 18:06:32 2009 +0200

    configuration asks also if 'smtptls' is needed or not; thanks to Jerome Reybert for the report; Closes: #538021

diff --git a/bin/reportbug b/bin/reportbug
index 6c0e2d9..b588d1b 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -533,6 +533,10 @@ def offer_configuration(options):
     else:
         smtpuser = ''
 
+    if smtphost:
+        smtptls = ui.yes_no(
+            'Does your SMTP host require TLS authentication?', 'Yes', 'No', default=False)
+
     http_proxy = ui.get_string(
        'Please enter the name of your proxy server.  It should only '
        'use this parameter if you are behind a firewall. '
@@ -603,6 +607,12 @@ def offer_configuration(options):
             print >> fp, '# If you need to enter a user name and password:'
             print >> fp, '#smtpuser "my username here"'
             print >> fp, '#smtppasswd "my password here"'
+        if smtptls:
+            print >> fp, '# Enable TLS for the SMTP host'
+            print >> fp, 'smtptls'
+        else:
+            print >> fp, '# Enable this option if you need TLS for the SMTP host'
+            print >> fp, '#smtptls'
 
     if http_proxy:
         print >> fp, '# Your proxy server address'
diff --git a/debian/changelog b/debian/changelog
index 978ee2b..4678ff4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ reportbug (4.6) UNRELEASED; urgency=low
       Closes: #537449
     - do not exit if no subject is entered for additional information, but keep
       asking it; thanks to Carl Chenet for the report and patch: Closes: #537624
+    - configuration asks also if 'smtptls' is needed or not; thanks to Jerome
+      Reybert for the report; Closes: #538021
 
- -- Sandro Tosi <morph at debian.org>  Mon, 20 Jul 2009 15:45:40 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 22 Jul 2009 18:05:30 +0200
 
 reportbug (4.5) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution