Merge tag 'upstream/1.4.0'

Upstream version 1.4.0

1 files changed, 34 insertions, 0 deletions

diff --git a/src/systemd/sd-adapt/nm-sd-adapt.c b/src/systemd/sd-adapt/nm-sd-adapt.c
new file mode 100644
index 00000000..4e308276
--- /dev/null
+++ b/src/systemd/sd-adapt/nm-sd-adapt.c
@@ -0,0 +1,34 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2014 - 2016 Red Hat, Inc.
+ */
+
+#include "nm-default.h"
+
+#include "nm-sd-adapt.h"
+
+#include "fd-util.h"
+
+/*****************************************************************************/
+
+int
+asynchronous_close (int fd) {
+	safe_close (fd);
+	return -1;
+}
+
+/*****************************************************************************/
+