[Bug 910] known_hosts port numbers

[bugzilla-daemon at mindrot.org]

http://bugzilla.mindrot.org/show_bug.cgi?id=910


devin.nate at bridgecomm.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #980 is|0                           |1
           obsolete|                            |




------- Comment #39 from devin.nate at bridgecomm.net  2006-02-21 14:08 -------
Created an attachment (id=1073)
 --> (http://bugzilla.mindrot.org/attachment.cgi?id=1073&action=view)
Patch 980 for 4.3p2 with minor modifications

Hi folks,

The work looks good. I'm uploading a very slightly modified version of patch
980 (the latest by Darren Tucker). It appears to me to be the best. Darren,
thanks.

This patch is applied against 4.3p2. The differences when compared against
patch 980 are:

1) In sshconnect.c, where the Darren patch 980 did:

                ip = xstrdup(ntop);
+               ip = put_host_port(ntop, options.port);

I didn't understand why the ip = xstrdup(ntop); wasn't removed, so this patch
does:

-               ip = xstrdup(ntop);
+               ip = put_host_port(ntop, options.port);

2) Applies cleanly against openssh 4.3p2 (the addition of some code to misc.h
caused the patch to fail, and file location offsets are a bit different).

3) The modifications to sshconnect2.c were removed, they appeared to be there
for debugging only. The relavent section from patch 980 was: 

-- sshconnect2.c        31 Aug 2005 09:46:27 -0000      1.131
+++ sshconnect2.c       3 Oct 2005 02:25:14 -0000
@@ -1303,6 +1303,8 @@ userauth_hostbased(Authctxt *authctxt)
        u_int blen, slen;
        int ok, i, len, found = 0;

+       debug("%s called", __func__);
+


Thanks,
Devin Nate




------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.