Imported Upstream version 0.8.3.999 upstream/0.8.3.999

8 files changed, 208 insertions, 200 deletions

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index a2d4d2b2..fd5eccef 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -58,7 +58,9 @@ libnm_util_la_SOURCES=			\
 
 libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
 
-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
+SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver
+
+libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
 	-version-info "7:1:6"
 
 if WITH_GNUTLS
@@ -111,3 +113,10 @@ DISTCLEANFILES = libnm-util.pc
 
 EXTRA_DIST = libnm-util.pc.in libnm-util.ver
 
+if WITH_TESTS
+
+check-local:
+	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
+
+endif
+
diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in
index dcea77bf..d78365d7 100644
--- a/libnm-util/Makefile.in
+++ b/libnm-util/Makefile.in
@@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -444,7 +444,8 @@ libnm_util_la_SOURCES = crypto.c crypto.h nm-connection.c \
 	$(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4)
 libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \
 	$(am__append_3) $(am__append_6)
-libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \
+SYMBOL_VIS_FILE = $(srcdir)/libnm-util.ver
+libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
 	-version-info "7:1:6"
 
 libnm_util_includedir = $(includedir)/NetworkManager
@@ -1041,7 +1042,9 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+@WITH_TESTS_FALSE@check-local:
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-recursive
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs: installdirs-recursive
@@ -1148,11 +1151,11 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
+	all all-am check check-am check-local clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
 	ctags ctags-recursive distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
@@ -1170,6 +1173,9 @@ uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA
 
 
+@WITH_TESTS_TRUE@check-local:
+@WITH_TESTS_TRUE@	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index edfc16af..0fee84c8 100644
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -57,8 +57,6 @@ crypto_init (GError **error)
 void
 crypto_deinit (void)
 {
-	if (initialized)
-		gnutls_global_deinit();
 }
 
 gboolean
diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index 490d5fe9..ff12f9c5 100644
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -74,10 +74,6 @@ crypto_init (GError **error)
 void
 crypto_deinit (void)
 {
-	if (initialized) {
-		NSS_Shutdown ();
-		PR_Cleanup ();
-	}
 }
 
 gboolean
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index 354a0f7b..7fce9a67 100644
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -27,6 +27,54 @@ global:
 	nm_connection_to_hash;
 	nm_connection_update_secrets;
 	nm_connection_verify;
+	nm_ip4_address_compare;
+	nm_ip4_address_dup;
+	nm_ip4_address_get_address;
+	nm_ip4_address_get_gateway;
+	nm_ip4_address_get_prefix;
+	nm_ip4_address_new;
+	nm_ip4_address_ref;
+	nm_ip4_address_set_address;
+	nm_ip4_address_set_gateway;
+	nm_ip4_address_set_prefix;
+	nm_ip4_address_unref;
+	nm_ip4_route_compare;
+	nm_ip4_route_dup;
+	nm_ip4_route_get_dest;
+	nm_ip4_route_get_metric;
+	nm_ip4_route_get_next_hop;
+	nm_ip4_route_get_prefix;
+	nm_ip4_route_new;
+	nm_ip4_route_ref;
+	nm_ip4_route_set_dest;
+	nm_ip4_route_set_metric;
+	nm_ip4_route_set_next_hop;
+	nm_ip4_route_set_prefix;
+	nm_ip4_route_unref;
+	nm_ip6_address_compare;
+	nm_ip6_address_dup;
+	nm_ip6_address_get_address;
+	nm_ip6_address_get_gateway;
+	nm_ip6_address_get_prefix;
+	nm_ip6_address_new;
+	nm_ip6_address_ref;
+	nm_ip6_address_set_address;
+	nm_ip6_address_set_gateway;
+	nm_ip6_address_set_prefix;
+	nm_ip6_address_unref;
+	nm_ip6_route_compare;
+	nm_ip6_route_dup;
+	nm_ip6_route_get_dest;
+	nm_ip6_route_get_metric;
+	nm_ip6_route_get_next_hop;
+	nm_ip6_route_get_prefix;
+	nm_ip6_route_new;
+	nm_ip6_route_ref;
+	nm_ip6_route_set_dest;
+	nm_ip6_route_set_metric;
+	nm_ip6_route_set_next_hop;
+	nm_ip6_route_set_prefix;
+	nm_ip6_route_unref;
 	nm_setting_802_1x_add_eap_method;
 	nm_setting_802_1x_clear_eap_methods;
 	nm_setting_802_1x_error_get_type;
