summaryrefslogtreecommitdiffstats
path: root/dhcpcd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2016-05-06 20:44:24 +0000
committerRoy Marples <roy@marples.name>2016-05-06 20:44:24 +0000
commite3ea49b38463316f147f39490184be2f3a6b9aa9 (patch)
tree17fa4e296d7099c4a63f36d2dddb38e05c25fc56 /dhcpcd.c
parentbe315919fa4ca9cb38861ce5c29abd0f32543092 (diff)
downloaddhcpcd-e3ea49b38463316f147f39490184be2f3a6b9aa9.tar.xz
Check we actually have options allocated before adding commandline options.
Diffstat (limited to 'dhcpcd.c')
-rw-r--r--dhcpcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index 2c38bc76..68b80537 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -592,12 +592,14 @@ configure_interface(struct interface *ifp, int argc, char **argv,
old = ifp->options ? ifp->options->mtime : 0;
dhcpcd_selectprofile(ifp, NULL);
+ if (ifp->options == NULL)
+ return;
add_options(ifp->ctx, ifp->name, ifp->options, argc, argv);
ifp->options->options |= options;
configure_interface1(ifp);
/* If the mtime has changed drop any old lease */
- if (ifp->options && old != 0 && ifp->options->mtime != old) {
+ if (old != 0 && ifp->options->mtime != old) {
logger(ifp->ctx, LOG_WARNING,
"%s: confile file changed, expiring leases", ifp->name);
dhcpcd_drop(ifp, 0);