aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2010-02-12 15:55:58 +0000
committerErlang/OTP <[email protected]>2010-02-13 07:29:33 +0100
commit3d06af66f9da569891d48594e8a6fe72e0065d20 (patch)
tree273bebfc16a8381fa6beb83077381e6c25778338
parentd9286a9a68e8b10dcf006a60ec84a0439e725fac (diff)
downloadotp-3d06af66f9da569891d48594e8a6fe72e0065d20.tar.gz
otp-3d06af66f9da569891d48594e8a6fe72e0065d20.tar.bz2
otp-3d06af66f9da569891d48594e8a6fe72e0065d20.zip
OTP-8442: Regstration of agents using config file incorrect
OTO-8442: Per Hedeland
-rw-r--r--lib/snmp/doc/src/notes.xml8
-rw-r--r--lib/snmp/src/app/snmp.appup.src13
-rw-r--r--lib/snmp/src/manager/snmpm_config.erl3
-rw-r--r--lib/snmp/vsn.mk5
4 files changed, 23 insertions, 6 deletions
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index dc2d879672..8939fbd6df 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -70,6 +70,14 @@
<list type="bulleted">
<item>
+ <p>[manager] Registration of agents using the config file,
+ <seealso marker="snmp_manager_config_files#agents">agents.conf</seealso>,
+ does not work. This has now been corrected. </p>
+ <p>Per Hedeland</p>
+ <p>Own Id: OTP-8442</p>
+ </item>
+
+ <item>
<p>The config utility
(<seealso marker="snmp#config">snmp:config/0</seealso>)
generated a default notify.conf
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 05aa3d0d48..511c0eb48b 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -29,7 +29,9 @@
{load_module, snmp_log, soft_purge, soft_purge, []},
{update, snmpa_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
- {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+ {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+
+ {update, snmpm_config, soft, soft_purge, soft_purge, []}
]
},
{"4.14",
@@ -43,6 +45,7 @@
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
+ {update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge,
[snmpm_user_default]}
]
@@ -77,7 +80,9 @@
{load_module, snmp_log, soft_purge, soft_purge, []},
{update, snmpa_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
- {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+ {update, snmpa_agent, soft, soft_purge, soft_purge, []},
+
+ {update, snmpm_config, soft, soft_purge, soft_purge, []}
]
},
{"4.14",
@@ -91,7 +96,9 @@
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
- {update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_user_default]}
+ {update, snmpm_config, soft, soft_purge, soft_purge, []},
+ {update, snmpm_server, soft, soft_purge, soft_purge,
+ [snmpm_user_default]}
]
},
{"4.13.5",
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index e4069485ad..b976e8f568 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -1657,7 +1657,8 @@ verify_agent({UserId,
{ok, Addr} ->
snmp_conf:check_integer(Port, {gt, 0}),
Conf =
- [{address, Addr},
+ [{reg_type, target_name},
+ {address, Addr},
{port, Port},
{community, Comm},
{engine_id, EngineId},
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index a151f332ae..9932656b74 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,12 +18,13 @@
# %CopyrightEnd%
SNMP_VSN = 4.16
-PRE_VSN =-p03
+PRE_VSN =-p04
APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)"
TICKETS = \
OTP-8395 \
- OTP-8433
+ OTP-8433 \
+ OTP-8442
TICKETS_4_15 = OTP-8229 OTP-8249