Skip to content

Commit 9f87f49

Browse files
committed
🎨 Fix duplicate adding of servers to the default group.
1 parent c71dfb1 commit 9f87f49

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/dns_conf.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ impl FromStr for BindServer {
844844
} else if addr.is_none() {
845845
addr = Some(part);
846846
} else {
847-
error!("repeat addr ");
847+
error!("unexpected options: {}", part);
848848
}
849849
}
850850

@@ -1640,14 +1640,15 @@ mod parse {
16401640
);
16411641
}
16421642

1643-
match self
1644-
.servers
1645-
.entry(server.group.clone().unwrap_or("default".to_string()))
1646-
{
1647-
Entry::Occupied(g) => g.into_mut(),
1648-
Entry::Vacant(g) => g.insert(vec![]),
1643+
if let Some(group) = server.group.as_deref() {
1644+
match self.servers.entry(group.to_string()) {
1645+
Entry::Occupied(g) => g.into_mut(),
1646+
Entry::Vacant(g) => g.insert(vec![]),
1647+
}
1648+
.push(server);
1649+
} else if server.exclude_default_group {
1650+
warn!("group name required when `-exclude_default_group` enabled");
16491651
}
1650-
.push(server);
16511652
}
16521653
}
16531654

0 commit comments

Comments
 (0)