Merge pull request #1458 from brauner/2017-01-28/lxc_user_nic_ensure_target_netns_is_caller_owned

lxc-user-nic: improvements

Merge pull request #1458 from brauner/2017-01-28/lxc_user_nic_ensure_target_netns_is_caller_owned
7fae4918 · Serge Hallyn · GitHub · 16af2380 · 9aaaad30 · 7fae4918
Commit 7fae4918 authored Mar 12, 2017 by Serge Hallyn Committed by GitHub Mar 12, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

conf.c src/lxc/conf.c +1 -1

lxc_user_nic.c src/lxc/lxc_user_nic.c +0 -0

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3019,7 +3019,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
 		/* Explicitly delete host veth device to prevent lingering
 		 * devices. We had issues in LXD around this.
 		 */
-		if (netdev->type == LXC_NET_VETH) {
+		if (netdev->type == LXC_NET_VETH && !am_unpriv()) {
 			char *hostveth;
 			if (netdev->priv.veth_attr.pair) {
 				hostveth = netdev->priv.veth_attr.pair;

--- a/src/lxc/lxc_user_nic.c
+++ b/src/lxc/lxc_user_nic.c