diff options
| author | Stef Walter <stef@memberwebs.com> | 2009-06-05 19:44:20 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2009-06-05 19:44:20 +0000 |
| commit | c5466de712cb03f92809c7ad828f795e41e0ca62 (patch) | |
| tree | 66e6ff6fb5a125cf264da45ece1215484f8d3363 | |
| parent | 1e602f2fc10f638fb4a39cf765d89ae89c49ea9a (diff) | |
IPV6 fixes, and new version
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | srcx/jstart.c | 4 |
3 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,6 @@ +1.5 + - Fix problems with IPv6 startup, and other minor fixes. + 1.4 - Support FreeBSD 7.2 multi-ip jails. diff --git a/configure.ac b/configure.ac index 2290a28..c464bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,8 @@ dnl THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH dnl DAMAGE. # Process this file with autoconf to produce a configure script. -AC_INIT(jailutils, 1.4, stef@memberwebs.com) -AM_INIT_AUTOMAKE(jailutils, 1.4) +AC_INIT(jailutils, 1.5, stef@memberwebs.com) +AM_INIT_AUTOMAKE(jailutils, 1.5) AC_CONFIG_SRCDIR([src/killjail.c]) AM_CONFIG_HEADER([config.h]) @@ -61,6 +61,16 @@ if test "$enable_static" = "yes"; then echo "enabling static compile mode" fi +# IPV6 enabled +AC_ARG_ENABLE(ipv6, + AC_HELP_STRING([--disable-ipv6], + [Disable IPV6 support])) + +if test "$enable_ipv6" != "no"; then + AC_DEFINE_UNQUOTED(HAVE_INET6, 1, [Have IPV6 Support]) + echo "enabling ipv6 support" +fi + # Checks for libraries. AC_CHECK_LIB([kvm], [kvm_open], , [ echo "ERROR: Must have FreeBSD 4.x or higher"; exit 1]) diff --git a/srcx/jstart.c b/srcx/jstart.c index 353c579..ca9319d 100644 --- a/srcx/jstart.c +++ b/srcx/jstart.c @@ -124,7 +124,7 @@ static void add_addresses(struct jail *j, struct addrinfo *all) memcpy(j->ip4 + j->ip4s, &((struct sockaddr_in*)res->ai_addr)->sin_addr, sizeof (*(j->ip4))); ++j->ip4s; break; -#ifdef INET6 +#ifdef HAVE_INET6 case AF_INET6: j->ip6 = realloc(j->ip6, sizeof (*(j->ip6)) * (j->ip6s + 1)); if(j->ip6 == NULL) @@ -132,7 +132,7 @@ static void add_addresses(struct jail *j, struct addrinfo *all) memcpy(j->ip6 + j->ip6s, &((struct sockaddr_in6*)res->ai_addr)->sin6_addr, sizeof (*(j->ip6))); ++j->ip6s; break; -#endif /* INET6 */ +#endif /* HAVE_INET6 */ default: errx(1, "Address family %d not supported", res->ai_family); } |