DHCP6: Don't exit if using DHCP4 INFORM in non manager mode

rsmarples · rsmarples · commit 4dd7ebedbed4 · 2025-07-05T09:20:34.000+01:00
Fixes #514.
diff --git a/src/dhcp6.c b/src/dhcp6.c
@@ -3403,12 +3403,8 @@ dhcp6_bind(struct interface *ifp, const char *op, const char *sfrom)
 		dhcp6_script_try_run(ifp, 0);
 	}
 
-	if (ifp->ctx->options & DHCPCD_TEST ||
-	    (ifp->options->options & DHCPCD_INFORM &&
-	    !(ifp->ctx->options & DHCPCD_MANAGER)))
-	{
+	if (ifp->ctx->options & DHCPCD_TEST)
 		eloop_exit(ifp->ctx->eloop, EXIT_SUCCESS);
-	}
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -3403,12 +3403,8 @@ dhcp6_bind(struct interface ifp, const char op, const char *sfrom)`
`3403`	`3403`	`dhcp6_script_try_run(ifp, 0);`
`3404`	`3404`	`}`
`3405`	`3405`
`3406`		`- if (ifp->ctx->options & DHCPCD_TEST \|\|`
`3407`		`- (ifp->options->options & DHCPCD_INFORM &&`
`3408`		`- !(ifp->ctx->options & DHCPCD_MANAGER)))`
`3409`		`- {`
	`3406`	`+ if (ifp->ctx->options & DHCPCD_TEST)`
`3410`	`3407`	`eloop_exit(ifp->ctx->eloop, EXIT_SUCCESS);`
`3411`		`- }`
`3412`	`3408`	`}`
`3413`	`3409`
`3414`	`3410`	`static void`