@@ -34,17 +82,13 @@ global:
 	nm_setting_802_1x_get_anonymous_identity;
 	nm_setting_802_1x_get_ca_cert;
 	nm_setting_802_1x_get_ca_cert_blob;
-	nm_setting_802_1x_set_ca_cert_from_file;
 	nm_setting_802_1x_get_ca_cert_path;
 	nm_setting_802_1x_get_ca_cert_scheme;
-	nm_setting_802_1x_set_ca_cert;
 	nm_setting_802_1x_get_ca_path;
 	nm_setting_802_1x_get_client_cert;
 	nm_setting_802_1x_get_client_cert_blob;
-	nm_setting_802_1x_set_client_cert_from_file;
 	nm_setting_802_1x_get_client_cert_path;
 	nm_setting_802_1x_get_client_cert_scheme;
-	nm_setting_802_1x_set_client_cert;
 	nm_setting_802_1x_get_eap_method;
 	nm_setting_802_1x_get_identity;
 	nm_setting_802_1x_get_num_eap_methods;
@@ -56,271 +100,258 @@ global:
 	nm_setting_802_1x_get_phase2_autheap;
 	nm_setting_802_1x_get_phase2_ca_cert;
 	nm_setting_802_1x_get_phase2_ca_cert_blob;
-	nm_setting_802_1x_set_phase2_ca_cert_from_file;
 	nm_setting_802_1x_get_phase2_ca_cert_path;
 	nm_setting_802_1x_get_phase2_ca_cert_scheme;
-	nm_setting_802_1x_set_phase2_ca_cert;
 	nm_setting_802_1x_get_phase2_ca_path;
 	nm_setting_802_1x_get_phase2_client_cert;
 	nm_setting_802_1x_get_phase2_client_cert_blob;
-	nm_setting_802_1x_set_phase2_client_cert_from_file;
 	nm_setting_802_1x_get_phase2_client_cert_path;
 	nm_setting_802_1x_get_phase2_client_cert_scheme;
-	nm_setting_802_1x_set_phase2_client_cert;
 	nm_setting_802_1x_get_phase2_private_key;
 	nm_setting_802_1x_get_phase2_private_key_blob;
 	nm_setting_802_1x_get_phase2_private_key_format;
-	nm_setting_802_1x_set_phase2_private_key_from_file;
 	nm_setting_802_1x_get_phase2_private_key_password;
 	nm_setting_802_1x_get_phase2_private_key_path;
 	nm_setting_802_1x_get_phase2_private_key_scheme;
 	nm_setting_802_1x_get_phase2_private_key_type;
-	nm_setting_802_1x_set_phase2_private_key;
 	nm_setting_802_1x_get_pin;
 	nm_setting_802_1x_get_private_key;
 	nm_setting_802_1x_get_private_key_blob;
 	nm_setting_802_1x_get_private_key_format;
-	nm_setting_802_1x_set_private_key_from_file;
 	nm_setting_802_1x_get_private_key_password;
 	nm_setting_802_1x_get_private_key_path;
 	nm_setting_802_1x_get_private_key_scheme;
 	nm_setting_802_1x_get_private_key_type;
-	nm_setting_802_1x_set_private_key;
 	nm_setting_802_1x_get_psk;
 	nm_setting_802_1x_get_system_ca_certs;
 	nm_setting_802_1x_get_type;
 	nm_setting_802_1x_new;
 	nm_setting_802_1x_remove_eap_method;
+	nm_setting_802_1x_set_ca_cert;
+	nm_setting_802_1x_set_ca_cert_from_file;
+	nm_setting_802_1x_set_client_cert;
+	nm_setting_802_1x_set_client_cert_from_file;
+	nm_setting_802_1x_set_phase2_ca_cert;
+	nm_setting_802_1x_set_phase2_ca_cert_from_file;
+	nm_setting_802_1x_set_phase2_client_cert;
+	nm_setting_802_1x_set_phase2_client_cert_from_file;
+	nm_setting_802_1x_set_phase2_private_key;
+	nm_setting_802_1x_set_phase2_private_key_from_file;
+	nm_setting_802_1x_set_private_key;
+	nm_setting_802_1x_set_private_key_from_file;
 	nm_setting_bluetooth_error_get_type;
 	nm_setting_bluetooth_error_quark;
