From 6d2cbd77f8834537284dc58bd43537bd100d7322 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 11 May 2013 16:49:39 -0400
Subject: [PATCH] Sync

- Added task server details to the 'diagnostics' command output.
- Added new configuration variables to the 'show' command.
- rc.taskd.server specifies host:port of the task server.
- rc.taskd.credentials specifies user credentials for the task server.
- rc.taskd.certificate specifies the task server certificate.
- rc.debug.tls shows TLS log information, for debugging.
---
 ChangeLog                       | 2 +-
 NEWS                            | 5 ++++-
 src/commands/CmdDiagnostics.cpp | 4 ++++
 src/commands/CmdShow.cpp        | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 087eaec08..bdd572790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,7 @@ Features
  + #1256 Supports default values for UDA fields (thanks to Thomas Sullivan).
  + Stores un-synched transactions in <data.location>/backlog.data.
  + Adds a new 'synchronize' command to sync data with a task server.
- + Adds a new 'sync' verbosity token, which will reminds when a backlog builds
+ + Adds a new 'sync' verbosity token, which will remind when a backlog builds
    up and needs a sync.
  + Supports IPv4 and IPv6 server addresses.
  + Began fr-FR localization.
diff --git a/NEWS b/NEWS
index 4e0cce091..a89b744f5 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,10 @@ New commands in taskwarrior 2.3.0
 
 New configuration options in taskwarrior 2.3.0
 
-  - 
+  - 'taskd.server' specifies host:port of the task server.
+  - 'taskd.credentials' specifies user credentials for the task server.
+  - 'taskd.certificate' specifies the task server certificate.
+  - 'debug.tls' shows TLS log information, for debugging.
 
 Newly deprecated features in taskwarrior 2.3.0
   
diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp
index 54620b378..a49a6e577 100644
--- a/src/commands/CmdDiagnostics.cpp
+++ b/src/commands/CmdDiagnostics.cpp
@@ -217,6 +217,10 @@ int CmdDiagnostics::execute (std::string& output)
       << context.config.get ("taskd.server")
       << "\n";
 
+  out << "       Cert: "
+      << context.config.get ("taskd.certificate")
+      << "\n";
+
   out << "    Locking: "
       << (context.config.getBoolean ("locking")
            ? STRING_CMD_DIAG_ENABLED
diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp
index 04c3187c8..0d8cc3225 100644
--- a/src/commands/CmdShow.cpp
+++ b/src/commands/CmdShow.cpp
@@ -133,6 +133,7 @@ int CmdShow::execute (std::string& output)
     " dateformat.info"
     " dateformat.report"
     " debug"
+    " debug.tls"
     " default.command"
     " default.due"
     " default.priority"
@@ -187,6 +188,7 @@ int CmdShow::execute (std::string& output)
     " shell.prompt"
     " tag.indicator"
     " taskd.server"
+    " taskd.certificate"
     " taskd.credentials"
     " undo.style"
     " urgency.active.coefficient"