Mend write_config_file and append_config_file

5 files changed, 476 insertions, 553 deletions

diff --git a/lib/snmp/src/agent/snmp_framework_mib.erl b/lib/snmp/src/agent/snmp_framework_mib.erl
index 43c91bbbc8..4599f05f47 100644
--- a/lib/snmp/src/agent/snmp_framework_mib.erl
+++ b/lib/snmp/src/agent/snmp_framework_mib.erl
@@ -52,7 +52,7 @@
 	 set_engine_boots/1, set_engine_time/1,
 	 table_next/2, check_status/3]).
 -export([add_context/1, delete_context/1]).
--export([check_agent/1, check_agent/2, check_context/1, order_agent/2]).
+-export([check_agent/2, check_context/1, order_agent/2]).
 
 
 %%-----------------------------------------------------------------
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index b05590a504..2569b01b55 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -108,40 +108,26 @@ write_agent_config(Dir, Conf) ->
     Hdr = header() ++ Comment, 
     write_agent_config(Dir, Hdr, Conf).
 
-write_agent_config(Dir, Hdr, Conf) 
+write_agent_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_agent_conf(Conf)          end,
-    Write  = fun(Fd) -> write_agent_conf(Fd, Hdr, Conf)  end,
-    write_config_file(Dir, "agent.conf", Verify, Write).
-    
+    Order = fun snmp_framework_mib:order_agent/2,
+    Check = fun snmp_framework_mib:check_agent/2,
+    Write = fun (Fd, Entries) -> write_agent_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "agent.conf", Order, Check, Write, Conf).
 
-append_agent_config(Dir, Conf) 
+append_agent_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_agent_conf(Conf)          end,
-    Write  = fun(Fd) -> write_agent_conf(Fd, Conf)  end,
-    append_config_file(Dir, "agent.conf", Verify, Write).
-    
+    Order = fun snmp_framework_mib:order_agent/2,
+    Check = fun snmp_framework_mib:check_agent/2,
+    Write = fun write_agent_conf/2,
+    append_config_file(Dir, "agent.conf", Order, Check, Write, Conf).
 
 read_agent_config(Dir) ->
     Order = fun snmp_framework_mib:order_agent/2,
-    Check = fun check_agent_conf_entry/2,
+    Check = fun snmp_framework_mib:check_agent/2,
     read_config_file(Dir, "agent.conf", Order, Check).
 
 
-verify_agent_conf(Conf) ->
-    verify_agent_conf(Conf, undefined).
-%%
-verify_agent_conf([], _) ->
-    ok;
-verify_agent_conf([H|T], State) ->
-    {_, NewState} = check_agent_conf_entry(H, State),
-    verify_agent_conf(T, NewState);
-verify_agent_conf(X, _) ->
-    error({bad_agent_config, X}).
-
-check_agent_conf_entry(Entry, State) ->
-    snmp_framework_mib:check_agent(Entry, State).
-
 write_agent_conf(Fd, "", Conf) ->
     write_agent_conf(Fd, Conf);
 write_agent_conf(Fd, Hdr, Conf) ->
@@ -196,38 +182,27 @@ write_context_config(Dir, Conf) ->
 
 write_context_config(Dir, Hdr, Conf) 
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_context_conf(Conf)         end,
-    Write  = fun(Fd) -> write_context_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "context.conf", Verify, Write).
-    
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_context/2,
+    Write = fun (Fd, Entries) -> write_context_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "context.conf", Order, Check, Write, Conf).
 
-append_context_config(Dir, Conf) 
+append_context_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_context_conf(Conf)         end,
-    Write  = fun(Fd) -> write_context_conf(Fd, Conf) end,
-    append_config_file(Dir, "context.conf", Verify, Write).
-    
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_context/2,
+    Write = fun write_context_conf/2,
+    append_config_file(Dir, "context.conf", Order, Check, Write, Conf).
 
 read_context_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_context_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "context.conf", Order, Verify).
+    Check = fun check_context/2,
+    read_config_file(Dir, "context.conf", Order, Check).
 
-    
-verify_context_conf([]) ->
-    ok;
-verify_context_conf([H|T]) ->
-    verify_context_conf_entry(H),
-    verify_context_conf(T);
-verify_context_conf(X) ->
-    error({error_context_config, X}).
-
-verify_context_conf_entry(Context) ->
-    {ok, _} = snmp_framework_mib:check_context(Context),
-    ok.
+
+check_context(Entry, State) ->
+    {check_ok(snmp_framework_mib:check_context(Entry)),
+     State}.
 
 write_context_conf(Fd, "", Conf) ->
     write_context_conf(Fd, Conf);
@@ -280,40 +255,29 @@ write_community_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_community_config(Dir, Hdr, Conf).
 
-write_community_config(Dir, Hdr, Conf) 
+write_community_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_community_conf(Conf)         end,
-    Write  = fun(Fd) -> write_community_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "community.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_community/2,
+    Write = fun (Fd, Entries) -> write_community_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "community.conf", Order, Check, Write, Conf).
 
-append_community_config(Dir, Conf) 
+append_community_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_community_conf(Conf)         end,
-    Write  = fun(Fd) -> write_community_conf(Fd, Conf) end,
-    append_config_file(Dir, "community.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_community/2,
+    Write = fun write_community_conf/2,
+    append_config_file(Dir, "community.conf", Order, Check, Write, Conf).
 
 read_community_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_community_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "community.conf", Order, Verify).
+    Check = fun check_community/2,
+    read_config_file(Dir, "community.conf", Order, Check).
 
-    
-verify_community_conf([]) ->
-    ok;
-verify_community_conf([H|T]) ->
-    verify_community_conf_entry(H),
-    verify_community_conf(T);
-verify_community_conf(X) ->
-    error({invalid_community_config, X}).
-
-verify_community_conf_entry(Context) ->
-    {ok, _} = snmp_community_mib:check_community(Context),
-    ok.
+
+check_community(Entry, State) ->
+    {check_ok(snmp_community_mib:check_community(Entry)),
+     State}.
 
 write_community_conf(Fd, "", Conf) ->
     write_community_conf(Fd, Conf);
@@ -322,14 +286,17 @@ write_community_conf(Fd, Hdr, Conf) ->
     write_community_conf(Fd, Conf).
 
 write_community_conf(Fd, Conf) ->
-    Fun = fun({Idx, Name, SecName, CtxName, TranspTag}) ->
-		  io:format(Fd, "{\"~s\", \"~s\", \"~s\", \"~s\", \"~s\"}.~n",
-			    [Idx, Name, SecName, CtxName, TranspTag]);
+    Fun =
+	fun({Idx, Name, SecName, CtxName, TranspTag}) ->
+		io:format(
+		  Fd,
+		  "{\"~s\", \"~s\", \"~s\", \"~s\", \"~s\"}.~n",
+		  [Idx, Name, SecName, CtxName, TranspTag]);
 	     (Crap) ->
