From 98564e9e7ad91339b5d4fe85b6ecff6e58a25751 Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 23 Mar 2011 14:42:07 -0700 Subject: Fix dhcp.{iface_name}.pid property setting Change-Id: I57b3da6eec12d34ae9f13db4220e454a3c570171 Signed-off-by: Dmitry Shmidt --- dhcpcd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dhcpcd.c b/dhcpcd.c index e984ceb..c229baf 100644 --- a/dhcpcd.c +++ b/dhcpcd.c @@ -1898,9 +1898,14 @@ main(int argc, char **argv) char pidpropname[PROPERTY_KEY_MAX]; char pidpropval[PROPERTY_VALUE_MAX]; + if (optind != argc - 1) { + syslog(LOG_ERR, "Android requires an interface"); + exit(EXIT_FAILURE); + } + if (snprintf(pidpropname, sizeof(pidpropname), - "dhcp.%s.pid", iface->name) >= PROPERTY_KEY_MAX) + "dhcp.%s.pid", argv[optind]) >= PROPERTY_KEY_MAX) exit(EXIT_FAILURE); property_get(pidpropname, pidpropval, NULL); if (strlen(pidpropval) == 0) @@ -1978,9 +1983,14 @@ main(int argc, char **argv) if (set_cloexec(pidfd) == -1) exit(EXIT_FAILURE); #ifdef ANDROID + if (optind != argc - 1) { + syslog(LOG_ERR, "Android requires an interface"); + exit(EXIT_FAILURE); + } + if (snprintf(pidpropname, sizeof(pidpropname), - "dhcp.%s.pid", iface->name) >= PROPERTY_KEY_MAX) + "dhcp.%s.pid", argv[optind]) >= PROPERTY_KEY_MAX) exit(EXIT_FAILURE); if (snprintf(pidpropval, sizeof(pidpropval), "%d", getpid()) >= PROPERTY_VALUE_MAX) exit(EXIT_FAILURE); -- cgit v1.1