-	nm_setting_bluetooth_get_type;
-	nm_setting_bluetooth_new;
 	nm_setting_bluetooth_get_bdaddr;
 	nm_setting_bluetooth_get_connection_type;
+	nm_setting_bluetooth_get_type;
+	nm_setting_bluetooth_new;
 	nm_setting_cdma_error_get_type;
 	nm_setting_cdma_error_quark;
-	nm_setting_cdma_get_type;
-	nm_setting_cdma_new;
 	nm_setting_cdma_get_number;
-	nm_setting_cdma_get_username;
 	nm_setting_cdma_get_password;
+	nm_setting_cdma_get_type;
+	nm_setting_cdma_get_username;
+	nm_setting_cdma_new;
 	nm_setting_clear_secrets;
 	nm_setting_compare;
 	nm_setting_connection_error_get_type;
 	nm_setting_connection_error_quark;
-	nm_setting_connection_get_type;
-	nm_setting_connection_new;
-	nm_setting_connection_get_id;
-	nm_setting_connection_get_uuid;
-	nm_setting_connection_get_connection_type;
 	nm_setting_connection_get_autoconnect;
-	nm_setting_connection_get_timestamp;
+	nm_setting_connection_get_connection_type;
+	nm_setting_connection_get_id;
 	nm_setting_connection_get_read_only;
+	nm_setting_connection_get_timestamp;
+	nm_setting_connection_get_type;
+	nm_setting_connection_get_uuid;
+	nm_setting_connection_new;
 	nm_setting_diff;
 	nm_setting_duplicate;
 	nm_setting_enumerate_values;
 	nm_setting_error_get_type;
 	nm_setting_error_quark;
-	nm_setting_new_from_hash;
 	nm_setting_get_name;
 	nm_setting_get_type;
 	nm_setting_gsm_error_get_type;
 	nm_setting_gsm_error_quark;
-	nm_setting_gsm_get_type;
-	nm_setting_gsm_new;
-	nm_setting_gsm_get_number;
-	nm_setting_gsm_get_username;
-	nm_setting_gsm_get_password;
+	nm_setting_gsm_get_allowed_bands;
 	nm_setting_gsm_get_apn;
+	nm_setting_gsm_get_band;
+	nm_setting_gsm_get_home_only;
 	nm_setting_gsm_get_network_id;
 	nm_setting_gsm_get_network_type;
-	nm_setting_gsm_get_allowed_bands;
-	nm_setting_gsm_get_band;
+	nm_setting_gsm_get_number;
+	nm_setting_gsm_get_password;
 	nm_setting_gsm_get_pin;
 	nm_setting_gsm_get_puk;
-	nm_setting_gsm_get_home_only;
-	nm_setting_ip4_config_error_get_type;
-	nm_setting_ip4_config_error_quark;
-	nm_setting_ip4_config_get_type;
-	nm_setting_ip4_config_new;
-	nm_setting_ip4_config_get_method;
-	nm_setting_ip4_config_get_num_dns;
-	nm_setting_ip4_config_get_dns;
+	nm_setting_gsm_get_type;
+	nm_setting_gsm_get_username;
+	nm_setting_gsm_new;
+	nm_setting_ip4_config_add_address;
 	nm_setting_ip4_config_add_dns;
-	nm_setting_ip4_config_remove_dns;
-	nm_setting_ip4_config_clear_dns;
-	nm_setting_ip4_config_get_num_dns_searches;
-	nm_setting_ip4_config_get_dns_search;
 	nm_setting_ip4_config_add_dns_search;
-	nm_setting_ip4_config_remove_dns_search;
-	nm_setting_ip4_config_clear_dns_searches;
-	nm_setting_ip4_config_get_num_addresses;
-	nm_setting_ip4_config_get_address;
-	nm_setting_ip4_config_add_address;
-	nm_setting_ip4_config_remove_address;
-	nm_setting_ip4_config_clear_addresses;
-	nm_setting_ip4_config_get_num_routes;
-	nm_setting_ip4_config_get_route;
 	nm_setting_ip4_config_add_route;
