 @@ -1,14 +1,14 @@
-/* $NetBSD: defs.h,v 1.20 2015/08/21 10:39:00 roy Exp $ */
+/* $NetBSD: defs.h,v 1.21 2015/09/04 12:25:01 roy Exp $ */
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef CONFIG_H
 #define CONFIG_H
 #define PACKAGE			"dhcpcd"
-#define VERSION			"6.9.2"
+#define VERSION			"6.9.3"
 #ifndef CONFIG
 # define CONFIG			SYSCONFDIR "/" PACKAGE ".conf"
 #endif
 #ifndef SCRIPT
 # define SCRIPT			LIBEXECDIR "/" PACKAGE "-run-hooks"
 #endif
 #ifndef DEVDIR
 # define DEVDIR			LIBDIR "/" PACKAGE "/dev"
 #endif
 #ifndef DUID
 # define DUID			SYSCONFDIR "/" PACKAGE ".duid"
 #endif

 @@ -1,15 +1,15 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp.c,v 1.34 2015/08/22 05:45:57 christos Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.35 2015/09/04 12:25:01 roy Exp $");
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -703,28 +703,31 @@ get_option_routes(struct interface *ifp,
 			memcpy(&route->gate.s_addr, p, 4);
 			p += 4;
 			TAILQ_INSERT_TAIL(routes, route, next);
+		}
+	}
 	return routes;
+}
 uint16_t
 dhcp_get_mtu(const struct interface *ifp)
+{
 	const struct dhcp_message *dhcp;
-	uint16_t mtu = 0;	// XXX: gcc
+	uint16_t mtu;
 	if (ifp->options->mtu)
 		return (uint16_t)ifp->options->mtu;
 	mtu = 0; /* bogus gcc warning */
 	if ((dhcp = D_CSTATE(ifp)->new) == NULL ||
 	    has_option_mask(ifp->options->nomask, DHO_MTU) ||
 	    get_option_uint16(ifp->ctx, &mtu, dhcp, DHO_MTU) == -1)
 		return 0;
 	return mtu;
+}
 /* Grab our routers from the DHCP message and apply any MTU value
  * the message contains */
 struct rt_head *
 dhcp_get_routes(struct interface *ifp)
+{
 	struct rt_head *routes;
 @@ -2012,27 +2015,28 @@ dhcp_arp_conflicted(struct arp_state *as
 	    (amsg->sip.s_addr == 0 &&
 	    amsg->tip.s_addr == state->offer->yiaddr))))
+	{
 #ifdef IN_IFF_DUPLICATED
 		struct ipv4_addr *ia;
 #endif
 		if (amsg)
 			astate->failed.s_addr = state->offer->yiaddr;
 		else
 			astate->failed = astate->addr;
 		arp_report_conflicted(astate, amsg);
 		unlink(state->leasefile);
-		if (!state->lease.frominfo)
+		if (!(ifp->options->options & DHCPCD_STATIC) &&
 		    !state->lease.frominfo)
 			dhcp_decline(ifp);
 #ifdef IN_IFF_DUPLICATED
 		ia = ipv4_iffindaddr(ifp, &astate->addr, NULL);
 		if (ia)
 			ipv4_deladdr(ifp, &ia->addr, &ia->net, 1);
 #endif
 		arp_free(astate);
 		eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
 		eloop_timeout_add_sec(ifp->ctx->eloop,
 		    DHCP_RAND_MAX, dhcp_discover, ifp);
+	}
+}
 @@ -2176,54 +2180,107 @@ dhcp_message_new(const struct in_addr *a
 	dhcp->cookie = htonl(MAGIC_COOKIE);
 	p = dhcp->options;
 	if (mask && mask->s_addr != INADDR_ANY) {
 		*p++ = DHO_SUBNETMASK;
 		*p++ = sizeof(mask->s_addr);
 		memcpy(p, &mask->s_addr, sizeof(mask->s_addr));
 		p+= sizeof(mask->s_addr);
+	}
 	*p++ = DHO_END;
 	return dhcp;
+}
 static void
 dhcp_arp_bind(struct interface *ifp)
