Merge branch 'origin/master' (early part)

1 files changed, 2 insertions, 1 deletions

diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index e48473389..043220de9 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;