1 files changed, 9 insertions, 8 deletions

diff --git a/src/v1.erl b/src/v1.erl
index 86cd799..bab77aa 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -156,8 +156,8 @@ add_ds(Input) ->
             case decode_chain(List) of
                 {invalid, ErrText} ->
                     err400(io:format("add-ds-rr: ~p", [ErrText]), List);
-                [DSRR, DSRRSIG | SupportRRs] ->
-                    add_ds_helper(DSRR, DSRRSIG, SupportRRs);
+                Data when is_list(Data) ->
+                    add_ds_helper(Data);
                 _ ->
                     err400("add-ds-rr: missing one or more entries", List)
             end;
@@ -173,10 +173,11 @@ decode_chain(List) ->
             L
     end.
 
-add_ds_helper(DSRR, DSRRSIG, Support) ->
-    case dnssecport:dnssec_validate([DSRR, DSRRSIG], Support) of
-        ok ->
-            success(catlfish:add_chain(DSRR, [DSRRSIG | Support], normal));
-        _ ->
-            err400("add-ds-rr: invalid DS record", [DSRR, DSRRSIG | Support])
+add_ds_helper(Data) ->
+    case dnssecport:dnssec_validate(Data) of
+        {ok, [DS | Chain]} ->
+            success(catlfish:add_chain(DS, Chain, normal));
+        {error, ErrorCode} ->
+            err400(io:format("add-ds-rr: invalid DS record: ~p", [ErrorCode]),
+                  Data)
     end.