-	nm_setting_ip4_config_remove_route;
+	nm_setting_ip4_config_clear_addresses;
+	nm_setting_ip4_config_clear_dns;
+	nm_setting_ip4_config_clear_dns_searches;
 	nm_setting_ip4_config_clear_routes;
-	nm_setting_ip4_config_get_ignore_auto_routes;
-	nm_setting_ip4_config_get_ignore_auto_dns;
+	nm_setting_ip4_config_error_get_type;
+	nm_setting_ip4_config_error_quark;
+	nm_setting_ip4_config_get_address;
 	nm_setting_ip4_config_get_dhcp_client_id;
 	nm_setting_ip4_config_get_dhcp_hostname;
 	nm_setting_ip4_config_get_dhcp_send_hostname;
-	nm_setting_ip4_config_get_never_default;
+	nm_setting_ip4_config_get_dns;
+	nm_setting_ip4_config_get_dns_search;
+	nm_setting_ip4_config_get_ignore_auto_dns;
+	nm_setting_ip4_config_get_ignore_auto_routes;
 	nm_setting_ip4_config_get_may_fail;
-	nm_ip6_address_new;
-	nm_ip6_address_dup;
-	nm_ip6_address_ref;
-	nm_ip6_address_unref;
-	nm_ip6_address_compare;
-	nm_ip6_address_get_address;
-	nm_ip6_address_set_address;
-	nm_ip6_address_get_gateway;
-	nm_ip6_address_set_gateway;
-	nm_ip6_address_get_prefix;
-	nm_ip6_address_set_prefix;
-	nm_ip6_route_new;
-	nm_ip6_route_dup;
-	nm_ip6_route_ref;
-	nm_ip6_route_unref;
-	nm_ip6_route_compare;
-	nm_ip6_route_get_dest;
-	nm_ip6_route_set_dest;
-	nm_ip6_route_get_prefix;
-	nm_ip6_route_set_prefix;
-	nm_ip6_route_get_next_hop;
-	nm_ip6_route_set_next_hop;
-	nm_ip6_route_get_metric;
-	nm_ip6_route_set_metric;
+	nm_setting_ip4_config_get_method;
+	nm_setting_ip4_config_get_never_default;
+	nm_setting_ip4_config_get_num_addresses;
+	nm_setting_ip4_config_get_num_dns;
+	nm_setting_ip4_config_get_num_dns_searches;
+	nm_setting_ip4_config_get_num_routes;
+	nm_setting_ip4_config_get_route;
+	nm_setting_ip4_config_get_type;
+	nm_setting_ip4_config_new;
+	nm_setting_ip4_config_remove_address;
+	nm_setting_ip4_config_remove_dns;
+	nm_setting_ip4_config_remove_dns_search;
+	nm_setting_ip4_config_remove_route;
+	nm_setting_ip6_config_add_address;
+	nm_setting_ip6_config_add_dns;
+	nm_setting_ip6_config_add_dns_search;
+	nm_setting_ip6_config_add_route;
+	nm_setting_ip6_config_clear_addresses;
+	nm_setting_ip6_config_clear_dns;
+	nm_setting_ip6_config_clear_dns_searches;
+	nm_setting_ip6_config_clear_routes;
 	nm_setting_ip6_config_error_get_type;
 	nm_setting_ip6_config_error_quark;
-	nm_setting_ip6_config_get_type;
-	nm_setting_ip6_config_new;
-	nm_setting_ip6_config_get_method;
-	nm_setting_ip6_config_get_num_dns;
+	nm_setting_ip6_config_get_address;
 	nm_setting_ip6_config_get_dns;
-	nm_setting_ip6_config_add_dns;
-	nm_setting_ip6_config_remove_dns;
-	nm_setting_ip6_config_clear_dns;
-	nm_setting_ip6_config_get_num_dns_searches;
 	nm_setting_ip6_config_get_dns_search;
-	nm_setting_ip6_config_add_dns_search;
-	nm_setting_ip6_config_remove_dns_search;
-	nm_setting_ip6_config_clear_dns_searches;
+	nm_setting_ip6_config_get_ignore_auto_dns;
+	nm_setting_ip6_config_get_ignore_auto_routes;
+	nm_setting_ip6_config_get_may_fail;
+	nm_setting_ip6_config_get_method;
+	nm_setting_ip6_config_get_never_default;
 	nm_setting_ip6_config_get_num_addresses;
