diff options
author | Zandra Hird <[email protected]> | 2015-05-06 13:01:07 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-05-06 13:01:07 +0200 |
commit | 0440e0e45835de5adbe790f9437492d734c6c4e1 (patch) | |
tree | 978ff1a48ae243e69fca96cce5eb2654b66c8076 /lib/snmp/src/manager | |
parent | 83ff5ec3ced8ce1c456bfdf75fcbf5be01385388 (diff) | |
parent | efbfe9602983ff451b864e557bdf3733222b78ba (diff) | |
download | otp-0440e0e45835de5adbe790f9437492d734c6c4e1.tar.gz otp-0440e0e45835de5adbe790f9437492d734c6c4e1.tar.bz2 otp-0440e0e45835de5adbe790f9437492d734c6c4e1.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
lib/test_server/src/erl2html2.erl
Diffstat (limited to 'lib/snmp/src/manager')
-rw-r--r-- | lib/snmp/src/manager/snmpm_net_if.erl | 2 | ||||
-rw-r--r-- | lib/snmp/src/manager/snmpm_server.erl | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl index 5186db64ec..e81383eeea 100644 --- a/lib/snmp/src/manager/snmpm_net_if.erl +++ b/lib/snmp/src/manager/snmpm_net_if.erl @@ -330,7 +330,7 @@ socket_params(Domain, {IpAddr, IpPort} = Addr, BindTo, CommonSocketOpts) -> end, case Family of inet -> - case init:get_argument(snmp_fd) of + case init:get_argument(snmpm_fd) of {ok, [[FdStr]]} -> Fd = list_to_integer(FdStr), case BindTo of diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl index 3a37174d9e..00a9b82daa 100644 --- a/lib/snmp/src/manager/snmpm_server.erl +++ b/lib/snmp/src/manager/snmpm_server.erl @@ -2022,7 +2022,8 @@ do_handle_agent(DefUserId, DefMod, ok; InvalidResult -> - CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData], + CallbackArgs = + [Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData], handle_invalid_result(handle_agent, CallbackArgs, InvalidResult) catch @@ -2118,7 +2119,8 @@ do_handle_agent(DefUserId, DefMod, end; T:E -> - CallbackArgs = [Domain, Addr, Type, SnmpInfo, DefData], + CallbackArgs = + [Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData], handle_invalid_result(handle_agent, CallbackArgs, T, E) end. |