diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-08-21 14:12:31 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-08-21 14:12:31 -0500 |
| commit | e2b13be3d91f52335fc4d1e5a09f42962b623baf (patch) | |
| tree | fedb2e61bd6c0aa283299310d3ea1ec90b044626 /libnm-util | |
| parent | 650cbcc10849af93a5a308fb8d4073e7455a8140 (diff) | |
| parent | 09459788cdf5543dcdb296652475ef4afd59ad1e (diff) | |
Merge commit 'origin/master' into polkit1
Conflicts:
libnm-glib/Makefile.am
src/system-settings/nm-sysconfig-settings.c
system-settings/plugins/ifcfg-rh/plugin.c
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/nm-setting-ip6-config.c | 1 | ||||
| -rw-r--r-- | libnm-util/tests/Makefile.am | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index d9da92fa8f..2998223ca8 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -436,6 +436,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) + || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL) || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) { if (!priv->ignore_auto_dns) { diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index 1cf19cbc46..ea34ebc38a 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -14,9 +14,9 @@ test_settings_defaults_CPPFLAGS = \ $(DBUS_CFLAGS) test_settings_defaults_LDADD = \ + $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(top_builddir)/libnm-util/libnm-util.la + $(DBUS_LIBS) test_crypto_SOURCES = \ test-crypto.c @@ -25,8 +25,8 @@ test_crypto_CPPFLAGS = \ $(GLIB_CFLAGS) test_crypto_LDADD = \ - $(GLIB_LIBS) \ - $(top_builddir)/libnm-util/libtest-crypto.la + $(top_builddir)/libnm-util/libtest-crypto.la \ + $(GLIB_LIBS) if WITH_TESTS |