-	nm_setting_ip6_config_get_address;
-	nm_setting_ip6_config_add_address;
-	nm_setting_ip6_config_remove_address;
-	nm_setting_ip6_config_clear_addresses;
+	nm_setting_ip6_config_get_num_dns;
+	nm_setting_ip6_config_get_num_dns_searches;
 	nm_setting_ip6_config_get_num_routes;
 	nm_setting_ip6_config_get_route;
-	nm_setting_ip6_config_add_route;
+	nm_setting_ip6_config_get_type;
+	nm_setting_ip6_config_new;
+	nm_setting_ip6_config_remove_address;
+	nm_setting_ip6_config_remove_dns;
+	nm_setting_ip6_config_remove_dns_search;
 	nm_setting_ip6_config_remove_route;
-	nm_setting_ip6_config_clear_routes;
-	nm_setting_ip6_config_get_ignore_auto_routes;
-	nm_setting_ip6_config_get_ignore_auto_dns;
-	nm_setting_ip6_config_get_never_default;
-	nm_setting_ip6_config_get_may_fail;
 	nm_setting_need_secrets;
+	nm_setting_new_from_hash;
+	nm_setting_olpc_mesh_error_get_type;
+	nm_setting_olpc_mesh_error_quark;
+	nm_setting_olpc_mesh_get_channel;
+	nm_setting_olpc_mesh_get_dhcp_anycast_address;
+	nm_setting_olpc_mesh_get_ssid;
+	nm_setting_olpc_mesh_get_type;
+	nm_setting_olpc_mesh_new;
 	nm_setting_ppp_error_get_type;
 	nm_setting_ppp_error_quark;
-	nm_setting_ppp_get_type;
-	nm_setting_ppp_new;
+	nm_setting_ppp_get_baud;
+	nm_setting_ppp_get_crtscts;
+	nm_setting_ppp_get_lcp_echo_failure;
+	nm_setting_ppp_get_lcp_echo_interval;
+	nm_setting_ppp_get_mppe_stateful;
+	nm_setting_ppp_get_mru;
+	nm_setting_ppp_get_mtu;
+	nm_setting_ppp_get_no_vj_comp;
 	nm_setting_ppp_get_noauth;
-	nm_setting_ppp_get_refuse_eap;
-	nm_setting_ppp_get_refuse_pap;
+	nm_setting_ppp_get_nobsdcomp;
+	nm_setting_ppp_get_nodeflate;
 	nm_setting_ppp_get_refuse_chap;
+	nm_setting_ppp_get_refuse_eap;
 	nm_setting_ppp_get_refuse_mschap;
 	nm_setting_ppp_get_refuse_mschapv2;
-	nm_setting_ppp_get_nobsdcomp;
-	nm_setting_ppp_get_nodeflate;
-	nm_setting_ppp_get_no_vj_comp;
+	nm_setting_ppp_get_refuse_pap;
 	nm_setting_ppp_get_require_mppe;
 	nm_setting_ppp_get_require_mppe_128;
-	nm_setting_ppp_get_mppe_stateful;
-	nm_setting_ppp_get_crtscts;
-	nm_setting_ppp_get_baud;
-	nm_setting_ppp_get_mru;
-	nm_setting_ppp_get_mtu;
-	nm_setting_ppp_get_lcp_echo_failure;
-	nm_setting_ppp_get_lcp_echo_interval;
+	nm_setting_ppp_get_type;
+	nm_setting_ppp_new;
 	nm_setting_pppoe_error_get_type;
 	nm_setting_pppoe_error_quark;
-	nm_setting_pppoe_get_type;
-	nm_setting_pppoe_new;
+	nm_setting_pppoe_get_password;
 	nm_setting_pppoe_get_service;
+	nm_setting_pppoe_get_type;
 	nm_setting_pppoe_get_username;
-	nm_setting_pppoe_get_password;
+	nm_setting_pppoe_new;
 	nm_setting_serial_error_get_type;
 	nm_setting_serial_error_quark;
-	nm_setting_serial_get_type;
-	nm_setting_serial_new;
 	nm_setting_serial_get_baud;
 	nm_setting_serial_get_bits;
 	nm_setting_serial_get_parity;
-	nm_setting_serial_get_stopbits;
 	nm_setting_serial_get_send_delay;
