提交 4482b6e5 编写于 作者: D Dmitry Kozlov

ipoe: ignore start=auto for shared=1 interfaces

上级 c4f29a35
......@@ -2536,11 +2536,14 @@ static void add_interface(const char *ifname, int ifindex, const char *opt, int
}
}
if (!opt_up && !opt_dhcpv4) {
if (!opt_up && !opt_dhcpv4 && !opt_auto) {
opt_up = conf_up;
opt_dhcpv4 = conf_dhcpv4;
opt_auto = conf_auto;
}
opt_auto &= !opt_shared;
if (opt_relay && !opt_giaddr && opt_dhcpv4) {
struct sockaddr_in addr;
int sock;
......@@ -2601,8 +2604,6 @@ static void add_interface(const char *ifname, int ifindex, const char *opt, int
} else if (!serv->arp && conf_arp)
serv->arp = arpd_start(serv);
opt_auto &= !opt_shared;
serv->opt_up = opt_up;
serv->opt_auto = opt_auto;
serv->opt_mode = opt_mode;
......@@ -3235,6 +3236,8 @@ static void load_config(void)
if (!s)
return;
net = &def_net;
opt = conf_get_opt("ipoe", "username");
if (opt) {
if (strcmp(opt, "ifname") == 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册