diff options
| author | Raimo Niskanen <[email protected]> | 2014-09-10 12:19:44 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2014-09-10 12:19:44 +0200 |
| commit | 45f9f2051a1c8fd18be13442a7f12bea7d84a911 (patch) | |
| tree | 0b8e8102415512a446224da44d8ea2b4fa998b7a /lib/snmp/src/misc/snmp_conf.erl | |
| parent | 92b58b6bc5ff7af222d481811bd496cc7723c77e (diff) | |
| parent | 7af44569ffe0b453761fcd7d45a0408d523c5195 (diff) | |
| download | otp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.tar.gz otp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.tar.bz2 otp-45f9f2051a1c8fd18be13442a7f12bea7d84a911.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/snmp/src/misc/snmp_conf.erl')
| -rw-r--r-- | lib/snmp/src/misc/snmp_conf.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl index f4483995cb..153c8070c2 100644 --- a/lib/snmp/src/misc/snmp_conf.erl +++ b/lib/snmp/src/misc/snmp_conf.erl @@ -749,8 +749,6 @@ which_domain({A0, A1, A2, A3, A4, A5, A6, A7}) %% --------- -mk_addr_string({_IP, Port} = Addr) when is_integer(Port) -> - mk_addr_string({snmpUDPDomain, Addr}); mk_addr_string({Domain, Addr}) when is_atom(Domain) -> %% XXX There is only code for IP domains here case check_address_ip(Domain, Addr) of @@ -768,7 +766,11 @@ mk_addr_string({Domain, Addr}) when is_atom(Domain) -> mk_addr_string_ntoa(Domain, Addr); IP -> mk_addr_string_ntoa(Domain, IP) - end. + end; +mk_addr_string({_IP, Port} = Addr) when is_integer(Port) -> + mk_addr_string({snmpUDPDomain, Addr}); +mk_addr_string(Strange) -> + lists:flatten(io_lib:format("~w", [Strange])). mk_addr_string_ntoa({_, _, _, _} = IP) -> |