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

vpn-manager: remove some dead code

Browse Source 
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.
This commit is contained in:
Dan Winship
2014-03-04 18:19:55 -05:00
parent 6300ea57ab
commit d86a61225d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vpn-manager/nm-vpn-connection.c
View File

@@ -1643,13 +1643,10 @@ get_secrets (NMVPNConnection *self,
NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self);
NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE; NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE;
GError *error = NULL; GError *error = NULL;
gboolean filter_by_uid;
g_return_if_fail (secrets_idx < SECRETS_REQ_LAST); g_return_if_fail (secrets_idx < SECRETS_REQ_LAST);
priv->secrets_idx = secrets_idx; 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_log_dbg (LOGD_VPN, "(%s/%s) requesting VPN secrets pass #%d",
nm_connection_get_uuid (priv->connection), nm_connection_get_uuid (priv->connection),
nm_connection_get_id (priv->connection), nm_connection_get_id (priv->connection),
@@ -1658,7 +1655,6 @@ get_secrets (NMVPNConnection *self,
switch (priv->secrets_idx) { switch (priv->secrets_idx) {
case SECRETS_REQ_SYSTEM: case SECRETS_REQ_SYSTEM:
flags = NM_SETTINGS_GET_SECRETS_FLAG_ONLY_SYSTEM; flags = NM_SETTINGS_GET_SECRETS_FLAG_ONLY_SYSTEM;
filter_by_uid = FALSE;
break; break;
case SECRETS_REQ_EXISTING: case SECRETS_REQ_EXISTING:
flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE; flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE;