~rdoering/ubuntu/karmic/erlang/fix-535090

« back to all changes in this revision

Viewing changes to lib/ssh/src/ssh_file.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-02-15 16:42:52 UTC
  • mfrom: (3.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090215164252-q5x4rcf8a5pbesb1
Tags: 1:12.b.5-dfsg-2
Upload to unstable after lenny is released.

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
add_ip(Host)                                                             ->
80
80
    case inet:getaddr(Host, inet) of
81
81
        {ok, Addr} ->
82
 
            case ssh_cm:encode_ip(Addr) of
 
82
            case ssh_connection:encode_ip(Addr) of
83
83
                false -> Host;
84
84
                IPString -> Host ++ "," ++ IPString
85
85
            end;
323
323
        Line ->
324
324
            case string:tokens(Line, " ") of
325
325
                [HostList, Alg, KeyData] ->
326
 
                    %%              io:format("lookup_host_key_fd: HostList ~p Alg ~p KeyData ~p\n",
327
 
                    %%                        [HostList, Alg, KeyData]),
 
326
%%                  io:format(" ~p lookup_host_key_fd: HostList ~p Alg ~p KeyData ~p\n",
 
327
%%                            [Host, HostList, Alg, KeyData]),
328
328
                    case lists:member(Host, string:tokens(HostList, ",")) of
329
329
                        true ->
330
330
                            decode_public_key_v2(ssh_bits:b64_decode(KeyData), Alg);