From d86a61225d044c9d56b912d3d11103da6f4b69af Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 4 Mar 2014 18:19:55 -0500 Subject: [PATCH] vpn-manager: remove some dead code f3c2851c (port NMAgentManager, etc, to use NMAuthSubject) made it unnecessary for callers to nm_settings_connection_get_secrets() to decide whether to filter agents by UID or not, but NMVPNConnection was still doing it itself anyway. --- src/vpn-manager/nm-vpn-connection.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index b0d71916e..96a9acacc 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -1643,13 +1643,10 @@ get_secrets (NMVPNConnection *self, NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE; GError *error = NULL; - gboolean filter_by_uid; g_return_if_fail (secrets_idx < SECRETS_REQ_LAST); priv->secrets_idx = secrets_idx; - filter_by_uid = nm_active_connection_get_user_requested (NM_ACTIVE_CONNECTION (self)); - nm_log_dbg (LOGD_VPN, "(%s/%s) requesting VPN secrets pass #%d", nm_connection_get_uuid (priv->connection), nm_connection_get_id (priv->connection), @@ -1658,7 +1655,6 @@ get_secrets (NMVPNConnection *self, switch (priv->secrets_idx) { case SECRETS_REQ_SYSTEM: flags = NM_SETTINGS_GET_SECRETS_FLAG_ONLY_SYSTEM; - filter_by_uid = FALSE; break; case SECRETS_REQ_EXISTING: flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE;