From 3d8641ed923bb15b5b7df46c5527255a77ac2902 Mon Sep 17 00:00:00 2001 From: Martin Dosch Date: Sun, 7 Aug 2022 17:04:52 +0200 Subject: [PATCH] Detect CNAME loops. --- go.mod | 4 ++++ go.sum | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/go.mod b/go.mod index 5cbbe6e..c01a557 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,11 @@ require ( github.com/gabriel-vasile/mimetype v1.4.1 github.com/mattn/go-xmpp v0.0.0-20220712221724-2eb234970ce7 github.com/pborman/getopt/v2 v2.1.0 +<<<<<<< HEAD salsa.debian.org/mdosch/xmppsrv v0.2.4-0.20220805135559-06e33f896377 +======= + salsa.debian.org/mdosch/xmppsrv v0.2.4-0.20220805103359-a4af5de5dcc0 +>>>>>>> 3058cff (Detect CNAME loops.) ) require ( diff --git a/go.sum b/go.sum index ff0c59e..0a57338 100644 --- a/go.sum +++ b/go.sum @@ -86,5 +86,10 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +<<<<<<< HEAD salsa.debian.org/mdosch/xmppsrv v0.2.1 h1:gYzHqTCX3ETwaOFxfdGrtN0F0ohtEinAmBxcw1FcFi4= salsa.debian.org/mdosch/xmppsrv v0.2.1/go.mod h1:udWXnWFa9zkcyN9YSB/u44BCnnRDpeQ0eDy3MVLjHZQ= +======= +salsa.debian.org/mdosch/xmppsrv v0.2.4-0.20220805103359-a4af5de5dcc0 h1:5K+ZGRTIdWVb5hvGwYvDCGVippxkQNwgPZ5lTosDLuI= +salsa.debian.org/mdosch/xmppsrv v0.2.4-0.20220805103359-a4af5de5dcc0/go.mod h1:udWXnWFa9zkcyN9YSB/u44BCnnRDpeQ0eDy3MVLjHZQ= +>>>>>>> 3058cff (Detect CNAME loops.)