+	nm_setting_serial_get_stopbits;
+	nm_setting_serial_get_type;
+	nm_setting_serial_new;
 	nm_setting_to_hash;
 	nm_setting_to_string;
 	nm_setting_update_secrets;
 	nm_setting_verify;
+	nm_setting_vpn_add_data_item;
+	nm_setting_vpn_add_secret;
 	nm_setting_vpn_error_get_type;
 	nm_setting_vpn_error_quark;
-	nm_setting_vpn_get_type;
-	nm_setting_vpn_new;
-	nm_setting_vpn_get_service_type;
-	nm_setting_vpn_get_user_name;
-	nm_setting_vpn_add_data_item;
 	nm_setting_vpn_foreach_data_item;
-	nm_setting_vpn_get_data_item;
-	nm_setting_vpn_remove_data_item;
-	nm_setting_vpn_add_secret;
 	nm_setting_vpn_foreach_secret;
+	nm_setting_vpn_get_data_item;
 	nm_setting_vpn_get_secret;
+	nm_setting_vpn_get_service_type;
+	nm_setting_vpn_get_type;
+	nm_setting_vpn_get_user_name;
+	nm_setting_vpn_new;
+	nm_setting_vpn_remove_data_item;
 	nm_setting_vpn_remove_secret;
+	nm_setting_wired_add_s390_option;
 	nm_setting_wired_error_get_type;
 	nm_setting_wired_error_quark;
-	nm_setting_wired_get_type;
-	nm_setting_wired_new;
-	nm_setting_wired_get_port;
-	nm_setting_wired_get_speed;
-	nm_setting_wired_get_duplex;
 	nm_setting_wired_get_auto_negotiate;
-	nm_setting_wired_get_mac_address;
 	nm_setting_wired_get_cloned_mac_address;
+	nm_setting_wired_get_duplex;
+	nm_setting_wired_get_mac_address;
 	nm_setting_wired_get_mtu;
 	nm_setting_wired_get_num_s390_options;
+	nm_setting_wired_get_port;
 	nm_setting_wired_get_s390_nettype;
 	nm_setting_wired_get_s390_option;
 	nm_setting_wired_get_s390_option_by_key;
-	nm_setting_wired_add_s390_option;
 	nm_setting_wired_get_s390_subchannels;
+	nm_setting_wired_get_speed;
+	nm_setting_wired_get_type;
+	nm_setting_wired_new;
 	nm_setting_wired_remove_s390_option;
+	nm_setting_wireless_add_seen_bssid;
 	nm_setting_wireless_ap_security_compatible;
 	nm_setting_wireless_error_get_type;
 	nm_setting_wireless_error_quark;
-	nm_setting_wireless_get_type;
-	nm_setting_wireless_new;
-	nm_setting_wireless_get_ssid;
-	nm_setting_wireless_get_mode;
 	nm_setting_wireless_get_band;
-	nm_setting_wireless_get_channel;
 	nm_setting_wireless_get_bssid;
-	nm_setting_wireless_get_rate;
-	nm_setting_wireless_get_tx_power;
-	nm_setting_wireless_get_mac_address;
+	nm_setting_wireless_get_channel;
 	nm_setting_wireless_get_cloned_mac_address;
+	nm_setting_wireless_get_mac_address;
+	nm_setting_wireless_get_mode;
 	nm_setting_wireless_get_mtu;
-	nm_setting_wireless_get_security;
-	nm_setting_wireless_add_seen_bssid;
 	nm_setting_wireless_get_num_seen_bssids;
+	nm_setting_wireless_get_rate;
+	nm_setting_wireless_get_security;
 	nm_setting_wireless_get_seen_bssid;
-	nm_setting_wireless_security_add_proto;
-	nm_setting_wireless_security_add_pairwise;
+	nm_setting_wireless_get_ssid;
+	nm_setting_wireless_get_tx_power;
+	nm_setting_wireless_get_type;
+	nm_setting_wireless_new;
 	nm_setting_wireless_security_add_group;
+	nm_setting_wireless_security_add_pairwise;
+	nm_setting_wireless_security_add_proto;
 	nm_setting_wireless_security_clear_groups;
 	nm_setting_wireless_security_clear_pairwise;
 	nm_setting_wireless_security_clear_protos;
@@ -329,8 +360,8 @@ global:
 	nm_setting_wireless_security_get_auth_alg;
 	nm_setting_wireless_security_get_group;
 	nm_setting_wireless_security_get_key_mgmt;
