Skip to content

Commit

Permalink
The snmp config tool could not handle (manager) audit trail config
Browse files Browse the repository at this point in the history 
because the option seqno was not handled.
OTP-9354
  • Loading branch information
@bmk
bmk committed Jul 21, 2011
1 parent 9e2b8f8 commit 6be519f
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 103 deletions.
44 changes: 44 additions & 0 deletions lib/snmp/doc/src/notes.xml
View file
Expand Up @@ -32,6 +32,50 @@
<file>notes.xml</file> <file>notes.xml</file>
</header> </header>


<section>
<title>SNMP Development Toolkit 4.21</title>
<p>Version 4.21 supports code replacement in runtime from/to
version 4.20.1, 4.20 and 4.19.</p>

<section>
<title>Improvements and new features</title>
<p>-</p>
<!--
<list type="bulleted">
<item>
<p>Added type specs for functions that do not return. </p>
<p>Kostis Sagonas</p>
<p>Own Id: OTP-9208</p>
</item>
</list>
-->
</section>

<section>
<title>Fixed Bugs and Malfunctions</title>
<!--
<p>-</p>
-->

<list type="bulleted">
<item>
<p>The snmp config tool could not handle (manager) audit trail config
because the option seqno was not handled. </p>
<p>Own Id: OTP-9354</p>
</item>

</list>
</section>


<section>
<title>Incompatibilities</title>
<p>-</p>
</section>

</section> <!-- 4.21 -->


<section> <section>
<title>SNMP Development Toolkit 4.20.1</title> <title>SNMP Development Toolkit 4.20.1</title>
<p>Version 4.20.1 supports code replacement in runtime from/to <p>Version 4.20.1 supports code replacement in runtime from/to
Expand Down
112 changes: 12 additions & 100 deletions lib/snmp/src/app/snmp.appup.src
View file
Expand Up @@ -22,8 +22,14 @@
%% ----- U p g r a d e ------------------------------------------------------- %% ----- U p g r a d e -------------------------------------------------------


[ [
{"4.20.1",
[
{load_module, snmp_config, soft_purge, soft_purge, []}
]
},
{"4.20", {"4.20",
[ [
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, []} {load_module, snmpa_mpd, soft_purge, soft_purge, []}
] ]
Expand Down Expand Up @@ -54,56 +60,6 @@
[snmp_conf]}, [snmp_conf]},
{update, snmpm_net_if, soft, soft_purge, soft_purge, []}, {update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]}, {update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]},
{update, snmpa_net_if, soft, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd]},
{update, snmpa_agent, soft, soft_purge, soft_purge,
[snmpa_acm, snmpa_mpd, snmpa_trap]}
]
},
{"4.18",
[
{load_module, snmpa, soft_purge, soft_purge, []},
{load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{load_module, snmpm_usm, soft_purge, soft_purge, []},
{load_module, snmp_misc, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_conf, soft_purge, soft_purge, []},
{load_module, snmp_config, soft_purge, soft_purge, [snmp_conf]},
{load_module, snmpa_conf, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf]},
{load_module, snmpa_vacm, soft_purge, soft_purge, []},
{load_module, snmpa_trap, soft_purge, soft_purge,
[snmpa_mpd, snmp_notification_mib, snmp_target_mib, snmpa_net_if]},
{load_module, snmpa_acm, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd, snmp_target_mib]},
{load_module, snmpa, soft_purge, soft_purge,
[snmp_community_mib,
snmp_framework_mib,
snmp_standard_mib,
snmp_target_mib,
snmp_user_based_sm_mib,
snmp_view_based_acm_mib]},
{load_module, snmp_notification_mib, soft_purge, soft_purge,
[snmp_conf, snmp_target_mib, snmpa_mib_lib]},
{load_module, snmp_community_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_framework_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_standard_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_target_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge,
[snmpa_mib_lib, snmpa_vacm]},
{load_module, snmpa_mib_lib, soft_purge, soft_purge, []},

{update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]},

