diff options
author | Micael Karlberg <[email protected]> | 2012-02-27 16:09:38 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-02-27 16:09:38 +0100 |
commit | a05886528ce9a02a79eda82c8868f489dd478aaa (patch) | |
tree | a8060cb88342da0816c54a40cd3d7c1b6f516661 /lib/snmp/src/agent/snmp_view_based_acm_mib.erl | |
parent | f6b7aade87b64c4c60eba65dfac6310a8c7bf139 (diff) | |
parent | d11e013575ed400b7167342be4b08ba3d1166ee9 (diff) | |
download | otp-a05886528ce9a02a79eda82c8868f489dd478aaa.tar.gz otp-a05886528ce9a02a79eda82c8868f489dd478aaa.tar.bz2 otp-a05886528ce9a02a79eda82c8868f489dd478aaa.zip |
Merge branch 'bmk/snmp/improve_error_handling_reading_config/OTP-9943' into bmk/snmp/snmp422_integration/r15
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp/src/agent/snmp_view_based_acm_mib.erl')
-rw-r--r-- | lib/snmp/src/agent/snmp_view_based_acm_mib.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl index 2cee91b081..479a44795f 100644 --- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl +++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl @@ -115,7 +115,7 @@ do_reconfigure(Dir) -> read_vacm_config_files(Dir) -> ?vdebug("read vacm config file",[]), - Gen = fun(_) -> ok end, + Gen = fun(_D, _Reason) -> ok end, Filter = fun(Vacms) -> Sec2Group = [X || {vacmSecurityToGroup, X} <- Vacms], Access = [X || {vacmAccess, X} <- Vacms], |