aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2010-12-06 16:02:57 +0100
committerMicael Karlberg <[email protected]>2010-12-06 16:02:57 +0100
commitfc649b12007a5d9a895c9bbcc4a3ede76085e35d (patch)
tree1bbb1d95151dd40252ece5c3ad55cde2fd38cb16 /lib/snmp/src
parentc4f7618bc0275b5eb8787edb527714d16f512f44 (diff)
downloadotp-fc649b12007a5d9a895c9bbcc4a3ede76085e35d.tar.gz
otp-fc649b12007a5d9a895c9bbcc4a3ede76085e35d.tar.bz2
otp-fc649b12007a5d9a895c9bbcc4a3ede76085e35d.zip
For the table vacmAccessTable, when performing the is_set_ok and set
opteration(s), all values of the vacmAccessSecurityModel column was incorrectly translated to "any".
Diffstat (limited to 'lib/snmp/src')
-rw-r--r--lib/snmp/src/agent/snmp_view_based_acm_mib.erl12
-rw-r--r--lib/snmp/src/app/snmp.appup.src10
2 files changed, 16 insertions, 6 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 657207b36e..c0bc727c68 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -402,13 +402,13 @@ verify_vacmSecurityToGroupTable_cols([{Col, Val0}|Cols], Acc) ->
verify_vacmSecurityToGroupTable_col(?vacmSecurityModel, Model) ->
case Model of
any -> ?SEC_ANY;
- v1 -> ?SEC_ANY;
- v2c -> ?SEC_ANY;
- usm -> ?SEC_ANY;
+ v1 -> ?SEC_V1;
+ v2c -> ?SEC_V2C;
+ usm -> ?SEC_USM;
?SEC_ANY -> ?SEC_ANY;
- ?SEC_V1 -> ?SEC_ANY;
- ?SEC_V2C -> ?SEC_ANY;
- ?SEC_USM -> ?SEC_ANY;
+ ?SEC_V1 -> ?SEC_V1;
+ ?SEC_V2C -> ?SEC_V2C;
+ ?SEC_USM -> ?SEC_USM;
_ ->
?vlog("verification of vacmSecurityModel(~w) ~p failed",
[?vacmSecurityModel, Model]),
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 2375e3df70..03a0044908 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,11 @@
%% ----- U p g r a d e -------------------------------------------------------
[
+ {"4.18",
+ [
+ {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
+ ]
+ },
{"4.17.1",
[
{load_module, snmp_community_mib, soft_purge, soft_purge, []},
@@ -66,6 +71,11 @@
%% ------D o w n g r a d e ---------------------------------------------------
[
+ {"4.18",
+ [
+ {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}
+ ]
+ },
{"4.17.1",
[
{load_module, snmp_community_mib, soft_purge, soft_purge, []},