+{
 	const struct dhcp_state *state;
 	struct in_addr addr;
 	struct ipv4_addr *ia;
 	struct arp_state *astate;
 	eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
 	state = D_CSTATE(ifp);
 	addr.s_addr = state->offer->yiaddr;
 	/* If the interface already has the address configured
 	 * then we can't ARP for duplicate detection. */
 	ia = ipv4_findaddr(ifp->ctx, &addr);
 #ifdef IN_IFF_TENTATIVE
 	if (ia == NULL || ia->addr_flags & IN_IFF_NOTUSEABLE) {
 		if ((astate = arp_new(ifp, &addr)) != NULL) {
 			astate->probed_cb = dhcp_arp_probed;
 			astate->conflicted_cb = dhcp_arp_conflicted;
 			astate->announced_cb = dhcp_arp_announced;
+		}
 		if (ia == NULL) {
 			struct dhcp_lease l;
 			get_lease(ifp->ctx, &l, state->offer);
 			/* Add the address now, let the kernel handle DAD. */
 			ipv4_addaddr(ifp, &l.addr, &l.net, &l.brd);
 		} else
 			logger(ifp->ctx, LOG_INFO, "%s: waiting for DAD on %s",
 			    ifp->name, inet_ntoa(addr));
 		return;
+	}
 #else
 	if (ifp->options->options & DHCPCD_ARP && ia == NULL) {
 		struct dhcp_lease l;
 		get_lease(ifp->ctx, &l, state->offer);
 		logger(ifp->ctx, LOG_INFO, "%s: probing static address %s/%d",
 		    ifp->name, inet_ntoa(l.addr), inet_ntocidr(l.net));
 		if ((astate = arp_new(ifp, &addr)) != NULL) {
 			astate->probed_cb = dhcp_arp_probed;
 			astate->conflicted_cb = dhcp_arp_conflicted;
 			astate->announced_cb = dhcp_arp_announced;
 			/* We need to handle DAD. */
 			arp_probe(astate);
+		}
 		return;
+	}
 #endif
 	dhcp_bind(ifp);
+}
 static void
 dhcp_static(struct interface *ifp)
