View | Details | Raw Unified | Return to bug 59836
Collapse All | Expand All

(-)a/NetworkManager/src/core/settings/nm-settings-connection.c (-11 / +10 lines)
Lines 916-927 match_secret_by_setting_name_and_flags_cb(NMSetting *setting, Link Here
916
}
916
}
917
917
918
static gboolean
918
static gboolean
919
match_secret_is_system_owned(NMSetting           *setting,
919
match_secret_is_not_saved_or_not_required(NMSetting           *setting,
920
                             const char          *secret,
920
                                          const char          *secret,
921
                             NMSettingSecretFlags flags,
921
                                          NMSettingSecretFlags flags,
922
                             gpointer             user_data)
922
                                          gpointer             user_data)
923
{
923
{
924
    return !secret_is_system_owned(flags, user_data);
924
    return NM_FLAGS_ANY(flags,
925
                        NM_SETTING_SECRET_FLAG_NOT_SAVED
926
                            | NM_SETTING_SECRET_FLAG_NOT_REQUIRED);
925
}
927
}
926
928
927
static void
929
static void
Lines 1043-1053 get_secrets_done_cb(NMAgentManager *manager, Link Here
1043
        _LOGD("(%s:%p) new agent secrets processed", setting_name, call_id);
1045
        _LOGD("(%s:%p) new agent secrets processed", setting_name, call_id);
1044
    }
1046
    }
1045
1047
1046
    /*
1048
    nm_connection_clear_secrets_with_flags(new_connection,
1047
     * We don't want to store secrets to settings-connection, that don't belong
1049
                                           match_secret_is_not_saved_or_not_required,
1048
     * to the system
1050
                                           NULL);
1049
     */
1050
    nm_connection_clear_secrets_with_flags(new_connection, match_secret_is_system_owned, NULL);
1051
1051
1052
    if (!nm_settings_connection_update(
1052
    if (!nm_settings_connection_update(
1053
            self,
1053
            self,
1054
- 

Return to bug 59836