prosody
7c71c6eb29a6
net/dns.lua
Software / code / prosody
Comparison
net/dns.lua @ 9953:7c71c6eb29a6
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 13 Apr 2019 18:23:02 +0200 |
| parent | 9952:6402bc76f51a |
| child | 10664:c2b79b44ded7 |
comparison
equal
deleted
inserted
replaced
| 9951:f1594893998f | 9953:7c71c6eb29a6 |
|---|---|
| 702 if ip then | 702 if ip then |
| 703 self:addnameserver(ip.addr); | 703 self:addnameserver(ip.addr); |
| 704 end | 704 end |
| 705 end | 705 end |
| 706 end | 706 end |
| 707 resolv_conf:close(); | |
| 707 end | 708 end |
| 708 if not self.server or #self.server == 0 then | 709 if not self.server or #self.server == 0 then |
| 709 -- TODO log warning about no nameservers, adding localhost as the default nameserver | 710 -- TODO log warning about no nameservers, adding localhost as the default nameserver |
| 710 self:addnameserver("127.0.0.1"); | 711 self:addnameserver("127.0.0.1"); |
| 711 end | 712 end |
