[git commit master] udhcpd: fix daemonize crash on nommu systems
Mike Frysinger
vapier at gentoo.org
Fri Jun 4 17:24:50 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=6db13732954b23bd0f6f55c5b3c3941f0547141c
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
networking/udhcp/dhcpd.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index e484733..043220d 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -305,11 +305,12 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
, &dhcp_verbose
#endif
);
- argv += optind;
if (!(opt & 1)) { /* no -f */
bb_daemonize_or_rexec(0, argv);
logmode = LOGMODE_NONE;
}
+ /* update argv after the possible vfork+exec in daemonize */
+ argv += optind;
if (opt & 2) { /* -S */
openlog(applet_name, LOG_PID, LOG_DAEMON);
logmode |= LOGMODE_SYSLOG;
--
1.6.3.3
More information about the busybox-cvs
mailing list