summaryrefslogtreecommitdiff
path: root/src/network/networkd-address-pool.c
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 02:55:57 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-09 02:55:57 -0400
commitf96805e2322e061e088bb5725f8e1ee6006167f8 (patch)
tree888f20f86c77769e179ef5ba592cdcb4ed15910c /src/network/networkd-address-pool.c
parentacd190019d99fe25abf4515ca1834eb277161833 (diff)
parentf6e7ffdf3fe8e3ed5e659f747946461350ade5a8 (diff)
Merge branch 'parabola' into lukeshu/premove
# Conflicts: # Makefile.am
Diffstat (limited to 'src/network/networkd-address-pool.c')
-rw-r--r--src/network/networkd-address-pool.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index d9d487d805..ebc6c9eb9e 100644
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -148,8 +148,12 @@ int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union
for (;;) {
if (!address_pool_prefix_is_taken(p, &u, prefixlen)) {
_cleanup_free_ char *s = NULL;
+ int r;
+
+ r = in_addr_to_string(p->family, &u, &s);
+ if (r < 0)
+ return r;
- in_addr_to_string(p->family, &u, &s);
log_debug("Found range %s/%u", strna(s), prefixlen);
*found = u;