Imported Upstream version 0.9.4.0 upstream/0.9.4.0

1 files changed, 12 insertions, 22 deletions

diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c
index c70e2459..7e25ee37 100644
--- a/src/backends/NetworkManagerArch.c
+++ b/src/backends/NetworkManagerArch.c
@@ -28,43 +28,33 @@
  *
  * (C) Copyright 2004 Tom Parker
  * (C) Copyright 2004 Matthew Garrett
- * (C) Copyright 2004 Red Hat, Inc.
+ * (C) Copyright 2004 - 2012 Red Hat, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "NetworkManagerGeneric.h"
-#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 
-/*
- * nm_system_enable_loopback
- *
- * Bring up the loopback interface
- *
- */
-void nm_system_enable_loopback (void)
+void nm_backend_enable_loopback (void)
 {
 	nm_generic_enable_loopback ();
 }
 
-/*
- * nm_system_update_dns
- *
- * Make glibc/nscd aware of any changes to the resolv.conf file by
- * restarting nscd.
- *
- */
-void nm_system_update_dns (void)
+void nm_backend_update_dns (void)
 {
-	/* Check if the daemon was already running - do not start a new instance */
+	/* Make glibc/nscd aware of any changes to the resolv.conf file by
+	 * restarting nscd; check if the daemon was already running - do not
+	 * start a new instance
+	 */
 	if (g_file_test("/var/run/daemons/nscd", G_FILE_TEST_EXISTS))
 		nm_spawn_process ("/etc/rc.d/nscd restart");
 }
 
+int nm_backend_ipv6_use_tempaddr (void)
+{
+	return nm_generic_ipv6_use_tempaddr ();
+}
+