{update, snmpa_net_if, soft, soft_purge, soft_purge, {update, snmpa_net_if, soft, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd]}, [snmp_conf, snmpa_mpd]},
{update, snmpa_agent, soft, soft_purge, soft_purge, {update, snmpa_agent, soft, soft_purge, soft_purge,
Expand All @@ -115,8 +71,14 @@
%% ------D o w n g r a d e --------------------------------------------------- %% ------D o w n g r a d e ---------------------------------------------------


[ [
{"4.20.1",
[
{load_module, snmp_config, soft_purge, soft_purge, []}
]
},
{"4.20", {"4.20",
[ [
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []}, {load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, []} {load_module, snmpa_mpd, soft_purge, soft_purge, []}
] ]
Expand Down Expand Up @@ -149,56 +111,6 @@
{update, snmpm_net_if, soft, soft_purge, soft_purge, []}, {update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]}, {update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]},


{update, snmpa_net_if, soft, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd]},
{update, snmpa_agent, soft, soft_purge, soft_purge,
[snmpa_acm, snmpa_mpd, snmpa_trap]}
]
},
{"4.18",
[
{load_module, snmpa, soft_purge, soft_purge, []},
{load_module, snmpm, soft_purge, soft_purge, [snmpm_server]},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{load_module, snmpm_usm, soft_purge, soft_purge, []},
{load_module, snmp_misc, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_conf, soft_purge, soft_purge, []},
{load_module, snmpa_conf, soft_purge, soft_purge, [snmp_conf]},
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmp_conf]},
{load_module, snmpa_vacm, soft_purge, soft_purge, []},
{load_module, snmpa_trap, soft_purge, soft_purge,
[snmpa_mpd, snmp_notification_mib, snmp_target_mib, snmpa_net_if]},
{load_module, snmpa_acm, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd, snmp_target_mib]},
{load_module, snmpa, soft_purge, soft_purge,
[snmp_community_mib,
snmp_framework_mib,
snmp_standard_mib,
snmp_target_mib,
snmp_user_based_sm_mib,
snmp_view_based_acm_mib]},
{load_module, snmp_notification_mib, soft_purge, soft_purge,
[snmp_conf, snmp_target_mib, snmpa_mib_lib]},
{load_module, snmp_community_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_framework_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_standard_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_target_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge,
[snmpa_mib_lib]},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge,
[snmpa_mib_lib, snmpa_vacm]},
{load_module, snmpa_mib_lib, soft_purge, soft_purge, []},

{update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_net_if]},

{update, snmpa_net_if, soft, soft_purge, soft_purge, {update, snmpa_net_if, soft, soft_purge, soft_purge,
[snmp_conf, snmpa_mpd]}, [snmp_conf, snmpa_mpd]},
{update, snmpa_agent, soft, soft_purge, soft_purge, {update, snmpa_agent, soft, soft_purge, soft_purge,
Expand Down
6 changes: 4 additions & 2 deletions lib/snmp/src/misc/snmp_config.erl
View file
Expand Up @@ -337,7 +337,7 @@ config_agent_sys() ->
{dir, ATLDir}, {dir, ATLDir},
{size, ATLSize}, {size, ATLSize},
{repair, ATLRepair}, {repair, ATLRepair},
{seqno, ATLSeqNo}]}]; {seqno, ATLSeqNo}]}];
no -> no ->
[] []
end, end,
Expand Down Expand Up @@ -2350,7 +2350,9 @@ write_sys_config_file_manager_atl_opt(Fid, {type, Type}) ->
write_sys_config_file_manager_atl_opt(Fid, {size, Size}) -> write_sys_config_file_manager_atl_opt(Fid, {size, Size}) ->
ok = io:format(Fid, "{size, ~w}", [Size]); ok = io:format(Fid, "{size, ~w}", [Size]);
write_sys_config_file_manager_atl_opt(Fid, {repair, Rep}) -> write_sys_config_file_manager_atl_opt(Fid, {repair, Rep}) ->
ok = io:format(Fid, "{repair, ~w}", [Rep]). ok = io:format(Fid, "{repair, ~w}", [Rep]);
write_sys_config_file_manager_atl_opt(Fid, {seqno, SeqNo}) ->
ok = io:format(Fid, "{seqno, ~w}", [SeqNo]).




header() -> header() ->
Expand Down
2 changes: 1 addition & 1 deletion lib/snmp/vsn.mk
View file
Expand Up @@ -17,6 +17,6 @@
# #
# %CopyrightEnd% # %CopyrightEnd%


SNMP_VSN = 4.20.1 SNMP_VSN = 4.21
PRE_VSN = PRE_VSN =
APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)" APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)"

0 comments on commit 6be519f

Please sign in to comment.