-	nm_setting_wireless_security_get_leap_username;
 	nm_setting_wireless_security_get_leap_password;
+	nm_setting_wireless_security_get_leap_username;
 	nm_setting_wireless_security_get_num_groups;
 	nm_setting_wireless_security_get_num_pairwise;
 	nm_setting_wireless_security_get_num_protos;
@@ -346,23 +377,15 @@ global:
 	nm_setting_wireless_security_remove_pairwise;
 	nm_setting_wireless_security_remove_proto;
 	nm_setting_wireless_security_set_wep_key;
-	nm_setting_olpc_mesh_error_quark;
-	nm_setting_olpc_mesh_error_get_type;
-	nm_setting_olpc_mesh_get_type;
-	nm_setting_olpc_mesh_get_ssid;
-	nm_setting_olpc_mesh_get_channel;
-	nm_setting_olpc_mesh_get_dhcp_anycast_address;
-	nm_setting_olpc_mesh_new;
 	nm_utils_deinit;
-	nm_utils_rsa_key_encrypt;
 	nm_utils_escape_ssid;
 	nm_utils_gvalue_hash_dup;
 	nm_utils_init;
 	nm_utils_ip4_addresses_from_gvalue;
 	nm_utils_ip4_addresses_to_gvalue;
+	nm_utils_ip4_get_default_prefix;
 	nm_utils_ip4_netmask_to_prefix;
 	nm_utils_ip4_prefix_to_netmask;
-	nm_utils_ip4_get_default_prefix;
 	nm_utils_ip4_routes_from_gvalue;
 	nm_utils_ip4_routes_to_gvalue;
 	nm_utils_ip6_addresses_from_gvalue;
@@ -370,40 +393,17 @@ global:
 	nm_utils_ip6_routes_from_gvalue;
 	nm_utils_ip6_routes_to_gvalue;
 	nm_utils_is_empty_ssid;
+	nm_utils_rsa_key_encrypt;
 	nm_utils_same_ssid;
 	nm_utils_security_valid;
 	nm_utils_slist_free;
 	nm_utils_ssid_to_utf8;
 	nm_utils_uuid_generate;
 	nm_utils_uuid_generate_from_string;
-	nm_utils_wifi_freq_to_channel;
 	nm_utils_wifi_channel_to_freq;
 	nm_utils_wifi_find_next_channel;
+	nm_utils_wifi_freq_to_channel;
 	nm_utils_wifi_is_channel_valid;
-	nm_ip4_address_compare;
-	nm_ip4_address_dup;
-	nm_ip4_address_get_address;
-	nm_ip4_address_get_prefix;
-	nm_ip4_address_get_gateway;
-	nm_ip4_address_new;
-	nm_ip4_address_ref;
-	nm_ip4_address_set_address;
-	nm_ip4_address_set_prefix;
-	nm_ip4_address_set_gateway;
-	nm_ip4_address_unref;
-	nm_ip4_route_compare;
-	nm_ip4_route_dup;
-	nm_ip4_route_get_dest;
-	nm_ip4_route_get_prefix;
-	nm_ip4_route_get_next_hop;
-	nm_ip4_route_get_metric;
-	nm_ip4_route_new;
-	nm_ip4_route_ref;
-	nm_ip4_route_unref;
-	nm_ip4_route_set_dest;
-	nm_ip4_route_set_prefix;
-	nm_ip4_route_set_next_hop;
-	nm_ip4_route_set_metric;
 local:
 	*;
 };
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 9c3662f4..7f40fc7e 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -272,13 +272,12 @@ gboolean
 nm_utils_init (GError **error)
 {
 	if (!initialized) {
+		initialized = TRUE;
+
 		if (!crypto_init (error))
 			return FALSE;
 
 		_nm_utils_register_value_transformations ();
-
-		atexit (nm_utils_deinit);
-		initialized = TRUE;
 	}
 	return TRUE;
 }
diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in
index 766aa979..ab69399a 100644
--- a/libnm-util/tests/Makefile.in
+++ b/libnm-util/tests/Makefile.in
@@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in
index d49619f7..0821f71d 100644
--- a/libnm-util/tests/certs/Makefile.in
+++ b/libnm-util/tests/certs/Makefile.in
@@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
 	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d