oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_sock_to_principal): use getnameinfo

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10364 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-07-19 16:57:40 +00:00
parent 0f1b7c5a0e
commit 523e2050f2
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/krb5/sock_principal.c
View File

@@ -43,55 +43,28 @@ krb5_sock_to_principal (krb5_context context,
krb5_principal *ret_princ) krb5_principal *ret_princ)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_address address;
struct sockaddr_storage __ss; struct sockaddr_storage __ss;
struct sockaddr *sa = (struct sockaddr *)&__ss; struct sockaddr *sa = (struct sockaddr *)&__ss;
socklen_t len = sizeof(__ss); socklen_t sa_len = sizeof(__ss);
struct hostent *hostent; char hostname[NI_MAXHOST];
int family;
char *hname = NULL;
if (getsockname (sock, sa, &len) < 0) { if (getsockname (sock, sa, &sa_len) < 0) {
ret = errno; ret = errno;
krb5_set_error_string (context, "getsockname: %s", strerror(ret)); krb5_set_error_string (context, "getsockname: %s", strerror(ret));
return ret; return ret;
} }
family = sa->sa_family; ret = getnameinfo (sa, sa_len, hostname, sizeof(hostname), NULL, 0, 0);
if (ret) {
ret = krb5_sockaddr2address (context, sa, &address); int save_errno = errno;
if (ret)
return ret;
hostent = roken_gethostbyaddr (address.address.data, krb5_set_error_string (context, "getnameinfo: %s", gai_strerror(ret));
address.address.length, return krb5_eai_to_heim_errno(ret, save_errno);
family);
if (hostent == NULL) {
krb5_set_error_string (context, "gethostbyaddr: %s",
hstrerror(h_errno));
return krb5_h_errno_to_heim_errno(h_errno);
}
hname = hostent->h_name;
if (strchr(hname, '.') == NULL) {
char **a;
for (a = hostent->h_aliases; a != NULL && *a != NULL; ++a)
if (strchr(*a, '.') != NULL) {
hname = *a;
break;
}
} }
hname = strdup(hname);
if (hname == NULL) {
krb5_set_error_string (context, "malloc: out of memory");
return ENOMEM;
}
ret = krb5_sname_to_principal (context, ret = krb5_sname_to_principal (context,
hname, hostname,
sname, sname,
type, type,
ret_princ); ret_princ);
free(hname);
return ret; return ret;
} }