(krb5_sock_to_principal): simplify by using `struct sockaddr_storage'
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6528 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -49,25 +49,18 @@ krb5_sock_to_principal (krb5_context context,
|
|||||||
{
|
{
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
krb5_address address;
|
krb5_address address;
|
||||||
int len = krb5_max_sockaddr_size ();
|
struct sockaddr_storage __ss;
|
||||||
char *buf = malloc(len);
|
struct sockaddr *sa = (struct sockaddr *)&__ss;
|
||||||
struct sockaddr *sa;
|
int len = sizeof(__ss);
|
||||||
struct hostent *hostent;
|
struct hostent *hostent;
|
||||||
int family;
|
int family;
|
||||||
char hname[256];
|
char hname[256];
|
||||||
|
|
||||||
if (buf == NULL)
|
if (getsockname (sock, sa, &len) < 0)
|
||||||
return ENOMEM;
|
|
||||||
sa = (struct sockaddr *)buf;
|
|
||||||
|
|
||||||
if (getsockname (sock, sa, &len) < 0) {
|
|
||||||
free (buf);
|
|
||||||
return errno;
|
return errno;
|
||||||
}
|
|
||||||
family = sa->sa_family;
|
family = sa->sa_family;
|
||||||
|
|
||||||
ret = krb5_sockaddr2address (sa, &address);
|
ret = krb5_sockaddr2address (sa, &address);
|
||||||
free (buf);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user