diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-06-24 01:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 01:26:25 +0200 |
| commit | a2c28c645160b4e9377db4cb40cb9f22141f2dd3 (patch) | |
| tree | 9fbb81747c4d973edec60ab967b0eb818ebbc219 /src/network | |
| parent | de2edc008a612e152f0690d5063d53001c4e13ff (diff) | |
| parent | 4e68ec18669db7175a999f95b6b5b0d1908376c9 (diff) | |
Merge pull request #3549 from poettering/resolved-more
resolved: more fixes, among them "systemctl-resolve --status" to see DNS configuration in effect, and a local DNS stub listener on 127.0.0.53
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-brvlan.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c index f621b8011b..8bc330ebae 100644 --- a/src/network/networkd-brvlan.c +++ b/src/network/networkd-brvlan.c @@ -58,7 +58,7 @@ static int append_vlan_info_data(Link *const link, sd_netlink_message *req, uint struct bridge_vlan_info br_vlan; int i, j, k, r, done, cnt; uint16_t begin, end; - bool untagged; + bool untagged = false; assert(link); assert(req); diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index affc0d00e9..5172a7b5e9 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -52,7 +52,7 @@ Network.DNS, config_parse_strv, Network.LLMNR, config_parse_resolve_support, 0, offsetof(Network, llmnr) Network.MulticastDNS, config_parse_resolve_support, 0, offsetof(Network, mdns) Network.DNSSEC, config_parse_dnssec_mode, 0, offsetof(Network, dnssec_mode) -Network.DNSSECNegativeTrustAnchors, config_parse_dnssec_negative_trust_anchors, 0, offsetof(Network, dnssec_negative_trust_anchors) +Network.DNSSECNegativeTrustAnchors, config_parse_dnssec_negative_trust_anchors, 0, 0 Network.NTP, config_parse_strv, 0, offsetof(Network, ntp) Network.IPForward, config_parse_address_family_boolean_with_kernel,0, offsetof(Network, ip_forward) Network.IPMasquerade, config_parse_bool, 0, offsetof(Network, ip_masquerade) |