Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  ...

1 files changed, 126 insertions, 9 deletions

diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index b0e192344d..30b5dd1fc7 100644
--- a/lib/snmp/test/snmp_manager_user.erl
+++ b/lib/snmp/test/snmp_manager_user.erl
@@ -50,14 +50,14 @@
 	 update_agent_info/3, update_agent_info/4, 
 	 which_all_agents/0, which_own_agents/0, 
 	 load_mib/1, unload_mib/1, 
-	 sync_get/1,       sync_get/2,       sync_get/3,
-	 async_get/1,      async_get/2,      async_get/3,
-	 sync_get_next/1,  sync_get_next/2,  sync_get_next/3,
-	 async_get_next/1, async_get_next/2, async_get_next/3,
-	 sync_set/1,       sync_set/2,       sync_set/3, 
-	 async_set/1,      async_set/2,      async_set/3, 
-	 sync_get_bulk/3,  sync_get_bulk/4,  sync_get_bulk/5,
-	 async_get_bulk/3, async_get_bulk/4, async_get_bulk/5,
+	 sync_get/1,       sync_get/2,       sync_get/3,       sync_get2/3, 
+	 async_get/1,      async_get/2,      async_get/3,      async_get2/3,
+	 sync_get_next/1,  sync_get_next/2,  sync_get_next/3,  sync_get_next2/3,
+	 async_get_next/1, async_get_next/2, async_get_next/3, async_get_next2/3,
+	 sync_set/1,       sync_set/2,       sync_set/3,       sync_set2/3, 
+	 async_set/1,      async_set/2,      async_set/3,      async_set2/3, 
+	 sync_get_bulk/3,  sync_get_bulk/4,  sync_get_bulk/5,  sync_get_bulk2/5,
+	 async_get_bulk/3, async_get_bulk/4, async_get_bulk/5, async_get_bulk2/5,
 	 name_to_oid/1, oid_to_name/1, 
 	 purify_oid/1	 
         ]).
@@ -171,6 +171,10 @@ sync_get(Addr_or_TargetName, Oids) ->
 sync_get(Addr, Port, Oids) ->
     call({sync_get, Addr, Port, Oids}).
 
+sync_get2(TargetName, Oids, SendOpts) ->
+    call({sync_get2, TargetName, Oids, SendOpts}).
+
+
 %% --
 
 async_get(Oids) ->
@@ -182,6 +186,9 @@ async_get(Addr_or_TargetName, Oids) ->
 async_get(Addr, Port, Oids) ->
     call({async_get, Addr, Port, Oids}).
 
+async_get2(TargetName, Oids, SendOpts) ->
+    call({async_get2, TargetName, Oids, SendOpts}).
+
 %% --
 
 sync_get_next(Oids) ->
@@ -193,6 +200,9 @@ sync_get_next(Addr_or_TargetName, Oids) ->
 sync_get_next(Addr, Port, Oids) ->
     call({sync_get_next, Addr, Port, Oids}).
 
+sync_get_next2(TargetName, Oids, SendOpts) ->
+    call({sync_get_next2, TargetName, Oids, SendOpts}).
+
 %% --
 
 async_get_next(Oids) ->
@@ -204,6 +214,9 @@ async_get_next(Addr_or_TargetName, Oids) ->
 async_get_next(Addr, Port, Oids) ->
     call({async_get_next, Addr, Port, Oids}).
 
+async_get_next2(TargetName, Oids, SendOpts) ->
+    call({async_get_next2, TargetName, Oids, SendOpts}).
+
 %% --
 
 sync_set(VAV) ->
@@ -215,6 +228,9 @@ sync_set(Addr_or_TargetName, VAV) ->
 sync_set(Addr, Port, VAV) ->
     call({sync_set, Addr, Port, VAV}).
 
+sync_set2(TargetName, VAV, SendOpts) ->
+    call({sync_set2, TargetName, VAV, SendOpts}).
+
 %% --
 
 async_set(VAV) ->
@@ -226,6 +242,9 @@ async_set(Addr_or_TargetName, VAV) ->
 async_set(Addr, Port, VAV) ->
     call({async_set, Addr, Port, VAV}).
 
+async_set2(TargetName, VAV, SendOpts) ->
+    call({async_set2, TargetName, VAV, SendOpts}).
+
 %% --
 
 sync_get_bulk(NonRep, MaxRep, Oids) ->
@@ -237,6 +256,9 @@ sync_get_bulk(Addr_or_TargetName, NonRep, MaxRep, Oids) ->
 sync_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
     call({sync_get_bulk, Addr, Port, NonRep, MaxRep, Oids}).
 
