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_user_based_sm_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_user_based_sm_mib.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmp_user_based_sm_mib.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl index 69cebc858b..2e801622e7 100644 --- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl +++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2010. All Rights Reserved. +%% Copyright Ericsson AB 1999-2012. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -136,7 +136,7 @@ do_reconfigure(Dir) -> read_usm_config_files(Dir) -> ?vdebug("read usm config file",[]), - Gen = fun(D) -> generate_usm(D) end, + Gen = fun(D, Reason) -> generate_usm(D, Reason) end, Filter = fun(Usms) -> Usms end, Check = fun(Entry) -> check_usm(Entry) end, [Usms] = @@ -144,7 +144,7 @@ read_usm_config_files(Dir) -> Usms. -generate_usm(Dir) -> +generate_usm(Dir, _Reason) -> info_msg("Incomplete configuration. Generating empty usm.conf.", []), USMFile = filename:join(Dir, "usm.conf"), ok = file:write_file(USMFile, list_to_binary([])). |