colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: remove unused auth chain creation functions

Browse Source 
No longer used by anything.
This commit is contained in:
Dan Williams
2013-09-04 13:15:34 -05:00
parent 07b07a988a
commit 1126e22572
2 changed files with 13 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/nm-manager-auth.c
View File

@@ -107,17 +107,16 @@ pk_authority_get (GError **error)
#endif #endif
static NMAuthChain * static NMAuthChain *
_auth_chain_new (DBusGMethodInvocation *context, _auth_chain_new (NMAuthSubject *subject,
DBusMessage *message,
const char *dbus_sender, const char *dbus_sender,
gulong user_uid, gulong user_uid,
NMAuthSubject *subject, DBusGMethodInvocation *context,
NMAuthChainResultFunc done_func, NMAuthChainResultFunc done_func,
gpointer user_data) gpointer user_data)
{ {
NMAuthChain *self; NMAuthChain *self;
g_return_val_if_fail (message || dbus_sender, NULL); g_return_val_if_fail (subject || user_uid == 0 || dbus_sender, NULL);
self = g_malloc0 (sizeof (NMAuthChain)); self = g_malloc0 (sizeof (NMAuthChain));
self->refcount = 1; self->refcount = 1;
@@ -132,68 +131,27 @@ _auth_chain_new (DBusGMethodInvocation *context,
if (subject) { if (subject) {
self->user_uid = nm_auth_subject_get_uid (subject); self->user_uid = nm_auth_subject_get_uid (subject);
self->subject = g_object_ref (subject); self->subject = g_object_ref (subject);
return self; } else {
} self->user_uid = user_uid;
if (message)
self->owner = g_strdup (dbus_message_get_sender (message));
else if (dbus_sender)
self->owner = g_strdup (dbus_sender); self->owner = g_strdup (dbus_sender);
if (user_uid > 0 && !self->owner) {
self->user_uid = user_uid; /* Need an owner */
if (user_uid > 0 && !self->owner) { g_warn_if_fail (self->owner);
/* Need an owner */ nm_auth_chain_unref (self);
g_warn_if_fail (self->owner); self = NULL;
nm_auth_chain_unref (self); }
return NULL;
} }
return self; return self;
} }
NMAuthChain *
nm_auth_chain_new (DBusGMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data,
const char **out_error_desc)
{
gulong sender_uid = G_MAXULONG;
char *sender = NULL;
NMAuthChain *chain = NULL;
g_return_val_if_fail (context != NULL, NULL);
if (nm_dbus_manager_get_caller_info (nm_dbus_manager_get (),
context,
&sender,
&sender_uid,
NULL)) {
chain = _auth_chain_new (context, NULL, sender, sender_uid, NULL, done_func, user_data);
}
if (!chain && out_error_desc)
*out_error_desc = "Unable to determine request UID and sender.";
g_free (sender);
return chain;
}
NMAuthChain *
nm_auth_chain_new_raw_message (DBusMessage *message,
gulong user_uid,
NMAuthChainResultFunc done_func,
gpointer user_data)
{
return _auth_chain_new (NULL, message, NULL, user_uid, NULL, done_func, user_data);
}
NMAuthChain * NMAuthChain *
nm_auth_chain_new_dbus_sender (const char *dbus_sender, nm_auth_chain_new_dbus_sender (const char *dbus_sender,
gulong user_uid, gulong user_uid,
NMAuthChainResultFunc done_func, NMAuthChainResultFunc done_func,
gpointer user_data) gpointer user_data)
{ {
return _auth_chain_new (NULL, NULL, dbus_sender, user_uid, NULL, done_func, user_data); return _auth_chain_new (NULL, dbus_sender, user_uid, NULL, done_func, user_data);
} }
/* Creates the NMAuthSubject automatically */ /* Creates the NMAuthSubject automatically */
@@ -229,7 +187,7 @@ nm_auth_chain_new_subject (NMAuthSubject *subject,
NMAuthChain *chain; NMAuthChain *chain;
g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL); g_return_val_if_fail (NM_IS_AUTH_SUBJECT (subject), NULL);
chain = _auth_chain_new (context, NULL, NULL, G_MAXULONG, subject, done_func, user_data); chain = _auth_chain_new (subject, NULL, G_MAXULONG, context, done_func, user_data);
/* Chains creation from a valid NMAuthSubject cannot fail since the /* Chains creation from a valid NMAuthSubject cannot fail since the
* subject already has all the necessary auth info. * subject already has all the necessary auth info.

10
src/nm-manager-auth.h
View File

@@ -56,16 +56,6 @@ typedef void (*NMAuthChainResultFunc) (NMAuthChain *chain,
DBusGMethodInvocation *context, DBusGMethodInvocation *context,
gpointer user_data); gpointer user_data);
NMAuthChain *nm_auth_chain_new (DBusGMethodInvocation *context,
NMAuthChainResultFunc done_func,
gpointer user_data,
const char **out_error_desc);
NMAuthChain *nm_auth_chain_new_raw_message (DBusMessage *message,
gulong user_uid,
NMAuthChainResultFunc done_func,
gpointer user_data);
NMAuthChain *nm_auth_chain_new_dbus_sender (const char *dbus_sender, NMAuthChain *nm_auth_chain_new_dbus_sender (const char *dbus_sender,
gulong user_uid, gulong user_uid,
NMAuthChainResultFunc done_func, NMAuthChainResultFunc done_func,