-		  error({bad_community_config, Crap})
+		error({bad_community_config, Crap})
 	end,
     lists:foreach(Fun, Conf).
-		
+
 
 %%
 %% ------ standard.conf ------
@@ -356,44 +323,29 @@ write_standard_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_standard_config(Dir, Hdr, Conf).
 
-write_standard_config(Dir, Hdr, Conf) 
+write_standard_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_standard_conf(Conf)         end,
-    Write  = fun(Fd) -> write_standard_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "standard.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_standard/2,
+    Write = fun (Fd, Entries) -> write_standard_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "standard.conf", Order, Check, Write, Conf).
 
-append_standard_config(Dir, Conf) 
+append_standard_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_standard_conf(Conf)    end,
-    Write  = fun(Fd) -> write_standard_conf(Fd, Conf) end,
-    append_config_file(Dir, "standard.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_standard/2,
+    Write = fun write_standard_conf/2,
+    append_config_file(Dir, "standard.conf", Order, Check, Write, Conf).
 
 read_standard_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_standard_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "standard.conf", Order, Verify).
+    Check = fun check_standard/2,
+    read_config_file(Dir, "standard.conf", Order, Check).
 
-    
-verify_standard_conf([]) ->
-    ok;
-verify_standard_conf([H|T]) ->
-    verify_standard_conf_entry(H),
-    verify_standard_conf(T);
-verify_standard_conf(X) ->
-    error({bad_standard_config, X}).
-
-verify_standard_conf_entry(Std) ->
-    case snmp_standard_mib:check_standard(Std) of
-	ok ->
-	    ok;
-	{ok, _} ->
-	    ok
-    end.
+
+check_standard(Entry, State) ->
+    {check_ok(snmp_standard_mib:check_standard(Entry)),
+     State}.
 
 write_standard_conf(Fd, "", Conf) ->
     write_standard_conf(Fd, Conf);
@@ -521,41 +473,29 @@ write_target_addr_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_target_addr_config(Dir, Hdr, Conf).
 
-write_target_addr_config(Dir, Hdr, Conf) 
+write_target_addr_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_target_addr_conf(Conf)         end,
-    Write  = fun(Fd) -> write_target_addr_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "target_addr.conf", Verify, Write).
-
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_target_addr/2,
+    Write = fun (Fd, Entries) -> write_target_addr_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "target_addr.conf", Order, Check, Write, Conf).
 
-append_target_addr_config(Dir, Conf) 
+append_target_addr_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_target_addr_conf(Conf)    end,
-    Write  = fun(Fd) -> write_target_addr_conf(Fd, Conf) end,
-    append_config_file(Dir, "target_addr.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_target_addr/2,
+    Write = fun write_target_addr_conf/2,
+    append_config_file(Dir, "target_addr.conf", Order, Check, Write, Conf).
 
 read_target_addr_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_target_addr_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "target_addr.conf", Order, Verify).
+    Check = fun check_target_addr/2,
+    read_config_file(Dir, "target_addr.conf", Order, Check).
 
-        
-verify_target_addr_conf([]) ->
-    ok;
-verify_target_addr_conf([H|T]) ->
-    verify_target_addr_conf_entry(H),
-    verify_target_addr_conf(T);
-verify_target_addr_conf(X) ->
-    error({bad_target_addr_config, X}).
-
-verify_target_addr_conf_entry(Entry) ->
-    {ok, _} = snmp_target_mib:check_target_addr(Entry),
-    ok.
+
+check_target_addr(Entry, State) ->
+    {check_ok(snmp_target_mib:check_target_addr(Entry)),
+     State}.
 
 write_target_addr_conf(Fd, "", Conf) ->
     write_target_addr_conf(Fd, Conf);
@@ -641,38 +581,27 @@ write_target_params_config(Dir, Conf) ->
 
 write_target_params_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_target_params_conf(Conf)         end,
-    Write  = fun(Fd) -> write_target_params_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "target_params.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_target_params/2,
+    Write = fun (Fd, Entries) -> write_target_params_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "target_params.conf", Order, Check, Write, Conf).
 
 append_target_params_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_target_params_conf(Conf)    end,
-    Write  = fun(Fd) -> write_target_params_conf(Fd, Conf) end,
-    append_config_file(Dir, "target_params.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_target_params/2,
+    Write = fun write_target_params_conf/2,
+    append_config_file(Dir, "target_params.conf", Order, Check, Write, Conf).
 
 read_target_params_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_target_params_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "target_params.conf", Order, Verify).
+    Check = fun check_target_params/2,
+    read_config_file(Dir, "target_params.conf", Order, Check).
 
 
-verify_target_params_conf([]) ->
-    ok;
-verify_target_params_conf([H|T]) ->
-    verify_target_params_conf_entry(H),
-    verify_target_params_conf(T);
-verify_target_params_conf(X) ->
-    error({bad_target_params_config, X}).
-
-verify_target_params_conf_entry(Entry) ->
-    {ok, _} = snmp_target_mib:check_target_params(Entry),
-    ok.
+check_target_params(Entry, State) ->
+    {check_ok(snmp_target_mib:check_target_params(Entry)),
+     State}.
 
 write_target_params_conf(Fd, "", Conf) ->
     write_target_params_conf(Fd, Conf);
@@ -717,38 +646,27 @@ write_notify_config(Dir, Conf) ->
 
 write_notify_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_notify_conf(Conf)         end,
-    Write  = fun(Fd) -> write_notify_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "notify.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_notify/2,
+    Write = fun (Fd, Entries) -> write_notify_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "notify.conf", Order, Check, Write, Conf).
 
 append_notify_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_notify_conf(Conf)    end,
-    Write  = fun(Fd) -> write_notify_conf(Fd, Conf) end,
-    append_config_file(Dir, "notify.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_notify/2,
+    Write = fun write_notify_conf/2,
+    append_config_file(Dir, "notify.conf", Order, Check, Write, Conf).
 
 read_notify_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_notify_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "notify.conf", Order, Verify).
+    Check = fun check_notify/2,
+    read_config_file(Dir, "notify.conf", Order, Check).
 
 
-verify_notify_conf([]) ->
-    ok;
-verify_notify_conf([H|T]) ->
-    verify_notify_conf_entry(H),
-    verify_notify_conf(T);
-verify_notify_conf(X) ->
-    error({bad_notify_config, X}).
-
-verify_notify_conf_entry(Entry) ->
-    {ok, _} = snmp_notification_mib:check_notify(Entry),
-    ok.
+check_notify(Entry, State) ->
+    {check_ok(snmp_notification_mib:check_notify(Entry)),
+     State}.
 
 write_notify_conf(Fd, "", Conf) ->
     write_notify_conf(Fd, Conf);
@@ -817,38 +735,27 @@ write_usm_config(Dir, Conf) ->
 
 write_usm_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_usm_conf(Conf)         end,
-    Write  = fun(Fd) -> write_usm_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "usm.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_usm/2,
+    Write = fun (Fd, Entries) -> write_usm_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "usm.conf", Order, Check, Write, Conf).
 
 append_usm_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_usm_conf(Conf)    end,
-    Write  = fun(Fd) -> write_usm_conf(Fd, Conf) end,
-    append_config_file(Dir, "usm.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_usm/2,
+    Write = fun write_usm_conf/2,
+    append_config_file(Dir, "usm.conf", Order, Check, Write, Conf).
 
 read_usm_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_usm_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "usm.conf", Order, Verify).
+    Check = fun check_usm/2,
+    read_config_file(Dir, "usm.conf", Order, Check).
 
 
-verify_usm_conf([]) ->
-    ok;
-verify_usm_conf([H|T]) ->
-    verify_usm_conf_entry(H),
-    verify_usm_conf(T);
-verify_usm_conf(X) ->
-    error({bad_usm_conf, X}).
-
-verify_usm_conf_entry(Entry) ->
-    {ok, _} = snmp_user_based_sm_mib:check_usm(Entry),
-    ok.
+check_usm(Entry, State) ->
+    {check_ok(snmp_user_based_sm_mib:check_usm(Entry)),
+     State}.
 
 write_usm_conf(Fd, "", Conf) ->
     write_usm_conf(Fd, Conf);
@@ -860,11 +767,12 @@ write_usm_conf(Fd, Conf) ->
     Fun = fun(Entry) -> do_write_usm_conf(Fd, Entry) end,
     lists:foreach(Fun, Conf).
 
-do_write_usm_conf(Fd,
-		  {EngineID, UserName, SecName, Clone,
-		   AuthP, AuthKeyC, OwnAuthKeyC,
-		   PrivP, PrivKeyC, OwnPrivKeyC,
-		   Public, AuthKey, PrivKey}) ->
+do_write_usm_conf(
+  Fd,
+  {EngineID, UserName, SecName, Clone,
+   AuthP, AuthKeyC, OwnAuthKeyC,
+   PrivP, PrivKeyC, OwnPrivKeyC,
+   Public, AuthKey, PrivKey}) ->
     io:format(Fd, "{", []),
     io:format(Fd, "\"~s\", ", [EngineID]),
     io:format(Fd, "\"~s\", ", [UserName]),
@@ -930,38 +838,27 @@ write_vacm_config(Dir, Conf) ->
 
 write_vacm_config(Dir, Hdr, Conf)
   when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
-    Verify = fun()   -> verify_vacm_conf(Conf)         end,
-    Write  = fun(Fd) -> write_vacm_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, "vacm.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_vacm/2,
+    Write = fun (Fd, Entries) -> write_vacm_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, "vacm.conf", Order, Check, Write, Conf).
 
 append_vacm_config(Dir, Conf)
   when is_list(Dir) and is_list(Conf) ->
