Mercurial > prosody-hg
comparison plugins/mod_admin_telnet.lua @ 6312:1940a014aeca
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:01:57 +0100 |
| parents | 6986ca575568 f44876548487 |
| children | 8bd486b6e5ec 57d23c26039b |
comparison
equal
deleted
inserted
replaced
| 6306:c6d9e21cd5f2 | 6312:1940a014aeca |
|---|---|
| 1071 adns.lookup(handler, name, typ, class); | 1071 adns.lookup(handler, name, typ, class); |
| 1072 return true, ret; | 1072 return true, ret; |
| 1073 end | 1073 end |
| 1074 | 1074 |
| 1075 function def_env.dns:addnameserver(...) | 1075 function def_env.dns:addnameserver(...) |
| 1076 dns.addnameserver(...) | 1076 dns._resolver:addnameserver(...) |
| 1077 return true | 1077 return true |
| 1078 end | 1078 end |
| 1079 | 1079 |
| 1080 function def_env.dns:setnameserver(...) | 1080 function def_env.dns:setnameserver(...) |
| 1081 dns.setnameserver(...) | 1081 dns._resolver:setnameserver(...) |
| 1082 return true | 1082 return true |
| 1083 end | 1083 end |
| 1084 | 1084 |
| 1085 function def_env.dns:purge() | 1085 function def_env.dns:purge() |
| 1086 dns.purge() | 1086 dns.purge() |
