make v6 friendly and simplify
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6747 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -44,9 +44,6 @@ krb5_context context;
|
||||
static int
|
||||
proto (int sock, const char *service)
|
||||
{
|
||||
struct sockaddr_in remote, local;
|
||||
int addrlen;
|
||||
krb5_address remote_addr, local_addr;
|
||||
krb5_auth_context auth_context;
|
||||
krb5_error_code status;
|
||||
krb5_principal server;
|
||||
@@ -57,35 +54,17 @@ proto (int sock, const char *service)
|
||||
krb5_data data;
|
||||
u_int32_t len, net_len;
|
||||
|
||||
addrlen = sizeof(local);
|
||||
if (getsockname (sock, (struct sockaddr *)&local, &addrlen) < 0
|
||||
|| addrlen != sizeof(local))
|
||||
err (1, "getsockname)");
|
||||
|
||||
addrlen = sizeof(remote);
|
||||
if (getpeername (sock, (struct sockaddr *)&remote, &addrlen) < 0
|
||||
|| addrlen != sizeof(remote))
|
||||
err (1, "getpeername");
|
||||
|
||||
status = krb5_auth_con_init (context, &auth_context);
|
||||
if (status)
|
||||
errx (1, "krb5_auth_con_init: %s",
|
||||
krb5_get_err_text(context, status));
|
||||
|
||||
local_addr.addr_type = AF_INET;
|
||||
local_addr.address.length = sizeof(local.sin_addr);
|
||||
local_addr.address.data = &local.sin_addr;
|
||||
status = krb5_auth_con_setaddrs_from_fd (context,
|
||||
auth_context,
|
||||
&sock);
|
||||
|
||||
remote_addr.addr_type = AF_INET;
|
||||
remote_addr.address.length = sizeof(remote.sin_addr);
|
||||
remote_addr.address.data = &remote.sin_addr;
|
||||
|
||||
status = krb5_auth_con_setaddrs (context,
|
||||
auth_context,
|
||||
&local_addr,
|
||||
&remote_addr);
|
||||
if (status)
|
||||
errx (1, "krb5_auth_con_setaddr: %s",
|
||||
errx (1, "krb5_auth_con_setaddrs_from_fd: %s",
|
||||
krb5_get_err_text(context, status));
|
||||
|
||||
if(gethostname (hostname, sizeof(hostname)) < 0)
|
||||
@@ -175,34 +154,9 @@ proto (int sock, const char *service)
|
||||
static int
|
||||
doit (int port, const char *service)
|
||||
{
|
||||
int sock, sock2;
|
||||
struct sockaddr_in my_addr;
|
||||
int one = 1;
|
||||
mini_inted (port);
|
||||
|
||||
sock = socket (AF_INET, SOCK_STREAM, 0);
|
||||
if (sock < 0)
|
||||
err (1, "socket");
|
||||
|
||||
memset (&my_addr, 0, sizeof(my_addr));
|
||||
my_addr.sin_family = AF_INET;
|
||||
my_addr.sin_port = port;
|
||||
my_addr.sin_addr.s_addr = INADDR_ANY;
|
||||
|
||||
if (setsockopt (sock, SOL_SOCKET, SO_REUSEADDR,
|
||||
(void *)&one, sizeof(one)) < 0)
|
||||
warn ("setsockopt SO_REUSEADDR");
|
||||
|
||||
if (bind (sock, (struct sockaddr *)&my_addr, sizeof(my_addr)) < 0)
|
||||
err (1, "bind");
|
||||
|
||||
if (listen (sock, 1) < 0)
|
||||
err (1, "listen");
|
||||
|
||||
sock2 = accept (sock, NULL, NULL);
|
||||
if (sock2 < 0)
|
||||
err (1, "accept");
|
||||
|
||||
return proto (sock2, service);
|
||||
return proto (STDIN_FILENO, service);
|
||||
}
|
||||
|
||||
int
|
||||
|
Reference in New Issue
Block a user