← Back to branch summary

~ubuntu-branches/ubuntu/precise/krb5/precise-updates

« back to all changes in this revision

Viewing changes to src/lib/rpc/clnt_tcp.c

  • Committer: Package Import Robot
  • Author(s): Sam Hartman
  • Date: 2011-12-01 19:34:41 UTC
  • mfrom: (28.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20111201193441-9tipg3aru1jsidyv
Tags: 1.10+dfsg~alpha1-6
http://bugs.debian.org/650671
http://bugs.debian.org/650603
http://bugs.debian.org/650611
* Fix segfault with unknown hostnames in krb5_sname_to_principal,
  Closes: #650671
* Indicate that this library breaks libsmbclient versions that depend on
  krb5_locate_kdc, Closes: #650603, #650611

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/rpc/clnt_tcp.c
187
187
        ct->ct_sock = *sockp;
188
188
        ct->ct_wait.tv_usec = 0;
189
189
        ct->ct_waitset = FALSE;
190
 
        if (raddr == NULL)
191
 
            memset(&ct->ct_addr, 0, sizeof(ct->ct_addr));
192
 
        else
 
190
        if (raddr == NULL) {
 
191
            /* Get the remote address from the socket, if it's IPv4. */
 
192
            struct sockaddr_in sin;
 
193
            socklen_t len = sizeof(sin);
 
194
            int ret = getpeername(ct->ct_sock, (struct sockaddr *)&sin, &len);
 
195
            if (ret == 0 && len == sizeof(sin) && sin.sin_family == AF_INET)
 
196
                ct->ct_addr = sin;
 
197
            else
 
198
                memset(&ct->ct_addr, 0, sizeof(ct->ct_addr));
 
199
        } else
193
200
            ct->ct_addr = *raddr;
194
201
 
195
202
        /*