← Back to branch summary

~ubuntu-branches/debian/sid/network-manager/sid

« back to all changes in this revision

Viewing changes to libnm-util/nm-setting-vpn.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2011-11-03 21:32:50 UTC
  • mfrom: (1.4.6)
  • Revision ID: package-import@ubuntu.com-20111103213250-w49ucjmux3hbwnta
Tags: 0.9.1.95-1
http://bugs.debian.org/638995
http://bugs.debian.org/642912
http://bugs.debian.org/546893
http://bugs.debian.org/624159
http://bugs.debian.org/637005
http://bugs.debian.org/641904
* New upstream release (0.9.2 rc1).
  - Fix connection sharing with newer iptables versions. (Closes: #638995)
  - Fix handling of numeric SSIDs in the keyfile plugin. (Closes: #642912)
* debian/watch: Track .xz tarballs.
* debian/libnm-util2.symbols: Add new symbols for libnm-util.
* debian/patches/04-dont-update-routing-and-dns-for-unmanaged-devices.patch
  - Avoid blowing away existing routes and resolv.conf if NM never managed
    any devices. (Closes: #546893, #624159, #637005, #641904)
* debian/control: Add Build-Depends on libglib2.0-doc for proper
  cross-references in the gtk-doc API documentation.
* Enable default hardening options from dpkg-buildflags.
  - Use buildflags.mk snippet in debian/rules.
  - Add Build-Depends on dpkg-dev (>= 1.6.1).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-util/nm-setting-vpn.c
612
612
}
613
613
 
614
614
static void
 
615
clear_secrets_with_flags (NMSetting *setting,
 
616
                              GParamSpec *pspec,
 
617
                              NMSettingClearSecretsWithFlagsFn func,
 
618
                              gpointer user_data)
 
619
{
 
620
        NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
 
621
        GHashTableIter iter;
 
622
        const char *secret;
 
623
 
 
624
        if (priv->secrets == NULL)
 
625
                return;
 
626
 
 
627
        /* Iterate through secrets hash and check each entry */
 
628
        g_hash_table_iter_init (&iter, priv->secrets);
 
629
        while (g_hash_table_iter_next (&iter, (gpointer) &secret, NULL)) {
 
630
                NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE;
 
631
 
 
632
                nm_setting_get_secret_flags (setting, secret, &flags, NULL);
 
633
                if (func (setting, pspec->name, flags, user_data) == TRUE)
 
634
                        g_hash_table_iter_remove (&iter);
 
635
        }
 
636
}
 
637
 
 
638
static void
615
639
destroy_one_secret (gpointer data)
616
640
{
617
641
        char *secret = (char *) data;
733
757
        parent_class->set_secret_flags  = set_secret_flags;
734
758
        parent_class->need_secrets      = need_secrets;
735
759
        parent_class->compare_property  = compare_property;
 
760
        parent_class->clear_secrets_with_flags = clear_secrets_with_flags;
736
761
 
737
762
        /* Properties */
738
763
        /**