Attachment 514217 Details for Bug 671460 – Fix used in RHEL-5 supporting IPv4 only

[patch] Fix used in RHEL-5 supporting IPv4 only

cvs-1.11.22-gssapi-dns.patch (text/plain), 1.69 KB, created by Petr Pisar on 2011-07-21 14:39:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2011-07-21 14:39:27 UTC

Size: 1.69 KB

patch

obsolete

>GSSAPI will do its own lookup for the "primary" hostname, with a
>rotating DNS alias it will end up occasionally with a different result
>than the machine we already connected to.. this gives errors along the
>line of
>
>GSSAPI authentication failed: lxcvs08.cern.ch Miscellaneous failure/Unknown code krb5 144
>
>Since GSSAPI will do a forward+reverse lookup anyway to find the
>"canocical" hostname, we just feed it the IP we are currently
>connected to.
>
>--- cvs/src/client.c.gssdns	2008-11-17 14:35:41.000000000 +0100
>+++ cvs/src/client.c	2008-11-17 14:50:50.000000000 +0100
>@@ -4276,17 +4276,28 @@
>     gss_buffer_desc *tok_in_ptr, tok_in, tok_out;
>     OM_uint32 stat_min, stat_maj;
>     gss_name_t server_name;
>+    struct sockaddr_in peer;
>+    socklen_t   peer_len = sizeof(struct sockaddr_in);
> 
>     str = "BEGIN GSSAPI REQUEST\012";
> 
>     if (send (sock, str, strlen (str), 0) < 0)
> 	error (1, 0, "cannot send: %s", SOCK_STRERROR (SOCK_ERRNO));
> 
>-    if (strlen (hostname) > BUFSIZE - 5)
>-	error (1, 0, "Internal error: hostname exceeds length of buffer");
>+    /* find out who we are really talking to - should not allow
>+       GSSAPI to resolve the name again to something different */
>+    if(getpeername (sock, (struct sockaddr*)&peer, &peer_len) < 0 ) {
>+	error (1, 0, "cannot identify remote peer: %s", SOCK_STRERROR (SOCK_ERRNO));
>+    } 
>-    sprintf (buf, "cvs@%s", hostname);
>+    sprintf (buf, "cvs@%s", inet_ntoa(peer.sin_addr));
>+
>     tok_in.length = strlen (buf);
>     tok_in.value = buf;
>+    if (trace) 
>+    {
>+      fprintf (stderr, " -> will use GSSAPI principal '%s' for %s\n",
>+	       buf,hostname);
>+    }
>     gss_import_name (&stat_min, &tok_in, GSS_C_NT_HOSTBASED_SERVICE,
> 		     &server_name);
>

Actions: View | Diff

Attachments on bug 671460: 514217 | 514218 | 763797 | 764601