Clean up config error handling and negative results

6 files changed, 47 insertions, 16 deletions

diff --git a/lib/snmp/src/agent/snmp_target_mib.erl b/lib/snmp/src/agent/snmp_target_mib.erl
index e916f17d6a..df694ed16b 100644
--- a/lib/snmp/src/agent/snmp_target_mib.erl
+++ b/lib/snmp/src/agent/snmp_target_mib.erl
@@ -182,6 +182,10 @@ check_target_addr(
       Name, Domain, Address, Timeout, RetryCount, TagList, Params,
       EngineId, TMask, MMS);
 check_target_addr(
+  {_Name, Domain, Address, _Timeout, _RetryCount, _TagList, _Params,
+   _EngineId, _TMask, _MMS}) -> % Arity 10
+    error({bad_address, {Domain, Address}});
+check_target_addr(
   {Name, Domain, Address, Timeout, RetryCount, TagList, Params,
    EngineId}) % Arity 8
   when is_atom(Domain) ->
@@ -197,6 +201,10 @@ check_target_addr(
     check_target_addr(
       Name, Domain, Address, Timeout, RetryCount, TagList, Params,
       EngineId);
+check_target_addr(
+  {_Name, Domain, Address, _Timeout, _RetryCount, _TagList, _Params,
+   _EngineId}) ->% Arity 8
+    error({bad_address, {Domain, Address}});
 %% Use dummy engine id if the old style is found
 check_target_addr(
   {Name, Domain, Address, Timeout, RetryCount, TagList, Params}) % Arity 7
@@ -210,6 +218,9 @@ check_target_addr(
     Address = {Ip, Udp},
     check_target_addr(
       Name, Domain, Address, Timeout, RetryCount, TagList, Params);
+check_target_addr(
+  {_Name, Domain, Address, _Timeout, _RetryCount, _TagList, _Params}) -> % Arity 7
+    error({bad_address, {Domain, Address}});
 %% Use dummy engine id if the old style is found
 check_target_addr(
   {Name, Domain, Address, Timeout, RetryCount, TagList, Params,
@@ -225,6 +236,10 @@ check_target_addr(
     Address = {Ip, Udp},
     check_target_addr(
       Name, Domain, Address, Timeout, RetryCount, TagList, Params, TMask, MMS);
+check_target_addr(
+  {_Name, Domain, Address, _Timeout, _RetryCount, _TagList, _Params,
+   _TMask, _MMS}) -> % Arity 9
+    error({bad_address, {Domain, Address}});
 check_target_addr(X) ->
     error({invalid_target_addr, X}).
 
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index b4d32dc928..fe3f63c4ca 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -475,6 +475,16 @@ write_target_addr_conf(Fd, Conf) ->
 
 do_write_target_addr_conf(
   Fd,
+  {Name, Domain, Address, Timeout, RetryCount, TagList,
+   ParamsName, EngineId, TMask, MaxMessageSize})
+  when is_atom(Domain) ->
+    io:format(
+      Fd,
+      "{\"~s\", ~w, ~w, ~w, ~w, \"~s\", \"~s\", \"~s\", ~w, ~w}.~n",
+      [Name, Domain, Address, Timeout, RetryCount, TagList,
+       ParamsName, EngineId, TMask, MaxMessageSize]);
+do_write_target_addr_conf(
+  Fd,
   {Name, Ip, Udp, Timeout, RetryCount, TagList,
    ParamsName, EngineId, TMask, MaxMessageSize})
   when is_integer(Udp) ->
@@ -485,15 +495,10 @@ do_write_target_addr_conf(
       {Name, Domain, Address, Timeout, RetryCount, TagList,
        ParamsName, EngineId, TMask, MaxMessageSize});
 do_write_target_addr_conf(
-  Fd,
-  {Name, Domain, Address, Timeout, RetryCount, TagList,
-   ParamsName, EngineId, TMask, MaxMessageSize})
-  when is_atom(Domain) ->
-    io:format(
-      Fd,
-      "{\"~s\", ~w, ~w, ~w, ~w, \"~s\", \"~s\", \"~s\", ~w, ~w}.~n",
-      [Name, Domain, Address, Timeout, RetryCount, TagList,
-       ParamsName, EngineId, TMask, MaxMessageSize]);
+  _Fd,
+  {_Name, Domain, Address, _Timeout, _RetryCount, _TagList,
+   _ParamsName, _EngineId, _TMask, _MaxMessageSize}) ->
+    error({bad_address, {Domain, Address}});
 do_write_target_addr_conf(
   Fd,
   {Name, Domain, Ip, Udp, Timeout, RetryCount, TagList,
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index d147aabb0b..05d5ce72b1 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -461,7 +461,7 @@ agent_info(Domain, Address, Item) when is_atom(Domain) ->
 	      [Domain, Address, Item, _Thrown, erlang:get_stacktrace()]),
 	    {error, not_found}
     end;
-agent_info(Ip, Port, Item) ->
+agent_info(Ip, Port, Item) when is_integer(Port) ->
     p(?MODULE_STRING":agent_info(~p, ~p, ~p) entry~n",
       [Ip, Port, Item]),
     Domain = default_transport_domain(),
@@ -1699,6 +1699,11 @@ check_agent_config(
       EngineId, Timeout, MaxMessageSize,
       Version, SecModel, SecName, SecLevel);
 check_agent_config(
+  {_UserId, _TargetName, _Community, Domain, Addr,
+   _EngineId, _Timeout, _MaxMessageSize,
+   _Version, _SecModel, _SecName, _SecLevel}) ->
+    error({bad_address, {Domain, Addr}});
+check_agent_config(
   {UserId, TargetName, Community, Domain, Ip, Port,
    EngineId, Timeout, MaxMessageSize,
    Version, SecModel, SecName, SecLevel}) ->
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index f4483995cb..153c8070c2 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -749,8 +749,6 @@ which_domain({A0, A1, A2, A3, A4, A5, A6, A7})
     
 %% ---------
 
-mk_addr_string({_IP, Port} = Addr) when is_integer(Port) ->
-    mk_addr_string({snmpUDPDomain, Addr});
 mk_addr_string({Domain, Addr}) when is_atom(Domain) ->
     %% XXX There is only code for IP domains here
     case check_address_ip(Domain, Addr) of
@@ -768,7 +766,11 @@ mk_addr_string({Domain, Addr}) when is_atom(Domain) ->
 	    mk_addr_string_ntoa(Domain, Addr);
 	IP ->
 	    mk_addr_string_ntoa(Domain, IP)
-    end.
+    end;
+mk_addr_string({_IP, Port} = Addr) when is_integer(Port) ->
+    mk_addr_string({snmpUDPDomain, Addr});
+mk_addr_string(Strange) ->
+    lists:flatten(io_lib:format("~w", [Strange])).
 
 
 mk_addr_string_ntoa({_, _, _, _} = IP) ->
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 0a50174adc..17dfcd70b4 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -1676,7 +1676,9 @@ write_agent_snmp_conf(Dir, AgentIP, AgentUDP, EngineID, MMS)
 	 {intAgentIpAddress,        AgentIP},
 	 {snmpEngineID,             EngineID},
 	 {snmpEngineMaxMessageSize, MMS}],
-    do_write_agent_snmp_conf(Dir, Conf).
+    do_write_agent_snmp_conf(Dir, Conf);
+write_agent_snmp_conf(_Dir, Domain, AgentAddr, _EngineID, _MMS) ->
+    error({bad_address, {Domain, AgentAddr}}).
 
 do_write_agent_snmp_conf(Dir, Conf) ->
     Comment = 
@@ -2153,7 +2155,9 @@ write_manager_snmp_conf(Dir, Domain_or_IP, Addr_or_Port, MMS, EngineID) ->
 		 {address, IP}];
 	    _ when is_integer(Addr_or_Port) ->
 		[{port,    Addr_or_Port},
-		 {address, Domain_or_IP}]
+		 {address, Domain_or_IP}];
+	    _ ->
+		error({bad_address, {Domain_or_IP, Addr_or_Port}})
 	end ++
 	[{engine_id,        EngineID},
 	 {max_message_size, MMS}],
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 2f5c68d14d..f37e957dae 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1048,7 +1048,7 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) ->
     case config_start(Opts) of
 	{error, Reason51} ->
 	    p("start failed (as expected): ~p", [Reason51]),
-	    ?line {failed_check, _, _, _, {bad_address, _}} = Reason51,
+	    ?line {failed_check, _, _, _, {bad_domain, _}} = Reason51,
 	    await_config_not_running();
 	OK_51 ->
 	    exit({error, {unexpected_success, "51", OK_51}})