From 52c373e7f342b0c4cfe931165be78458c4c4b425 Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Fri, 24 Oct 2014 06:34:00 +0200
Subject: !fixup merge errors

---
 src/catlfish.erl | 1 +
 src/v1.erl       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/catlfish.erl b/src/catlfish.erl
index 66141d8..73066bb 100644
--- a/src/catlfish.erl
+++ b/src/catlfish.erl
@@ -4,6 +4,7 @@
 -module(catlfish).
 -export([add_chain/2, entries/2, entry_and_proof/2]).
 -export([known_roots/0, update_known_roots/0]).
+-include_lib("eunit/include/eunit.hrl").
 
 -define(PROTOCOL_VERSION, 0).
 
diff --git a/src/v1.erl b/src/v1.erl
index 4468f17..e51aacf 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -21,7 +21,7 @@ request(post, "ct/v1/add-chain", Input) ->
                         Roots = catlfish:known_roots(),
                         case x509:normalise_chain(Roots, [LeafCert|CertChain]) of
                             {ok, [Leaf | Chain]} ->
-                                catlfish:add_chain(Leaf, Chain);
+                                success(catlfish:add_chain(Leaf, Chain));
                             {Err, Msg} ->
                                 html("add-chain: ", [Msg, Err])
                         end;
@@ -30,7 +30,7 @@ request(post, "ct/v1/add-chain", Input) ->
                 end;
             _ -> html("add-chain: missing input: chain", Input)
         end,
-    success(R);
+    R;
 
 request(post, "ct/v1/add-pre-chain", _Input) ->
     niy();
-- 
cgit v1.1