diff options
| author | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-11-07 00:15:27 +0100 |
| commit | 8254edbf64d60bef0d70eee01490103148dba100 (patch) | |
| tree | 282eb053995da653ee170e910da05d9530d4ff53 /src/platform/nmp-netns.c | |
| parent | 857e5310d1764114da056cd2eb3d88625bb0ba81 (diff) | |
| parent | 90e8691111889a7b5f3c812f5a41f15a8a058913 (diff) | |
Update upstream source from tag 'upstream/1.9.90'
Update to upstream version '1.9.90' with Debian dir 83533c23245795edf9fe4919e4af3e78f2938519
Diffstat (limited to 'src/platform/nmp-netns.c')
| -rw-r--r-- | src/platform/nmp-netns.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c index 4acd4761..34215828 100644 --- a/src/platform/nmp-netns.c +++ b/src/platform/nmp-netns.c @@ -299,7 +299,7 @@ _netns_new (GError **error) g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "Failed opening mntns: %s", g_strerror (errsv)); - close (fd_net); + nm_close (fd_net); return NULL; } @@ -620,7 +620,7 @@ nmp_netns_bind_to_path (NMPNetns *self, const char *filename, int *out_fd) filename, g_strerror (errsv)); return FALSE; } - close (fd); + nm_close (fd); if (mount (PROC_SELF_NS_NET, filename, "none", MS_BIND, NULL) != 0) { errsv = errno; @@ -702,15 +702,11 @@ dispose (GObject *object) NMPNetns *self = NMP_NETNS (object); NMPNetnsPrivate *priv = NMP_NETNS_GET_PRIVATE (self); - if (priv->fd_net > 0) { - close (priv->fd_net); - priv->fd_net = 0; - } + nm_close (priv->fd_net); + priv->fd_net = -1; - if (priv->fd_mnt > 0) { - close (priv->fd_mnt); - priv->fd_mnt = 0; - } + nm_close (priv->fd_mnt); + priv->fd_mnt = -1; G_OBJECT_CLASS (nmp_netns_parent_class)->dispose (object); } |