-    Verify = fun()   -> verify_vacm_conf(Conf)    end,
-    Write  = fun(Fd) -> write_vacm_conf(Fd, Conf) end,
-    append_config_file(Dir, "vacm.conf", Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_vacm/2,
+    Write = fun write_vacm_conf/2,
+    append_config_file(Dir, "vacm.conf", Order, Check, Write, Conf).
 
 read_vacm_config(Dir) ->
     Order = fun snmp_conf:no_order/2,
-    Verify =
-	fun (Entry, State) ->
-		{verify_vacm_conf_entry(Entry), State}
-	end,
-    read_config_file(Dir, "vacm.conf", Order, Verify).
+    Check = fun check_vacm/2,
+    read_config_file(Dir, "vacm.conf", Order, Check).
 
 
-verify_vacm_conf([]) ->
-    ok;
-verify_vacm_conf([H|T]) ->
-    verify_vacm_conf_entry(H),
-    verify_vacm_conf(T);
-verify_vacm_conf(X) ->
-    error({bad_vacm_conf, X}).
-
-verify_vacm_conf_entry(Entry) ->
-    {ok, _} = snmp_view_based_acm_mib:check_vacm(Entry),
-    ok.
+check_vacm(Entry, State) ->
+    {check_ok(snmp_view_based_acm_mib:check_vacm(Entry)),
+     State}.
 
 write_vacm_conf(Fd, "", Conf) ->
     write_vacm_conf(Fd, Conf);
@@ -973,34 +870,40 @@ write_vacm_conf(Fd, Conf) ->
     Fun = fun(Entry) -> do_write_vacm_conf(Fd, Entry) end,
     lists:foreach(Fun, Conf).
 
-do_write_vacm_conf(Fd,
-              {vacmSecurityToGroup,
-               SecModel, SecName, GroupName}) ->
-    io:format(Fd, "{vacmSecurityToGroup, ~w, \"~s\", \"~s\"}.~n",
-              [SecModel, SecName, GroupName]);
-do_write_vacm_conf(Fd,
-              {vacmAccess,
-               GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV}) ->
-    io:format(Fd, "{vacmAccess, \"~s\", \"~s\", ~w, ~w, ~w, "
-              "\"~s\", \"~s\", \"~s\"}.~n",
-              [GroupName, Prefix, SecModel, SecLevel,
-               Match, RV, WV, NV]);
-do_write_vacm_conf(Fd,
-              {vacmViewTreeFamily,
-               ViewIndex, ViewSubtree, ViewStatus, ViewMask}) ->
-    io:format(Fd, "{vacmViewTreeFamily, \"~s\", ~w, ~w, ~w}.~n",
-              [ViewIndex, ViewSubtree, ViewStatus, ViewMask]);
+do_write_vacm_conf(
+  Fd,
+  {vacmSecurityToGroup,
+   SecModel, SecName, GroupName}) ->
+    io:format(
+      Fd, "{vacmSecurityToGroup, ~w, \"~s\", \"~s\"}.~n",
+      [SecModel, SecName, GroupName]);
+do_write_vacm_conf(
+  Fd,
+  {vacmAccess,
+   GroupName, Prefix, SecModel, SecLevel, Match, RV, WV, NV}) ->
+    io:format(
+      Fd, "{vacmAccess, \"~s\", \"~s\", ~w, ~w, ~w, "
+      "\"~s\", \"~s\", \"~s\"}.~n",
+      [GroupName, Prefix, SecModel, SecLevel,
+       Match, RV, WV, NV]);
+do_write_vacm_conf(
+  Fd,
+  {vacmViewTreeFamily,
+   ViewIndex, ViewSubtree, ViewStatus, ViewMask}) ->
+    io:format(
+      Fd, "{vacmViewTreeFamily, \"~s\", ~w, ~w, ~w}.~n",
+      [ViewIndex, ViewSubtree, ViewStatus, ViewMask]);
 do_write_vacm_conf(_Fd, Crap) ->
     error({bad_vacm_config, Crap}).
 
 
 %% ---- config file wrapper functions ----
 
-write_config_file(Dir, File, Verify, Write) ->
-    snmp_config:write_config_file(Dir, File, Verify, Write).
+write_config_file(Dir, File, Order, Check, Write, Conf) ->
+    snmp_config:write_config_file(Dir, File, Order, Check, Write, Conf).
 
-append_config_file(Dir, File, Verify, Write) ->
-    snmp_config:append_config_file(Dir, File, Verify, Write).
+append_config_file(Dir, File, Order, Check, Write, Conf) ->
+    snmp_config:append_config_file(Dir, File, Order, Check, Write, Conf).
 
 read_config_file(Dir, File, Order, Check) ->
     snmp_config:read_config_file(Dir, File, Order, Check).
@@ -1008,13 +911,19 @@ read_config_file(Dir, File, Order, Check) ->
 
 %% ---- config file utility functions ----
 
+check_ok(ok) ->
+    ok;
+check_ok({ok, _}) ->
+    ok.
+
 header() ->
     {Y,Mo,D} = date(),
     {H,Mi,S} = time(),
-    io_lib:format("%% This file was generated by "
-		  "~w (version-~s) ~w-~2.2.0w-~2.2.0w "
-		  "~2.2.0w:~2.2.0w:~2.2.0w\n",
-		  [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
+    io_lib:format(
+      "%% This file was generated by "
+      "~w (version-~s) ~w-~2.2.0w-~2.2.0w "
+      "~2.2.0w:~2.2.0w:~2.2.0w\n",
+      [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
 
 error(R) ->
     throw({error, R}).
diff --git a/lib/snmp/src/manager/snmpm_conf.erl b/lib/snmp/src/manager/snmpm_conf.erl
index 5e2d9fdbf6..d2f9ba9c26 100644
--- a/lib/snmp/src/manager/snmpm_conf.erl
+++ b/lib/snmp/src/manager/snmpm_conf.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -78,43 +78,26 @@ write_manager_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_manager_config(Dir, Hdr, Conf).
 
-write_manager_config(Dir, Hdr, Conf) 
-  when is_list(Dir) andalso is_list(Hdr) andalso is_list(Conf) ->
-    Verify = fun()    -> verify_manager_conf(Conf)           end,
-    Write  = fun(Fid) -> write_manager_conf(Fid, Hdr, Conf)  end,
-    write_config_file(Dir, ?MANAGER_CONF_FILE, Verify, Write).
-    
+write_manager_config(Dir, Hdr, Conf)
+  when is_list(Dir), is_list(Hdr), is_list(Conf) ->
+    Order = fun snmpm_config:order_manager_config/2,
+    Check = fun snmpm_config:check_manager_config/2,
+    Write = fun (Fd, Entries) -> write_manager_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, ?MANAGER_CONF_FILE, Order, Check, Write, Conf).
 
 append_manager_config(Dir, Conf) 
-  when is_list(Dir) andalso is_list(Conf) ->
-    Verify = fun()    -> verify_manager_conf(Conf)     end,
-    Write  = fun(Fid) -> write_manager_conf(Fid, Conf) end,
-    append_config_file(Dir, ?MANAGER_CONF_FILE, Verify, Write).
-    
+  when is_list(Dir), is_list(Conf) ->
+    Order = fun snmpm_config:order_manager_config/2,
+    Check = fun snmpm_config:check_manager_config/2,
+    Write = fun write_manager_conf/2,
+    append_config_file(Dir, ?MANAGER_CONF_FILE, Order, Check, Write, Conf).
 
-read_manager_config(Dir) ->
-    Verify = fun(Entry) -> verify_manager_conf_entry(Entry) end,
-    read_config_file(Dir, ?MANAGER_CONF_FILE, Verify).
+read_manager_config(Dir) when is_list(Dir) ->
+    Order = fun snmpm_config:order_manager_config/2,
+    Check = fun snmpm_config:check_manager_config/2,
+    read_config_file(Dir, ?MANAGER_CONF_FILE, Order, Check).
 
 
-verify_manager_conf([]) ->
-    ok;
-verify_manager_conf([H|T]) ->
-    verify_manager_conf_entry(H),
-    verify_manager_conf(T);
-verify_manager_conf(X) ->
-    error({bad_manager_config, X}).
-
-verify_manager_conf_entry(Entry) ->
-    case snmpm_config:check_manager_config(Entry) of
-        ok ->
-            ok;
-%%         {ok, _} ->
-%%             ok;
-	Error ->
-	    throw(Error)
-    end.
-
 write_manager_conf(Fd, "", Conf) ->
     write_manager_conf(Fd, Conf);
 write_manager_conf(Fd, Hdr, Conf) ->
@@ -167,36 +150,29 @@ write_users_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_users_config(Dir, Hdr, Conf).
 
-write_users_config(Dir, Hdr, Conf) 
+write_users_config(Dir, Hdr, Conf)
   when is_list(Dir) andalso is_list(Hdr) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_users_conf(Conf)         end,
-    Write  = fun(Fd) -> write_users_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, ?USERS_CONF_FILE, Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_user_config/2,
+    Write = fun (Fd, Entries) -> write_users_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, ?USERS_CONF_FILE, Order, Check, Write, Conf).
 
-append_users_config(Dir, Conf) 
+append_users_config(Dir, Conf)
   when is_list(Dir) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_users_conf(Conf)    end,
-    Write  = fun(Fd) -> write_users_conf(Fd, Conf) end,
-    append_config_file(Dir, ?USERS_CONF_FILE, Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_user_config/2,
+    Write = fun write_users_conf/2,
+    append_config_file(Dir, ?USERS_CONF_FILE, Order, Check, Write, Conf).
 
 read_users_config(Dir) when is_list(Dir) ->
-    Verify = fun(Entry) -> verify_users_conf_entry(Entry) end,
-    read_config_file(Dir, ?USERS_CONF_FILE, Verify).
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_user_config/2,
+    read_config_file(Dir, ?USERS_CONF_FILE, Order, Check).
 
-    
-verify_users_conf([]) ->
-    ok;
-verify_users_conf([H|T]) ->
-    verify_users_conf_entry(H),
-    verify_users_conf(T);
-verify_users_conf(X) ->
-    error({bad_users_conf, X}).
-
-verify_users_conf_entry(Entry) ->
-    {ok, _} = snmpm_config:check_user_config(Entry),
-    ok.
+
+check_user_config(Entry, State) ->
+    {check_ok(snmpm_config:check_user_config(Entry)),
+     State}.
 
 write_users_conf(Fd, "", Conf) ->
     write_users_conf(Fd, Conf);
@@ -239,36 +215,29 @@ write_agents_config(Dir, Conf) ->
     Hdr = header() ++ Comment, 
     write_agents_config(Dir, Hdr, Conf).
 
-write_agents_config(Dir, Hdr, Conf) 
+write_agents_config(Dir, Hdr, Conf)
   when is_list(Dir) andalso is_list(Hdr) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_agents_conf(Conf)         end,
-    Write  = fun(Fd) -> write_agents_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, ?AGENTS_CONF_FILE, Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_agent_config/2,
+    Write = fun (Fd, Entries) -> write_agents_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, ?AGENTS_CONF_FILE, Order, Check, Write, Conf).
 
-append_agents_config(Dir, Conf) 
+append_agents_config(Dir, Conf)
   when is_list(Dir) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_agents_conf(Conf)    end,
-    Write  = fun(Fd) -> write_agents_conf(Fd, Conf) end,
-    append_config_file(Dir, ?AGENTS_CONF_FILE, Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_agent_config/2,
+    Write = fun write_agents_conf/2,
+    append_config_file(Dir, ?AGENTS_CONF_FILE, Order, Check, Write, Conf).
 
 read_agents_config(Dir) ->
-    Verify = fun(Entry) -> verify_agents_conf_entry(Entry) end,
-    read_config_file(Dir, ?AGENTS_CONF_FILE, Verify).
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_agent_config/2,
+    read_config_file(Dir, ?AGENTS_CONF_FILE, Order, Check).
 
 
-verify_agents_conf([]) ->
-    ok;
-verify_agents_conf([H|T]) ->
-    verify_agents_conf_entry(H),
-    verify_agents_conf(T);
-verify_agents_conf(X) ->
-    error({bad_agents_config, X}).
-
-verify_agents_conf_entry(Entry) ->
-    {ok, _} = snmpm_config:check_agent_config(Entry),
-    ok.
+check_agent_config(Entry, State) ->
+    {check_ok(snmpm_config:check_agent_config(Entry)),
+     State}.
 
 write_agents_conf(Fd, "", Conf) ->
     write_agents_conf(Fd, Conf);
@@ -282,13 +251,15 @@ write_agents_conf(Fd, [H|T]) ->
     do_write_agents_conf(Fd, H),
     write_agents_conf(Fd, T).
 
-do_write_agents_conf(Fd, 
-		    {UserId, 
-		     TargetName, Comm, Ip, Port, EngineID, 
-		     Timeout, MaxMessageSize, Version, 
-		     SecModel, SecName, SecLevel} = _A) ->
-    io:format(Fd, 
-	      "{~w, \"~s\", \"~s\", ~w, ~w, \"~s\", ~w, ~w, ~w, ~w, \"~s\", ~w}.~n", [UserId, TargetName, Comm, Ip, Port, EngineID, Timeout, MaxMessageSize, Version, SecModel, SecName, SecLevel]);
+do_write_agents_conf(
+  Fd,
+  {UserId, TargetName, Comm, Ip, Port, EngineID,
+   Timeout, MaxMessageSize, Version, SecModel, SecName, SecLevel} = _A) ->
+    io:format(
+      Fd,
+      "{~w, \"~s\", \"~s\", ~w, ~w, \"~s\", ~w, ~w, ~w, ~w, \"~s\", ~w}.~n",
+      [UserId, TargetName, Comm, Ip, Port, EngineID,
+       Timeout, MaxMessageSize, Version, SecModel, SecName, SecLevel]);
 do_write_agents_conf(_Fd, Crap) ->
     error({bad_agents_config, Crap}).
 
@@ -314,37 +285,30 @@ write_usm_config(Dir, Conf) ->
     Hdr = header() ++ Comment,
     write_usm_config(Dir, Hdr, Conf).
 
-write_usm_config(Dir, Hdr, Conf) 
+write_usm_config(Dir, Hdr, Conf)
   when is_list(Dir) andalso is_list(Hdr) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_usm_conf(Conf)         end,
-    Write  = fun(Fd) -> write_usm_conf(Fd, Hdr, Conf) end,
-    write_config_file(Dir, ?USM_USERS_CONF_FILE, Verify, Write).
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_usm_user_config/2,
+    Write = fun (Fd, Entries) -> write_usm_conf(Fd, Hdr, Entries) end,
+    write_config_file(Dir, ?USM_USERS_CONF_FILE, Order, Check, Write, Conf).
 
-
-append_usm_config(Dir, Conf) 
+append_usm_config(Dir, Conf)
   when is_list(Dir) andalso is_list(Conf) ->
-    Verify = fun()   -> verify_usm_conf(Conf)    end,
-    Write  = fun(Fd) -> write_usm_conf(Fd, Conf) end,
-    append_config_file(Dir, ?USM_USERS_CONF_FILE, Verify, Write).
-
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_usm_user_config/2,
+    Write = fun write_usm_conf/2,
+    append_config_file(Dir, ?USM_USERS_CONF_FILE, Order, Check, Write, Conf).
 
 read_usm_config(Dir) 
   when is_list(Dir) ->
-    Verify = fun(Entry) -> verify_usm_conf_entry(Entry) end,
-    read_config_file(Dir, ?USM_USERS_CONF_FILE, Verify).
+    Order = fun snmp_conf:no_order/2,
+    Check = fun check_usm_user_config/2,
+    read_config_file(Dir, ?USM_USERS_CONF_FILE, Order, Check).
 
 
-verify_usm_conf([]) ->
-    ok;
-verify_usm_conf([H|T]) ->
-    verify_usm_conf_entry(H),
-    verify_usm_conf(T);
-verify_usm_conf(X) ->
-    error({bad_usm_conf, X}).
-
-verify_usm_conf_entry(Entry) ->
-    {ok, _} = snmpm_config:check_usm_user_config(Entry),
-    ok.
+check_usm_user_config(Entry, State) ->
+    {check_ok(snmpm_config:check_usrm_user_config(Entry)),
+     State}.
 
 write_usm_conf(Fd, "", Conf) ->
     write_usm_conf(Fd, Conf);
@@ -358,41 +322,49 @@ write_usm_conf(Fd, [H|T]) ->
     do_write_usm_conf(Fd, H),
     write_usm_conf(Fd, T).
 
-do_write_usm_conf(Fd, 
-		  {EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey}) ->
-    io:format(Fd, "{\"~s\", \"~s\", ~w, ~w, ~w, ~w}.~n", 
-	      [EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey]);
-do_write_usm_conf(Fd, 
-		  {EngineID, UserName, SecName, 
-		   AuthP, AuthKey, PrivP, PrivKey}) ->
-    io:format(Fd, "{\"~s\", \"~s\", \"~s\", í~w, ~w, ~w, ~w}.~n",
-	      [EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey]);
+do_write_usm_conf(
+  Fd,
+  {EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey}) ->
+    io:format(
+      Fd, "{\"~s\", \"~s\", ~w, ~w, ~w, ~w}.~n",
+      [EngineID, UserName, AuthP, AuthKey, PrivP, PrivKey]);
+do_write_usm_conf(
+  Fd,
+  {EngineID, UserName, SecName,
+   AuthP, AuthKey, PrivP, PrivKey}) ->
+    io:format(
+      Fd, "{\"~s\", \"~s\", \"~s\", í~w, ~w, ~w, ~w}.~n",
+      [EngineID, UserName, SecName, AuthP, AuthKey, PrivP, PrivKey]);
 do_write_usm_conf(_Fd, Crap) ->
     error({bad_usm_conf, Crap}).
 
 
 %% ---- config file wrapper functions ----
 
-write_config_file(Dir, File, Verify, Write) ->
-    snmp_config:write_config_file(Dir, File, Verify, Write).
-
-append_config_file(Dir, File, Verify, Write) ->
-    snmp_config:append_config_file(Dir, File, Verify, Write).
+write_config_file(Dir, File, Order, Check, Write, Conf) ->
+    snmp_config:write_config_file(Dir, File, Order, Check, Write, Conf).
 
-read_config_file(Dir, File, Verify) ->
-    snmp_config:read_config_file(Dir, File, Verify).
+append_config_file(Dir, File, Order, Check, Write, Conf) ->
+    snmp_config:append_config_file(Dir, File, Order, Check, Write, Conf).
 
+read_config_file(Dir, File, Order, Check) ->
+    snmp_config:read_config_file(Dir, File, Order, Check).
 
 %% ---- config file utility functions ----
 
+check_ok(ok) ->
+    ok;
+check_ok({ok, _}) ->
+    ok.
+
 header() ->
     {Y,Mo,D} = date(),
     {H,Mi,S} = time(),
-    io_lib:format("%% This file was generated by "
-		  "~w (version-~s) ~w-~2.2.0w-~2.2.0w "
-		  "~2.2.0w:~2.2.0w:~2.2.0w\n",
-		  [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
-
+    io_lib:format(
+      "%% This file was generated by "
+      "~w (version-~s) ~w-~2.2.0w-~2.2.0w "
+      "~2.2.0w:~2.2.0w:~2.2.0w\n",
+      [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
 
 error(R) ->
     throw({error, R}).
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index e938a68ab0..b3500d7293 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -103,8 +103,10 @@
 	 get_agent_mp_model/2
 	]).
 
--export([check_manager_config/1, 
-	 check_user_config/1, 
+-export([
+	 order_manager_config/2,
+	 check_manager_config/2,
+	 check_user_config/1,
 	 check_agent_config/1,
 	 check_usm_user_config/1]).
 
@@ -2285,8 +2287,8 @@ is_crypto_supported(Func) ->
 %%     end.
 
 read_manager_config_file(Dir) ->
-    Order = fun snmp_conf:no_order/2,
-    Check = fun (Entry, State) -> {check_manager_config(Entry), State} end,
+    Order = fun order_manager_config/2,
+    Check = fun check_manager_config/2,
     Conf = read_file(Dir, "manager.conf", Order, Check),
     ?d("read_manager_config_file -> ok: "
        "~n   Conf: ~p", [Conf]),
@@ -2309,11 +2311,31 @@ default_manager_config() ->
 	       "~n   _Reason: ~p", [_Reason]),
 	    []
     end.
-    
-check_manager_config({address, Addr}) ->
-    snmp_conf:check_ip(Addr);
+
+order_manager_config(EntryA, EntryB) ->
+    snmp_conf:keyorder(1, EntryA, EntryB, [domain]).
+
+check_manager_config({domain, D}, _Domain) ->
+    {snmp_conf:check_domain(D), D};
+check_manager_config({address = Tag, Ip}, D) ->
+    Domain =
+	case D of
+	    undefined ->
+		default_transport_domain();
+	    _ ->
+		D
+	end,
+    {case snmp_conf:check_ip(Domain, Ip) of
+	 ok ->
+	     ok;
+	 {ok, FixedIp} ->
+	     {ok, {Tag, FixedIp}}
+     end, Domain};
+check_manager_config(Entry, Domain) ->
+    {check_manager_config(Entry), Domain}.
+
 check_manager_config({port, Port}) ->
-    snmp_conf:check_integer(Port, {gt, 0});
+    snmp_conf:check_port(Port);
 check_manager_config({engine_id, EngineID}) ->
     snmp_conf:check_string(EngineID);
 check_manager_config({max_message_size, Max}) ->
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index ac2b7b7778..68d4aee97d 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -26,8 +26,9 @@
 -compile({no_auto_import,[error/1]}).
 -export([config/0]).
 
--export([write_config_file/4, append_config_file/4,
-	 read_config_file/3, read_config_file/4]).
+%%-export([write_config_file/4, append_config_file/4, read_config_file/4]).
+
+-export([write_config_file/6, append_config_file/6, read_config_file/4]).
 
 -export([write_agent_snmp_files/7, write_agent_snmp_files/12,
 	 write_agent_snmp_files/6, write_agent_snmp_files/11,
@@ -92,9 +93,9 @@
 	]).
 
 
--export_type([void/0, 
-	      verify_config_entry_function/0, 
-	      verify_config_function/0, 
+-export_type([void/0,
+	      order_config_entry_function/0,
+	      check_config_entry_function/0,
 	      write_config_function/0]).
 
 
@@ -2467,93 +2468,90 @@ header() ->
 		  [?MODULE, ?version, Y, Mo, D, H, Mi, S]).
 
 
-%% *If* these functions are successfull, they successfully return anything
-%% (which is ignored), but they fail with either a throw or an exit or 
-%% something similar.
+%% *If* these functions are successfull, they successfully return
+%% (value is ignored), but they fail preferably with
+%% throw({error, Reason}).  Other exceptions are also handled.
 
-%% Verification of one config entry read from a file
--type(verify_config_entry_function() :: 
-      fun((Entry :: term()) -> ok | {error, Reason :: term()})).
+%% Sorting order for config entries (see lists:sort/2)
+-type(order_config_entry_function() ::
+	fun((term(), term()) -> boolean())).
 
-%% Verification of config to be written
--type(verify_config_function() :: 
-      fun(() -> void())).
+%% Check of config entries. Initial State is 'undefined'
+-type(check_config_entry_function() ::
+	fun((Entry :: term(), State :: undefined | term()) ->
+		    {ok | {ok, NewEntry :: term()}, NewState :: term()})).
 
-%% Write config to file (as defined by Fd)
--type(write_config_function() :: 
-      fun((Fd :: file:io_device()) -> void())).
+%% Write configuration entries to file descriptor Fd
+-type(write_config_function() ::
+	fun((Fd :: file:io_device(), [Entry :: term()]) -> ok)).
 
--spec write_config_file(Dir :: string(), 
-			FileName :: string(), 
-			Verify :: verify_config_function(), 
-			Write :: write_config_function()) ->
-    ok | {error, Reason :: term()}.
+-spec write_config_file(
+	Dir :: string(),
+	FileName :: string(),
+	Order :: order_config_entry_function(),
+	Check :: check_config_entry_function(),
+	Write :: write_config_function(),
+	Entries :: [term()]) ->
+			       ok | {error, term()}.
 
-write_config_file(Dir, FileName, Verify, Write) 
-  when (is_list(Dir) andalso 
-	is_list(FileName) andalso 
-	is_function(Verify) andalso 
-	is_function(Write)) ->
-    try	do_write_config_file(Dir, FileName, Verify, Write) of
-	ok ->
-	    ok;
-	Other ->
-	    d("File write of ~s returned: ~p~n", [FileName,Other])
+write_config_file(Dir, FileName, Order, Check, Write, Entries)
+  when is_list(Dir), is_list(FileName),
+       is_function(Order), is_function(Check), is_function(Write),
+       is_list(Entries) ->
+    try
+	SortedEntries = lists:sort(Order, Entries),
+	_ =
+	    lists:foldl(
+	      fun (Entry, State) ->
+		      case Check(Entry, State) of
+			  {ok, NewState} ->
+			      NewState;
+			  {{ok, _}, NewState} ->
+			      NewState
+		      end
+	      end, undefined, SortedEntries),
+	ok
+    of
+	_ ->
+	    case file:open(filename:join(Dir, FileName), [write]) of
+		{ok, Fd} ->
+		    write_config_file(Dir, FileName, Write, Entries, Fd);
+		Error ->
+		    Error
+	    end
     catch
-	throw:Error ->
+	Error ->
 	    S = erlang:get_stacktrace(),
-	    d("File write of ~s throwed: ~p~n    ~p~n", [FileName,Error,S]),
+	    d("File write of ~s throwed: ~p~n    ~p~n",
+	      [FileName, Error, S]),
 	    Error;
-	  T:E ->
+	C:E ->
 	    S = erlang:get_stacktrace(),
 	    d("File write of ~s exception: ~p:~p~n    ~p~n",
-	      [FileName,T,E,S]),
-	    {error,
-	     {failed_write, Dir, FileName,
-	      {T, E, erlang:get_stacktrace()}}}
-    end.
-
-
-do_write_config_file(Dir, FileName, Verify, Write) ->
-    Verify(),
-    case file:open(filename:join(Dir, FileName), [write]) of
-	{ok, Fd} ->
-	    file_write_and_close(Write, Fd, Dir, FileName);
-	Error ->
-	    Error
+	      [FileName,C,E,S]),
+	    {error, {failed_write, Dir, FileName, {C, E, S}}}
     end.
 
-append_config_file(Dir, FileName, Verify, Write) 
-  when (is_list(Dir) andalso 
-	is_list(FileName) andalso 
-	is_function(Verify) andalso 
-	is_function(Write)) ->
-    try
-	begin
-	    do_append_config_file(Dir, FileName, Verify, Write)
-	end
+write_config_file(Dir, FileName, Write, Entries, Fd) ->
+    try	Write(Fd, Entries) of
+	ok ->
+	    close_config_file(Dir, FileName, Fd)
     catch
-	throw:Error ->
-	    Error;
-	  T:E ->
-	    {error,
-	     {failed_append, Dir, FileName,
-	      {T, E, erlang:get_stacktrace()}}}
-    end.
-
-do_append_config_file(Dir, FileName, Verify, Write) ->
-    Verify(),
-    case file:open(filename:join(Dir, FileName), [read, write]) of
-	{ok, Fd} ->
-	    file:position(Fd, eof),
-	    file_write_and_close(Write, Fd, Dir, FileName);
 	Error ->
-	    Error
+	    S = erlang:get_stacktrace(),
+	    d("File write of ~s throwed: ~p~n    ~p~n",
+	      [FileName, Error, S]),
+	    close_config_file(Dir, FileName, Fd),
+	    Error;
+	C:E ->
+	    S = erlang:get_stacktrace(),
+	    d("File write of ~s exception: ~p:~p~n    ~p~n",
+	      [FileName,C,E,S]),
+	    close_config_file(Dir, FileName, Fd),
+	    {error, {failed_write, Dir, FileName, {C, E, S}}}
     end.
 
-
-file_write_and_close(Write, Fd, Dir, FileName) ->
-    ok = Write(Fd),
+close_config_file(Dir, FileName, Fd) ->
     case file:sync(Fd) of
 	ok ->
 	    case file:close(Fd) of
@@ -2563,23 +2561,83 @@ file_write_and_close(Write, Fd, Dir, FileName) ->
 		    {error, {failed_closing, Dir, FileName, Reason}}
 	    end;
 	{error, Reason} ->
+	    _ = file:close(Fd),
 	    {error, {failed_syncing, Dir, FileName, Reason}}
     end.
 
 
-%% XXX remove
-read_config_file(Dir, FileName, Verify) ->
-    read_config_file(
-      Dir, FileName, fun snmp_conf:no_order/2,
-      fun (Term, State) ->
-	      {Verify(Term), State}
-      end).
 
--spec read_config_file(Dir :: string(), 
-		       FileName :: string(),
-		       Order :: function(),
-		       Verify :: function()) ->
-    {ok, Config :: list()} | {error, Reason :: term()}.
+-spec append_config_file(
+	Dir :: string(),
+	FileName :: string(),
+	Order :: order_config_entry_function(),
+	Check :: check_config_entry_function(),
+	Write :: write_config_function(),
+	Entries :: [term()]) ->
+			       ok | {error, term()}.
+
+append_config_file(Dir, FileName, Order, Check, Write, Entries)
+  when is_list(Dir), is_list(FileName),
+       is_function(Order), is_function(Check), is_function(Write),
+       is_list(Entries) ->
+    case file:open(filename:join(Dir, FileName), [read, write]) of
+	{ok, Fd} ->
+	    append_config_file(
+	      Dir, FileName, Order, Check, Write, Entries, Fd);
+	Error ->
+	    Error
+    end.
+
+append_config_file(Dir, FileName, Order, Check, Write, Entries, Fd) ->
+    try
+	%% Verify the entries together with the file content
+	LinesInFileR = read_lines(Fd, [], 1),
+	StartLine =
+	    case LinesInFileR of
+		[] ->
+		    1;
+		[{_, _, EndLine} | _] ->
+		    EndLine
+	    end,
+	LinesR = prepend_lines(LinesInFileR, Entries, StartLine),
+	SortedLines = sort_lines(lists:reverse(LinesR), Order),
+	_ = verify_lines(SortedLines, Check, undefined, []),
+	%% Append to the file
+	Write(Fd, Entries)
+    of
+	ok ->
+	    close_config_file(Dir, FileName, Fd)
+    catch
+	Error ->
+	    S = erlang:get_stacktrace(),
+	    d("File append of ~s throwed: ~p~n    ~p~n",
+	      [FileName, Error, S]),
+	    close_config_file(Dir, FileName, Fd),
+	    Error;
+	C:E ->
+	    S = erlang:get_stacktrace(),
+	    d("File append of ~s exception: ~p:~p~n    ~p~n",
+	      [FileName,C,E,S]),
+	    close_config_file(Dir, FileName, Fd),
+	    {error, {failed_append, Dir, FileName, {C, E, S}}}
+    end.
+
+%% Fake line numbers, one per entry
+prepend_lines(Lines, [], _) ->
+    Lines;
+prepend_lines(Lines, [Entry | Entries], StartLine) ->
+    EndLine = StartLine + 1,
+    prepend_lines([{StartLine, Entry, EndLine} | Lines], Entries, EndLine).
+
+
+
+-spec read_config_file(
+	Dir :: string(),
+	FileName :: string(),
+	Order :: order_config_entry_function(),
+	Check :: check_config_entry_function()) ->
+				{ok, Config :: [Entry :: term()]} |
+				{error, Reason :: term()}.
 
 read_config_file(Dir, FileName, Order, Check)
   when is_list(Dir), is_list(FileName),
@@ -2587,17 +2645,20 @@ read_config_file(Dir, FileName, Order, Check)
     case file:open(filename:join(Dir, FileName), [read]) of
 	{ok, Fd} ->
 	    try
-		{ok,
-		 verify_lines(
-		   lists:sort(
-		     fun ({_, T1, _}, {_, T2, _}) ->
-			     Order(T1, T2)
-		     end,
-		     read_lines(Fd, [], 1)),
-		   Check, undefined, [])}
+		Lines = lists:reverse(read_lines(Fd, [], 1)),
+		SortedLines = sort_lines(Lines, Order),
+		{ok, verify_lines(SortedLines, Check, undefined, [])}
 	    catch
 		Error ->
-		    {error, Error}
+		    S = erlang:get_stacktrace(),
+		    d("File read of ~s throwed: ~p~n    ~p~n",
+		      [FileName, Error, S]),
+		    {error, Error};
+		T:E ->
+		    S = erlang:get_stacktrace(),
+		    d("File read of ~s exception: ~p:~p~n    ~p~n",
+		      [FileName,T,E,S]),
+		    {error, {failed_read, Dir, FileName, {T, E, S}}}
 	    after
 		file:close(Fd)
 	    end;
@@ -2612,7 +2673,7 @@ read_lines(Fd, Acc, StartLine) ->
 	{error, Error, EndLine} ->
             throw({failed_reading, StartLine, EndLine, Error});
         {eof, _EndLine} ->
-            lists:reverse(Acc)
+	    Acc
     end.
 
 read_and_parse_term(Fd, StartLine) ->
@@ -2628,6 +2689,12 @@ read_and_parse_term(Fd, StartLine) ->
             Other
     end.
 
+sort_lines(Lines, Order) ->
+    lists:sort(
+      fun ({_, T1, _}, {_, T2, _}) ->
+	      Order(T1, T2)
+      end, Lines).
+
 verify_lines([], _, _, Acc) ->
     lists:reverse(Acc);
 verify_lines(
@@ -2646,53 +2713,6 @@ verify_lines(
     end.
 
 
-%% XXX remove
-
-%% do_read_config_file(Dir, FileName, Verify) ->
-%%     case file:open(filename:join(Dir, FileName), [read]) of
-%% 	{ok, Fd} ->
-%% 	    Result = read_loop(Fd, [], Verify, 1),
-%% 	    file:close(Fd),
-%% 	    Result;
-%% 	{error, Reason} ->
-%% 	    {error, {Reason, FileName}}
-%%     end.
-
-%% read_loop(Fd, Acc, Check, StartLine) ->
-%%     case read_term(Fd, StartLine) of
-%% 	{ok, Term, EndLine} ->
-%% 	    case (catch Check(Term)) of
-%% 		ok ->
-%% 		    read_loop(Fd, [Term | Acc], Check, EndLine);
-%% 		{error, Reason} ->
-%% 		    {error, {failed_check, StartLine, EndLine, Reason}};
-%% 		Error ->
-%% 		    {error, {failed_check, StartLine, EndLine, Error}}
-%% 	    end;
-%% 	{error, EndLine, Error} ->
-%%             {error, {failed_reading, StartLine, EndLine, Error}};
-%%         eof ->
-%%             {ok, lists:reverse(Acc)}
-%%     end.
-
-%% read_term(Fd, StartLine) ->
-%%     case io:request(Fd, {get_until, "", erl_scan, tokens, [StartLine]}) of
-%% 	{ok, Tokens, EndLine} ->
-%% 	    case erl_parse:parse_term(Tokens) of
-%%                 {ok, Term} ->
-%%                     {ok, Term, EndLine};
-%%                 {error, {Line, erl_parse, Error}} ->
-%%                     {error, Line, {parse_error, Error}}
-%%             end;
-%%         {error, E, EndLine} ->
-%%             {error, EndLine, E};
-%%         {eof, _EndLine} ->
-%%             eof;
-%%         Other ->
-%%             Other
-%%     end.
-
-
 agent_snmp_mk_secret(Alg, Passwd, EngineID) ->
     snmp_usm:passwd2localized_key(Alg, Passwd, EngineID).