From 80f8fce675f63190cf622361a68c550428702eae Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Sat, 15 Dec 2012 10:47:15 -0600
Subject: [PATCH] core: remove unused auth functions

Functionality moved to NMDBusManager.
---
 src/nm-manager-auth.c | 53 -------------------------------------------
 src/nm-manager-auth.h |  6 -----
 2 files changed, 59 deletions(-)

diff --git a/src/nm-manager-auth.c b/src/nm-manager-auth.c
index 373e2e297d..83f5e80948 100644
--- a/src/nm-manager-auth.c
+++ b/src/nm-manager-auth.c
@@ -499,59 +499,6 @@ nm_auth_chain_unref (NMAuthChain *self)
 
 /************ utils **************/
 
-gboolean
-nm_auth_get_caller_uid (DBusGMethodInvocation *context,
-                        NMDBusManager *dbus_mgr,
-                        gulong *out_uid,
-                        char **out_error_desc)
-{
-	DBusConnection *connection;
-	char *sender = NULL;
-	gboolean success = FALSE;
-	DBusError dbus_error;
-
-	g_return_val_if_fail (context != NULL, FALSE);
-	g_return_val_if_fail (out_uid != NULL, FALSE);
-
-	if (!dbus_mgr) {
-		dbus_mgr = nm_dbus_manager_get ();
-		g_assert (dbus_mgr);
-	} else
-		g_object_ref (dbus_mgr);
-
-	*out_uid = G_MAXULONG;
-
-	sender = dbus_g_method_get_sender (context);
-	if (!sender) {
-		if (out_error_desc)
-			*out_error_desc = g_strdup ("Could not determine D-Bus requestor");
-		goto out;
-	}
-
-	connection = nm_dbus_manager_get_dbus_connection (dbus_mgr);
-	if (!connection) {
-		if (out_error_desc)
-			*out_error_desc = g_strdup ("Could not get the D-Bus system bus");
-		goto out;
-	}
-
-	dbus_error_init (&dbus_error);
-	/* FIXME: do this async */
-	*out_uid = dbus_bus_get_unix_user (connection, sender, &dbus_error);
-	if (dbus_error_is_set (&dbus_error)) {
-		if (out_error_desc)
-			*out_error_desc = g_strdup_printf ("Could not determine the user ID of the requestor");
-		dbus_error_free (&dbus_error);
-		*out_uid = G_MAXULONG;
-	} else
-		success = TRUE;
-
-out:
-	g_object_unref (dbus_mgr);
-	g_free (sender);
-	return success;
-}
-
 gboolean
 nm_auth_uid_in_acl (NMConnection *connection,
                     NMSessionMonitor *smon,
diff --git a/src/nm-manager-auth.h b/src/nm-manager-auth.h
index d3597ab6db..9985d7d224 100644
--- a/src/nm-manager-auth.h
+++ b/src/nm-manager-auth.h
@@ -95,12 +95,6 @@ gboolean nm_auth_chain_add_call (NMAuthChain *chain,
 
 void nm_auth_chain_unref (NMAuthChain *chain);
 
-/* Utils */
-gboolean nm_auth_get_caller_uid (DBusGMethodInvocation *context,
-                                 NMDBusManager *dbus_mgr,
-                                 gulong *out_uid,
-                                 char **out_error_desc);
-
 /* Caller must free returned error description */
 gboolean nm_auth_uid_in_acl (NMConnection *connection,
                              NMSessionMonitor *smon,