diff options
| author | Micael Karlberg <[email protected]> | 2011-07-21 16:08:57 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-07-21 16:08:57 +0200 |
| commit | 7437a868de13e985698b202750e0eb83c8464a25 (patch) | |
| tree | a07cf59c3dadf7bff7cbbe84897d64e402137b07 /lib/snmp | |
| parent | b3d4a9cbddcaf4507f19fc1f9f48b2e6e8d13cd9 (diff) | |
| parent | 6be519fade4fbd96c5e87ad960c4946d0c2979f6 (diff) | |
| download | otp-7437a868de13e985698b202750e0eb83c8464a25.tar.gz otp-7437a868de13e985698b202750e0eb83c8464a25.tar.bz2 otp-7437a868de13e985698b202750e0eb83c8464a25.zip | |
The snmp config tool could not handle (manager) audit trail config
because the option seqno was not handled.
OTP-9354
Merge branch 'bmk/snmp/audit_trail_config_bug/OTP-9354' into bmk/snmp/snmp421_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/snmp')
| -rw-r--r-- | lib/snmp/doc/src/notes.xml | 13 | ||||
| -rw-r--r-- | lib/snmp/src/misc/snmp_config.erl | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml index b728824c44..3e97658829 100644 --- a/lib/snmp/doc/src/notes.xml +++ b/lib/snmp/doc/src/notes.xml @@ -69,22 +69,23 @@ <p>Own Id: OTP-9437</p> </item> </list> + </section> <section> <title>Fixed Bugs and Malfunctions</title> +<!-- <p>-</p> +--> -<!-- <list type="bulleted"> <item> - <p>[agent] Did not handle transport domains properly in some - cases. </p> - <p>Own Id: OTP-9400</p> - </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> diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl index 27bef216cc..6ab20e3e48 100644 --- a/lib/snmp/src/misc/snmp_config.erl +++ b/lib/snmp/src/misc/snmp_config.erl @@ -337,7 +337,7 @@ config_agent_sys() -> {dir, ATLDir}, {size, ATLSize}, {repair, ATLRepair}, - {seqno, ATLSeqNo}]}]; + {seqno, ATLSeqNo}]}]; no -> [] end, @@ -2350,7 +2350,9 @@ write_sys_config_file_manager_atl_opt(Fid, {type, Type}) -> write_sys_config_file_manager_atl_opt(Fid, {size, Size}) -> ok = io:format(Fid, "{size, ~w}", [Size]); 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() -> |