anchor.diff:  
   
   really_do_hostkey_fingerprint_check(Config, HashAlg) ->
  -    PrivDir = proplists:get_value(priv_dir, Config),
  -    UserDirServer = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
  -    file:make_dir(UserDirServer),
  +    UserDir = proplists:get_value(user_dir, Config),
       SysDir = proplists:get_value(data_dir, Config),
  -
  -    UserDirClient = 
  -	ssh_test_lib:create_random_dir(Config), % Ensure no 'known_hosts' disturbs
   
       %% All host key fingerprints.  Trust that public_key has checked the ssh_hostkey_fingerprint
       %% function since that function is used by the ssh client...
  
positive.code: 
  %%--------------------------------------------------------------------
  unexpectedfun_option_client(Config) ->
      PrivDir = proplists:get_value(priv_dir, Config),
      UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
      file:make_dir(UserDir),
      SysDir = proplists:get_value(data_dir, Config),
  
      Parent = self(),
  
negative.code: %%--------------------------------------------------------------------
  init_per_testcase(_TestCase, Config) ->
      ssh:start(),
      %% Create a clean user_dir
      UserDir = filename:join(proplists:get_value(priv_dir, Config), nopubkey),
      ssh_test_lib:del_dirs(UserDir),
      file:make_dir(UserDir),
      [{user_dir,UserDir}|Config].
  
  end_per_testcase(_TestCase, Config) ->
      ssh:stop(),
      ok.
  
  %%--------------------------------------------------------------------
  %% Test Cases --------------------------------------------------------
  %%--------------------------------------------------------------------
  
  %%% validate to server that uses the 'password' option
  server_password_option(Config) when is_list(Config) ->
      UserDir = proplists:get_value(user_dir, Config),
      SysDir = proplists:get_value(data_dir, Config),
      {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
  					     {user_dir, UserDir},
  