kinit now builds and works on some machines
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@302 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,17 +1,18 @@
|
||||
#include "krb5_locl.h"
|
||||
#include "krb5_error.h"
|
||||
|
||||
static int
|
||||
send_and_recv (int fd,
|
||||
struct sockaddr_in *addr,
|
||||
krb5_data *send,
|
||||
const krb5_data *send,
|
||||
krb5_data *recv)
|
||||
{
|
||||
struct fdset fdset;
|
||||
struct fd_set fdset;
|
||||
struct timeval timeout;
|
||||
int ret;
|
||||
long nbytes;
|
||||
|
||||
if (sendto (fd, send->data, send->len, 0,
|
||||
if (sendto (fd, send->data, send->length, 0,
|
||||
(struct sockaddr *)addr, sizeof(*addr)) < 0)
|
||||
return -1;
|
||||
FD_ZERO(&fdset);
|
||||
@@ -22,24 +23,25 @@ send_and_recv (int fd,
|
||||
if (ret <= 0)
|
||||
return -1;
|
||||
else {
|
||||
ioctl (fd, FIONREAD, &nbytes);
|
||||
int len;
|
||||
|
||||
nbytes -= sizeof(struct udphdr) + sizeof(struct iphdr);
|
||||
if (ioctl (fd, FIONREAD, &nbytes) < 0)
|
||||
return -1;
|
||||
|
||||
recv->data = malloc (nbytes);
|
||||
ret = recvfrom (fd, recv->data, nbytes, 0, NULL, 0);
|
||||
ret = recvfrom (fd, recv->data, nbytes, 0, NULL, &len);
|
||||
if (ret < 0) {
|
||||
free (recv->data);
|
||||
return -1;
|
||||
}
|
||||
recv->data = realloc (recv->data, ret);
|
||||
recv->len = ret;
|
||||
recv->length = ret;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
krb5_error_code
|
||||
krb5_sentdo_kdc (krb5_context context,
|
||||
krb5_sendto_kdc (krb5_context context,
|
||||
const krb5_data *send,
|
||||
const krb5_data *realm,
|
||||
krb5_data *receive)
|
||||
@@ -51,35 +53,52 @@ krb5_sentdo_kdc (krb5_context context,
|
||||
int port;
|
||||
int i;
|
||||
|
||||
port = krb5_getportbyname ("kerberos", "udp", htons(750));
|
||||
port = krb5_getportbyname ("kerberos", "udp", htons(88));
|
||||
fd = socket (AF_INET, SOCK_DGRAM, 0);
|
||||
if (fd < 0)
|
||||
if (fd < 0) {
|
||||
krb5_free_krbhst (context, hostlist);
|
||||
return errno;
|
||||
}
|
||||
|
||||
err = krb5_get_krbhst (context, realm, &hostlist);
|
||||
if (err) {
|
||||
close (fd);
|
||||
return err;
|
||||
}
|
||||
|
||||
for (i = 0; i < 3; ++i)
|
||||
for (hp = hostlist; p = *hp; ++hp) {
|
||||
char *addr;
|
||||
char *colon;
|
||||
|
||||
colon = strchr (p, ':');
|
||||
if (colon)
|
||||
*colon = '\0';
|
||||
hostent = gethostbyname (p);
|
||||
if (colon)
|
||||
*colon++ = ':';
|
||||
while (addr = *hostent->h_addr_list++) {
|
||||
struct sockaddr_in a;
|
||||
|
||||
memset (a, 0, sizeof(a));
|
||||
memset (&a, 0, sizeof(a));
|
||||
a.sin_family = AF_INET;
|
||||
a.sin_port = port;
|
||||
if (colon) {
|
||||
int tmp;
|
||||
|
||||
sscanf (colon, "%d", &tmp);
|
||||
a.sin_port = htons(tmp);
|
||||
} else
|
||||
a.sin_port = port;
|
||||
a.sin_addr = *((struct in_addr *)addr);
|
||||
|
||||
if (send_and_recv (fd, &a, send, recv) == 0) {
|
||||
if (send_and_recv (fd, &a, send, receive) == 0) {
|
||||
close (fd);
|
||||
krb5_free_krbhst (context, hostlist);
|
||||
return KDC_ERR_NONE;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
close (fd);
|
||||
krb5_free_krbhst (context, hostlist);
|
||||
return KRB5_KDC_UNREACH;
|
||||
}
|
||||
|
Reference in New Issue
Block a user