diff options
| author | Corey Hulen <corey@hulen.com> | 2017-03-24 23:31:34 -0700 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2017-03-25 03:31:34 -0300 |
| commit | 54d3d47daf9190275bbdaf8703b84969a4593451 (patch) | |
| tree | 05899b296d0186c1a0da8a540bc486e34ad8eec9 /vendor/github.com/miekg/dns/zmsg.go | |
| parent | 7460302dec7796e01c98264e84bece8169cb6ed9 (diff) | |
| download | chat-54d3d47daf9190275bbdaf8703b84969a4593451.tar.gz chat-54d3d47daf9190275bbdaf8703b84969a4593451.tar.bz2 chat-54d3d47daf9190275bbdaf8703b84969a4593451.zip | |
PLT-6076 Adding viper libs for config file changes (#5871)
* Adding viper libs for config file changes
* Removing the old fsnotify lib
* updating some missing libs
Diffstat (limited to 'vendor/github.com/miekg/dns/zmsg.go')
| -rw-r--r-- | vendor/github.com/miekg/dns/zmsg.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vendor/github.com/miekg/dns/zmsg.go b/vendor/github.com/miekg/dns/zmsg.go index 94627e35e..9b98e1bb2 100644 --- a/vendor/github.com/miekg/dns/zmsg.go +++ b/vendor/github.com/miekg/dns/zmsg.go @@ -801,10 +801,12 @@ func (rr *NSEC3) pack(msg []byte, off int, compression map[string]int, compress if err != nil { return off, err } - if rr.Salt == "-" { /* do nothing, empty salt */ - } - if err != nil { - return off, err + // Only pack salt if value is not "-", i.e. empty + if rr.Salt != "-" { + off, err = packStringHex(rr.Salt, msg, off) + if err != nil { + return off, err + } } off, err = packUint8(rr.HashLength, msg, off) if err != nil { @@ -844,10 +846,12 @@ func (rr *NSEC3PARAM) pack(msg []byte, off int, compression map[string]int, comp if err != nil { return off, err } - if rr.Salt == "-" { /* do nothing, empty salt */ - } - if err != nil { - return off, err + // Only pack salt if value is not "-", i.e. empty + if rr.Salt != "-" { + off, err = packStringHex(rr.Salt, msg, off) + if err != nil { + return off, err + } } rr.Header().Rdlength = uint16(off - headerEnd) return off, nil |