diff options
| author | Micael Karlberg <[email protected]> | 2011-04-20 11:39:15 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-20 11:39:15 +0200 |
| commit | 8d5202134564d0840af501d7b195e409e8af5754 (patch) | |
| tree | b77fad5727ae8af4f3b34dcfeab645ea1b792b31 /lib/snmp/src/agent/snmp_community_mib.erl | |
| parent | f404041f4ce1a94c5784fb2c39b2d5624d58f624 (diff) | |
| parent | b880d9d8f983b08d5d9e14226b8dbfc1643dbf58 (diff) | |
| download | otp-8d5202134564d0840af501d7b195e409e8af5754.tar.gz otp-8d5202134564d0840af501d7b195e409e8af5754.tar.bz2 otp-8d5202134564d0840af501d7b195e409e8af5754.zip | |
Merge branch 'bmk/agent/extra_info_notification/OTP-9183' into bmk/snmp/snmp420_integration
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
OTP-9119
OTP-9183
Diffstat (limited to 'lib/snmp/src/agent/snmp_community_mib.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmp_community_mib.erl | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/snmp/src/agent/snmp_community_mib.erl b/lib/snmp/src/agent/snmp_community_mib.erl index 5644a43345..3debe0a30e 100644 --- a/lib/snmp/src/agent/snmp_community_mib.erl +++ b/lib/snmp/src/agent/snmp_community_mib.erl @@ -25,7 +25,7 @@ snmpTargetAddrExtTable/3, community2vacm/2, vacm2community/2, get_target_addr_ext_mms/2]). --export([add_community/5, delete_community/1]). +-export([add_community/5, add_community/6, delete_community/1]). -export([check_community/1]). -include("SNMP-COMMUNITY-MIB.hrl"). @@ -128,12 +128,16 @@ read_community_config_files(Dir) -> Comms. check_community({Index, CommunityName, SecName, CtxName, TransportTag}) -> + EngineID = get_engine_id(), + check_community({Index, CommunityName, SecName, + EngineID, CtxName, TransportTag}); +check_community({Index, CommunityName, SecName, + EngineID, CtxName, TransportTag}) -> snmp_conf:check_string(Index,{gt,0}), snmp_conf:check_string(CommunityName), snmp_conf:check_string(SecName), snmp_conf:check_string(CtxName), snmp_conf:check_string(TransportTag), - EngineID = get_engine_id(), Comm = {Index, CommunityName, SecName, EngineID, CtxName, TransportTag, ?'StorageType_nonVolatile', ?'RowStatus_active'}, {ok, Comm}; @@ -173,6 +177,13 @@ table_del_row(Tab, Key) -> %% FIXME: does not work with mnesia add_community(Idx, CommName, SecName, CtxName, TransportTag) -> Community = {Idx, CommName, SecName, CtxName, TransportTag}, + do_add_community(Community). + +add_community(Idx, CommName, SecName, EngineId, CtxName, TransportTag) -> + Community = {Idx, CommName, SecName, EngineId, CtxName, TransportTag}, + do_add_community(Community). + +do_add_community(Community) -> case (catch check_community(Community)) of {ok, Row} -> Key = element(1, Row), |