Deleted Added
full compact
14a15,16
> *
> * $FreeBSD: head/contrib/tcp_wrappers/tli.c 56977 2000-02-03 10:27:03Z shin $
67a70,73
> #ifdef INET6
> static struct sockaddr_storage client;
> static struct sockaddr_storage server;
> #else
69a76
> #endif
77a85
> #ifdef INET6
79c87,92
< && STR_EQ(request->config->nc_protofmly, "inet")) {
---
> && (STR_EQ(request->config->nc_protofmly, "inet") ||
> STR_EQ(request->config->nc_protofmly, "inet6"))) {
> #else
> if ((request->config = tli_transport(request->fd)) != 0
> && STR_EQ(request->config->nc_protofmly, "inet")) {
> #endif
80a94,97
> #ifdef INET6
> client = *(struct sockaddr_storage *) request->client->unit->addr.buf;
> request->client->sin = (struct sockaddr *) &client;
> #else
82a100
> #endif
85,86c103,109
< server = *(struct sockaddr_in *) request->server->unit->addr.buf;
< request->server->sin = &server;
---
> #ifdef INET6
> server = *(struct sockaddr_storage *) request->server->unit->addr.buf;
> request->server->sin = (struct sockaddr *) &server;
> #else
> server = *(struct sockaddr_in *) request->server->unit->addr.buf;
> request->server->sin = &server;
> #endif
189a213,219
> #ifdef NO_CLONE_DEVICE
> /*
> * If the network devices are not cloned (as is the case for
> * Solaris 8 Beta), we must compare the major device numbers.
> */
> if (major(from_config.st_rdev) == major(from_client.st_rdev))
> #else
190a221
> #endif