Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 6 insertions, 11 deletions

diff --git a/src/platform/nmp-netns.h b/src/platform/nmp-netns.h
index 4eac07ac..56c1e7e8 100644
--- a/src/platform/nmp-netns.h
+++ b/src/platform/nmp-netns.h
@@ -33,16 +33,7 @@
 #define NMP_NETNS_FD_NET          "fd-net"
 #define NMP_NETNS_FD_MNT          "fd-mnt"
 
-struct _NMPNetnsPrivate;
-
-struct _NMPNetns {
-	GObject parent;
-	struct _NMPNetnsPrivate *priv;
-};
-
-typedef struct {
-	GObjectClass parent;
-} NMPNetnsClass;
+typedef struct _NMPNetnsClass NMPNetnsClass;
 
 GType nmp_netns_get_type (void);
 
@@ -62,8 +53,12 @@ int nmp_netns_get_fd_mnt (NMPNetns *self);
 static inline void
 _nm_auto_pop_netns (NMPNetns **p)
 {
-	if (*p)
+	if (*p) {
+		int errsv = errno;
+
 		nmp_netns_pop (*p);
+		errno = errsv;
+	}
 }
 
 #define nm_auto_pop_netns __attribute__((cleanup(_nm_auto_pop_netns)))