+{
 	struct if_options *ifo;
 	struct dhcp_state *state;
 	struct ipv4_addr *ia;
 	state = D_STATE(ifp);
 	ifo = ifp->options;
 	ia = NULL;
 	if (ifo->req_addr.s_addr == INADDR_ANY &&
 	    (ia = ipv4_iffindaddr(ifp, NULL, NULL)) == NULL)
+	{
 		logger(ifp->ctx, LOG_INFO,
 		    "%s: waiting for 3rd party to "
 		    "configure IP address",
 		    ifp->name);
 		state->reason = "3RDPARTY";
 		script_runreason(ifp, state->reason);
 		return;
+	}
 	state->offer = dhcp_message_new(ia ? &ia->addr : &ifo->req_addr,
 	    ia ? &ia->net : &ifo->req_mask);
-	if (state->offer) {
+	if (state->offer)
-		eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
+		dhcp_arp_bind(ifp);
 		dhcp_bind(ifp);
+}
 void
 dhcp_inform(struct interface *ifp)
+{
 	struct dhcp_state *state;
 	struct if_options *ifo;
 	struct ipv4_addr *ap;
 	state = D_STATE(ifp);
 	ifo = ifp->options;
 	if (ifp->ctx->options & DHCPCD_TEST) {
 		state->addr.s_addr = ifo->req_addr.s_addr;
 @@ -2493,28 +2550,29 @@ static void
 dhcp_handledhcp(struct interface *ifp, struct dhcp_message **dhcpp,
     const struct in_addr *from)
+{
 	struct dhcp_state *state = D_STATE(ifp);
 	struct if_options *ifo = ifp->options;
 	struct dhcp_message *dhcp = *dhcpp;
 	struct dhcp_lease *lease = &state->lease;
 	uint8_t type, tmp;
 	const uint8_t *auth;
 	struct in_addr addr;
 	unsigned int i;
 	size_t auth_len;
 	char *msg;
 #ifdef IN_IFF_DUPLICATED
 	struct ipv4_addr *ia;
-	struct arp_state *astate;
+#endif
 	/* We may have found a BOOTP server */
 	if (get_option_uint8(ifp->ctx, &type, dhcp, DHO_MESSAGETYPE) == -1)
 		type = 0;
 	else if (ifo->options & DHCPCD_BOOTP) {
 		logger(ifp->ctx, LOG_DEBUG,
 		    "%s: ignoring DHCP reply (excpecting BOOTP)",
 		    ifp->name);
 		return;
+	}
 	/* Authenticate the message */
 	auth = get_option(ifp->ctx, dhcp, DHO_AUTHENTICATION, &auth_len);
 @@ -2787,63 +2845,27 @@ dhcp_handledhcp(struct interface *ifp, s
 	state->nakoff = 0;
 	/* BOOTP could have already assigned this above, so check we still
 	 * have a pointer. */
 	if (*dhcpp) {
 		free(state->offer);
 		state->offer = dhcp;
 		*dhcpp = NULL;
+	}
 	lease->frominfo = 0;
 	eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
-	addr.s_addr = state->offer->yiaddr;
+	dhcp_arp_bind(ifp);
 	/* If the interface already has the address configured
 	 * then we can't ARP for duplicate detection. */
 	ia = ipv4_findaddr(ifp->ctx, &addr);
 #ifdef IN_IFF_TENTATIVE
 	if (ia == NULL || ia->addr_flags & IN_IFF_NOTUSEABLE) {
 		if ((astate = arp_new(ifp, &addr)) != NULL) {
 			astate->probed_cb = dhcp_arp_probed;
 			astate->conflicted_cb = dhcp_arp_conflicted;
 			astate->announced_cb = dhcp_arp_announced;
 		if (ia == NULL) {
 			struct dhcp_lease l;
 			get_lease(ifp->ctx, &l, state->offer);
 			/* Add the address now, let the kernel handle DAD. */
 			ipv4_addaddr(ifp, &l.addr, &l.net, &l.brd);
 		return;
 #else
 	if (ifo->options & DHCPCD_ARP) {
 		if (ia == NULL) {
 			if ((astate = arp_new(ifp, &addr)) != NULL) {
 				astate->probed_cb = dhcp_arp_probed;
 				astate->conflicted_cb = dhcp_arp_conflicted;
 				astate->announced_cb = dhcp_arp_announced;
 				/* We need to handle DAD. */
 				arp_probe(astate);
 			return;
 #endif
 	dhcp_bind(ifp);
+}
 static size_t
 get_udp_data(const uint8_t **data, const uint8_t *udp)
+{
 	struct udp_dhcp_packet p;
 	memcpy(&p, udp, sizeof(p));
 	*data = udp + offsetof(struct udp_dhcp_packet, dhcp);
 	return ntohs(p.ip.ip_len) - sizeof(p.ip) - sizeof(p.udp);
+}
 static int

 @@ -1,15 +1,15 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcpcd.c,v 1.27 2015/08/21 10:39:00 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.28 2015/09/04 12:25:01 roy Exp $");
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -426,27 +426,27 @@ configure_interface1(struct interface *i
 	/* Do any platform specific configuration */
 	if_conf(ifp);
 	/* If we want to release a lease, we can't really persist the
 	 * address either. */
 	if (ifo->options & DHCPCD_RELEASE)
 		ifo->options &= ~DHCPCD_PERSISTENT;
 	if (ifp->flags & IFF_POINTOPOINT && !(ifo->options & DHCPCD_INFORM))
 		ifo->options |= DHCPCD_STATIC;
 	if (ifp->flags & IFF_NOARP ||
 	    ifo->options & (DHCPCD_INFORM | DHCPCD_STATIC))
-		ifo->options &= ~(DHCPCD_ARP | DHCPCD_IPV4LL);
+		ifo->options &= ~DHCPCD_IPV4LL;
 	if (ifp->flags & (IFF_POINTOPOINT | IFF_LOOPBACK) ||
 	    !(ifp->flags & IFF_MULTICAST))
 		ifo->options &= ~DHCPCD_IPV6RS;
 	if (ifo->metric != -1)
 		ifp->metric = (unsigned int)ifo->metric;
 	if (!(ifo->options & DHCPCD_IPV4))
 		ifo->options &= ~(DHCPCD_DHCP | DHCPCD_IPV4LL | DHCPCD_WAITIP4);
 	if (!(ifo->options & DHCPCD_IPV6))
 		ifo->options &=
 		    ~(DHCPCD_IPV6RS | DHCPCD_DHCP6 | DHCPCD_WAITIP6);

 @@ -1,15 +1,15 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: if-options.c,v 1.26 2015/08/21 10:39:00 roy Exp $");
+ __RCSID("$NetBSD: if-options.c,v 1.27 2015/09/04 12:25:01 roy Exp $");
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -803,27 +803,27 @@ parse_option(struct dhcpcd_ctx *ctx, con
+		{
 			ifo->options |= DHCPCD_INFORM;
 			break;
+		}
 		if (arg && *arg != '\0') {
 			if (parse_addr(ctx,
 			    &ifo->req_addr, &ifo->req_mask, arg) != 0)
 				return -1;
 		} else {
 			ifo->req_addr.s_addr = 0;
 			ifo->req_mask.s_addr = 0;
+		}
 		ifo->options |= DHCPCD_INFORM | DHCPCD_PERSISTENT;
-		ifo->options &= ~(DHCPCD_ARP | DHCPCD_STATIC);
+		ifo->options &= ~DHCPCD_STATIC;
 		break;
 	case 't':
 		ifo->timeout = (time_t)strtoi(arg, NULL, 0, 0, INT32_MAX, &e);
 		if (e) {
 			logger(ctx, LOG_ERR, "failed to convert timeout");
 			return -1;
+		}
 		break;
 	case 'u':
 		s = USERCLASS_MAX_LEN - ifo->userclass[0] - 1;
 		s = parse_string((char *)ifo->userclass +
 		    ifo->userclass[0] + 2, (size_t)s, arg);
 		if (s == -1) {
 @@ -1091,26 +1091,36 @@ parse_option(struct dhcpcd_ctx *ctx, con
+			}
 			rt = calloc(1, sizeof(*rt));
 			if (rt == NULL) {
 				logger(ctx, LOG_ERR, "%s: %m", __func__);
 				return -1;
+			}
 			rt->dest.s_addr = INADDR_ANY;
 			rt->net.s_addr = INADDR_ANY;
 			if (parse_addr(ctx, &rt->gate, NULL, p) == -1) {
 				free(rt);
 				return -1;
+			}
 			TAILQ_INSERT_TAIL(ifo->routes, rt, next);
 		} else if (strncmp(arg, "interface_mtu=",
 		    strlen("interface_mtu=")) == 0 ||
 		    strncmp(arg, "mtu=", strlen("mtu=")) == 0)
+		{
 			ifo->mtu = (unsigned int)strtou(p, NULL, 0,
 			    MTU_MIN, MTU_MAX, &e);
 			if (e) {
 				logger(ctx, LOG_ERR, "invalid MTU %s", p);
 				return -1;
+			}
 		} else {
 			dl = 0;
 			if (ifo->config != NULL) {
 				while (ifo->config[dl] != NULL) {
 					if (strncmp(ifo->config[dl], arg,
 						(size_t)(p - arg)) == 0)
+					{
 						p = strdup(arg);
 						if (p == NULL) {
 							logger(ctx, LOG_ERR,
 							    "%s: %m", __func__);
 							return -1;
+						}

 @@ -1,14 +1,14 @@
-/* $NetBSD: if-options.h,v 1.13 2015/08/21 10:39:00 roy Exp $ */
+/* $NetBSD: if-options.h,v 1.14 2015/09/04 12:25:01 roy Exp $ */
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -164,26 +164,27 @@ struct if_options {
 	uint8_t rejectmasknd[(UINT16_MAX + 1) / NBBY];
 	uint8_t requestmask6[(UINT16_MAX + 1) / NBBY];
 	uint8_t requiremask6[(UINT16_MAX + 1) / NBBY];
 	uint8_t nomask6[(UINT16_MAX + 1) / NBBY];
 	uint8_t rejectmask6[(UINT16_MAX + 1) / NBBY];
 	uint32_t leasetime;
 	time_t timeout;
 	time_t reboot;
 	unsigned long long options;
 	struct in_addr req_addr;
 	struct in_addr req_mask;
 	struct rt_head *routes;
 	unsigned int mtu;
 	char **config;
 	char **environ;
 	char *script;
 	char hostname[HOSTNAME_MAX_LEN + 1]; /* We don't store the length */
 	uint8_t fqdn;
 	uint8_t vendorclassid[VENDORCLASSID_MAX_LEN + 2];
 	uint8_t clientid[CLIENTID_MAX_LEN + 2];
 	uint8_t userclass[USERCLASS_MAX_LEN + 2];
 	uint8_t vendor[VENDOR_MAX_LEN + 2];
 	size_t blacklist_len;

 @@ -1,15 +1,15 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: script.c,v 1.22 2015/08/21 10:39:00 roy Exp $");
+ __RCSID("$NetBSD: script.c,v 1.23 2015/09/04 12:25:01 roy Exp $");
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -124,55 +124,56 @@ exec_script(const struct dhcpcd_ctx *ctx
 		return -1;
+	}
 	return pid;
+}
 #ifdef INET
 static char *
 make_var(struct dhcpcd_ctx *ctx, const char *prefix, const char *var)
+{
 	size_t len;
 	char *v;
 	len = strlen(prefix) + strlen(var) + 2;
-	v = malloc(len);
+	if ((v = malloc(len)) == NULL) {
 	if (v == NULL) {
 		logger(ctx, LOG_ERR, "%s: %m", __func__);
 		return NULL;
+	}
 	snprintf(v, len, "%s_%s", prefix, var);
 	return v;
+}
 static int
 append_config(struct dhcpcd_ctx *ctx, char ***env, size_t *len,
     const char *prefix, const char *const *config)
+{
 	size_t i, j, e1;
 	char **ne, *eq, **nep, *p;
 	int ret;
 	if (config == NULL)
 		return 0;
 	ne = *env;
 	ret = 0;
 	for (i = 0; config[i] != NULL; i++) {
 		eq = strchr(config[i], '=');
 		e1 = (size_t)(eq - config[i] + 1);
 		for (j = 0; j < *len; j++) {
-			if (strncmp(ne[j] + strlen(prefix) + 1,
+			if (strncmp(ne[j], prefix, strlen(prefix)) == 0 &&
-				config[i], e1) == 0)
+			    ne[j][strlen(prefix)] == '_' &&
 			    strncmp(ne[j] + strlen(prefix) + 1,
 			    config[i], e1) == 0)
+			{
 				p = make_var(ctx, prefix, config[i]);
 				if (p == NULL) {
 					ret = -1;
 					break;
+				}
 				free(ne[j]);
 				ne[j] = p;
 				break;
+			}
+		}
 		if (j == *len) {
 			j++;

 @@ -1,15 +1,15 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: if.c,v 1.15 2015/08/21 10:39:00 roy Exp $");
+ __RCSID("$NetBSD: if.c,v 1.16 2015/09/04 12:25:01 roy Exp $");
 /*
  * dhcpcd - DHCP client daemon
  * Copyright (c) 2006-2015 Roy Marples <roy@marples.name>
  * All rights reserved
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -669,24 +669,24 @@ xsocket(int domain, int type, int protoc
 #ifdef SOCK_CLOEXEC
 	if (flags & O_CLOEXEC)
 		type |= SOCK_CLOEXEC;
 	if (flags & O_NONBLOCK)
 		type |= SOCK_NONBLOCK;
 	return socket(domain, type, protocol);
 #else
 	int s, xflags;
 	if ((s = socket(domain, type, protocol)) == -1)
 		return -1;
 	if ((flags & O_CLOEXEC) && (xflags = fcntl(s, F_GETFD, 0)) == -1 ||
-	    fcntl(s, F_SETFD, xlags | FD_CLOEXEC) == -1)
+	    fcntl(s, F_SETFD, xflags | FD_CLOEXEC) == -1)
 		goto out;
 	if ((flags & O_NONBLOCK) && (xflags = fcntl(s, F_GETFL, 0)) == -1 ||
 	    fcntl(s, F_SETFL, xflags | O_NONBLOCK) == -1)
 		goto out;
 	return s;
 out:
 	close(s);
 	return -1;
 #endif
+}