X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fload-fragment.c;h=3ebea4316fc4a86275191fe2e11e9302700ef3bf;hp=5e0637de65ed42120a76b80ce367cfae3ff7d74f;hb=c0120d992ce5ab004d9be5ff6ca15e5fe17f9884;hpb=88ce42f6944774788f610598fccdc6bab4283497 diff --git a/src/load-fragment.c b/src/load-fragment.c index 5e0637de6..3ebea4316 100644 --- a/src/load-fragment.c +++ b/src/load-fragment.c @@ -252,8 +252,8 @@ static int config_parse_socket_bind( void *data, void *userdata) { - int r; Socket *s; + SocketAddressBindIPv6Only b; assert(filename); assert(lvalue); @@ -262,12 +262,17 @@ static int config_parse_socket_bind( s = (Socket*) data; - if ((r = parse_boolean(rvalue)) < 0) { - log_error("[%s:%u] Failed to parse bind IPv6 only value: %s", filename, line, rvalue); - return r; - } + if ((b = socket_address_bind_ipv6_only_from_string(rvalue)) < 0) { + int r; - s->bind_ipv6_only = r ? SOCKET_ADDRESS_IPV6_ONLY : SOCKET_ADDRESS_BOTH; + if ((r = parse_boolean(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse bind IPv6 only value: %s", filename, line, rvalue); + return -EBADMSG; + } + + s->bind_ipv6_only = r ? SOCKET_ADDRESS_IPV6_ONLY : SOCKET_ADDRESS_BOTH; + } else + s->bind_ipv6_only = b; return 0; }