summaryrefslogtreecommitdiffstats
path: root/sbin/dhclient/kroute.c
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/dhclient/kroute.c')
-rw-r--r--sbin/dhclient/kroute.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c
index ef78259022b..003e2db5f91 100644
--- a/sbin/dhclient/kroute.c
+++ b/sbin/dhclient/kroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.104 2017/07/09 12:38:47 krw Exp $ */
+/* $OpenBSD: kroute.c,v 1.105 2017/07/09 19:19:58 krw Exp $ */
/*
* Copyright 2012 Kenneth R Westerback <krw@openbsd.org>
@@ -99,26 +99,26 @@ check_route_label(struct sockaddr_rtlabel *label)
pid_t pid;
if (!label)
- return (ROUTE_LABEL_NONE);
+ return ROUTE_LABEL_NONE;
if (strncmp("DHCLIENT ", label->sr_label, 9) != 0)
- return (ROUTE_LABEL_NOT_DHCLIENT);
+ return ROUTE_LABEL_NOT_DHCLIENT;
pid = (pid_t)strtonum(label->sr_label + 9, 1, INT_MAX, NULL);
if (pid <= 0)
- return (ROUTE_LABEL_DHCLIENT_UNKNOWN);
+ return ROUTE_LABEL_DHCLIENT_UNKNOWN;
if (pid == getpid())
- return (ROUTE_LABEL_DHCLIENT_OURS);
+ return ROUTE_LABEL_DHCLIENT_OURS;
if (kill(pid, 0) == -1) {
if (errno == ESRCH)
- return (ROUTE_LABEL_DHCLIENT_DEAD);
+ return ROUTE_LABEL_DHCLIENT_DEAD;
else
- return (ROUTE_LABEL_DHCLIENT_UNKNOWN);
+ return ROUTE_LABEL_DHCLIENT_UNKNOWN;
}
- return (ROUTE_LABEL_DHCLIENT_LIVE);
+ return ROUTE_LABEL_DHCLIENT_LIVE;
}
/*
@@ -393,10 +393,10 @@ create_route_label(struct sockaddr_rtlabel *label)
if (len == -1 || (unsigned int)len >= sizeof(label->sr_label)) {
log_warn("could not create route label");
- return (1);
+ return 1;
}
- return (0);
+ return 0;
}
/*
@@ -834,7 +834,7 @@ resolv_conf_priority(int rdomain, int routefd)
rslt = 1;
done:
- return (rslt);
+ return rslt;
}
/*
@@ -898,7 +898,7 @@ resolv_conf_contents(char *name,
if (len == 0) {
free(dn);
- return (NULL);
+ return NULL;
}
rslt = asprintf(&courtesy, "# Generated by %s dhclient\n", name);
@@ -927,7 +927,7 @@ resolv_conf_contents(char *name,
if (config->resolv_tail)
strlcat(contents, config->resolv_tail, len);
- return (contents);
+ return contents;
}
/*