anchor.diff:      end,
       Config.
   
  -find_executables([], Config) ->
  -    Config;
  -find_executables([Exec | Execs], Config) ->
  +find_executable(Exec, Config) ->
       ExecStr = atom_to_list(Exec),
       case os:find_executable(ExecStr) of
   	false ->
  -	    find_sys_executables(
  -	      Execs, Config, Exec, ExecStr,
  +	    %% The sbin dirs are not in the PATH on all platforms...
  +	    find_sys_executable(
  +	      Exec, ExecStr,
   	      [["usr", "local", "sbin"],
   	       ["usr", "sbin"],
  -	       ["sbin"]]);
  +	       ["sbin"]],
  +	     Config);
   	Path ->
  -	    find_executables(
  -	      Execs,
  -	      [{Exec, Path} | Config])
  -    end.
  -
  -find_sys_executables(_Execs, _Config, _Exec, ExecStr, []) ->
  +	    [{Exec, Path} | Config]
  +    end.
  +
  +find_sys_executable(_Exec, ExecStr, [], _Config) ->
       {skip, ExecStr ++ " not found"};
  -find_sys_executables(Execs, Config, Exec, ExecStr, [Dir | Dirs]) ->
  +find_sys_executable(Exec, ExecStr, [Dir | Dirs], Config) ->
       case os:find_executable(filename:join(["/" | Dir] ++ [ExecStr])) of
   	false ->
  -	    find_sys_executables(Execs, Config, Exec, ExecStr, Dirs);
  +	    find_sys_executable(Exec, ExecStr, Dirs, Config);
   	Path ->
  -	    find_executables(
  -	      Execs,
  -	      [{Exec, Path} | Config])
  +	    [{Exec, Path} | Config]
       end.
   
   start_agent(Config) ->
  
positive.code: end_per_suite(_Config) ->
      ok.
  
  init_per_group(ipv6, Config) ->
      case ct:require(ipv6_hosts) of
  	ok ->
  	    init_per_group_ip([inet6], Config);
  	_ ->
  	    {skip, "Host does not support IPV6"}
      end;
  %%
  init_per_group(ipv4, Config) ->
      init_per_group_ip([inet], Config);
  %%
  init_per_group(dual_ip, Config) ->
      case find_executables([snmpget, snmptrapd], Config) of
  	NewConfig when is_list(NewConfig) ->
  	    case ct:require(ipv6_hosts) of
  		ok ->
  		    init_per_group_ip([inet, inet6], NewConfig);
  		_ ->
  		    {skip, "Host does not support IPV6"}
  	    end;
  	Other ->
  	    Other
      end;
  %%
  init_per_group(get, Config) ->
      %% From Ubuntu package snmp
      find_executables([snmpget], Config);
  %%
  init_per_group(inform, Config) ->
      %% From Ubuntu package snmptrapfmt
      find_executables([snmptrapd], Config);
  init_per_group(_, Config) ->
      Config.
  
  init_per_group_ip(Families, Config) ->
      Dir = ?config(priv_dir, Config),
  
negative.code: all() -> 
      [
       {group, ipv4},
       {group, ipv6},
       {group, ipv4_ipv6}
      ].
  
  groups() ->
  