+sync_get_bulk2(TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+    call({sync_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}).
+
 %% --
 
 async_get_bulk(NonRep, MaxRep, Oids) ->
@@ -248,6 +270,9 @@ async_get_bulk(Addr_or_TargetName, NonRep, MaxRep, Oids) ->
 async_get_bulk(Addr, Port, NonRep, MaxRep, Oids) ->
     call({async_get_bulk, Addr, Port, NonRep, MaxRep, Oids}).
 
+async_get_bulk2(TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+    call({async_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}).
+
 %% -- 
 
 name_to_oid(Name) ->
@@ -400,6 +425,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (sync) get-request --
 	%% 
 
+	{{sync_get2, TargetName, Oids, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received sync_get2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", [TargetName, Oids, SendOpts]),
+	    Res = snmpm:sync_get2(Id, TargetName, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{sync_get, Oids}, From, Ref} ->
 	    d("loop -> received sync_get request "
@@ -439,6 +474,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (async) get-request --
 	%% 
 
+	{{async_get2, TargetName, Oids, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received async_get2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", [TargetName, Oids, SendOpts]),
+	    Res = snmpm:async_get2(Id, TargetName, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{async_get, Oids}, From, Ref} ->
 	    d("loop -> received async_get request"),
@@ -472,6 +517,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (sync) get_next-request --
 	%% 
 
+	{{sync_get_next2, TargetName, Oids, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received sync_get_next2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", [TargetName, Oids, SendOpts]),
+	    Res = snmpm:sync_get_next2(Id, TargetName, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{sync_get_next, Oids}, From, Ref} ->
 	    d("loop -> received sync_get_next request"),
@@ -505,6 +560,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (async) get_next-request --
 	%% 
 
+	{{async_get_next2, TargetName, Oids, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received async_get_next2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", [TargetName, Oids, SendOpts]),
+	    Res = snmpm:async_get_next2(Id, TargetName, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{async_get_next, Oids}, From, Ref} ->
 	    d("loop -> received async_get_next request"),
@@ -538,6 +603,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (sync) set-request --
 	%% 
 
+	{{sync_set2, TargetName, VAV, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received sync_set2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   VAV:        ~p"
+	      "~n   SendOpts:   ~p", [TargetName, VAV, SendOpts]),
+	    Res = snmpm:sync_set2(Id, TargetName, VAV, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	{{sync_set, VAV}, From, Ref} ->
 	    d("loop -> received sync_set request"),
 	    Res = [snmpm:sync_set(Id, TargetName, VAV) ||
@@ -568,6 +643,16 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (async) set-request --
 	%% 
 
+	{{async_set2, TargetName, VAV, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received async_set2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   VAV:        ~p"
+	      "~n   SendOpts:   ~p", [TargetName, VAV, SendOpts]),
+	    Res = snmpm:async_set2(Id, TargetName, VAV, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	{{async_set, VAV}, From, Ref} ->
 	    d("loop -> received async_set request"),
 	    Res = [snmpm:async_set(Id, TargetName, VAV) ||
@@ -598,6 +683,20 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (sync) get-bulk-request --
 	%% 
 
+	{{sync_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}, From, Ref} 
+	  when is_list(TargetName) ->
+	    d("loop -> received sync_get_bulk request with"
+	      "~n   TargetName: ~p"
+	      "~n   NonRep:     ~w"
+	      "~n   MaxRep:     ~w"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", 
+	      [TargetName, NonRep, MaxRep, Oids, SendOpts]),
+	    Res = snmpm:sync_get_bulk2(Id, TargetName, 
+				       NonRep, MaxRep, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{sync_get_bulk, NonRep, MaxRep, Oids}, From, Ref} ->
 	    d("loop -> received sync_get_bulk request with"
@@ -645,6 +744,20 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	%% -- (async) get-bulk-request --
 	%% 
 
+	{{async_get_bulk2, TargetName, NonRep, MaxRep, Oids, SendOpts}, 
+	 From, Ref} when is_list(TargetName) ->
+	    d("loop -> received async_get_bulk2 request with"
+	      "~n   TargetName: ~p"
+	      "~n   NonRep:     ~w"
+	      "~n   MaxRep:     ~w"
+	      "~n   Oids:       ~p"
+	      "~n   SendOpts:   ~p", 
+	      [TargetName, NonRep, MaxRep, Oids, SendOpts]),
+	    Res = snmpm:async_get_bulk2(Id, TargetName, 
+					NonRep, MaxRep, Oids, SendOpts), 
+	    reply(From, Res, Ref),
+	    loop(S);
+
 	%% No agent specified, so send it to all of them
 	{{async_get_bulk, NonRep, MaxRep, Oids}, From, Ref} ->
 	    d("loop -> received async_get_bulk request with"
@@ -847,7 +960,11 @@ call(Req, To) when is_integer(To) ->
 	    {error, timeout}
     end.
 
-reply(Pid, Reply, Ref) ->    
+reply(Pid, Reply, Ref) -> 
+    d("reply -> entry with"
+      "~n   Pid:   ~p"
+      "~n   Reply: ~p"
+      "~n   Ref:   ~p", [Pid, Reply, Ref]),
     Pid ! {Reply, Ref}.
 
 cast(Msg) ->