From 54f6333410ffd570e62717d9e77c5c987175e397 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Dec 2015 00:24:58 +0100 Subject: Imported Upstream version 1.0.10 --- NEWS | 23 + clients/cli/Makefile.am | 6 +- clients/cli/Makefile.in | 28 +- clients/cli/common.c | 110 +- clients/cli/connections.c | 12 - clients/cli/settings.c | 30 +- clients/common/nm-polkit-listener.c | 8 +- clients/common/nm-secret-agent-simple.c | 184 +- clients/common/nm-secret-agent-simple.h | 4 +- clients/common/nm-vpn-helpers.c | 348 + clients/common/nm-vpn-helpers.h | 47 + clients/tui/Makefile.am | 4 + clients/tui/Makefile.in | 26 +- clients/tui/nm-editor-utils.c | 12 +- clients/tui/nmt-password-dialog.c | 2 + clients/tui/nmtui-connect.c | 92 +- configure | 45 +- configure.ac | 7 +- docs/api/html/index.html | 2 +- docs/api/html/spec.html | 4 +- docs/api/spec.html | 4 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/libnm-glib-sections.txt | 37 + docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/api-index-full.html | 4 - docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 1 - docs/libnm/html/libnm-nm-version.html | 10 - docs/libnm/html/libnm.devhelp2 | 1 - docs/libnm/libnm-sections.txt | 1 - docs/libnm/version.xml | 2 +- include/nm-glib-compat.h | 11 + include/nm-macros-internal.h | 1 + include/nm-test-utils.h | 137 +- include/nm-version-macros.h | 7 +- include/nm-version-macros.h.in | 5 +- libnm-core/nm-version.h | 6 - libnm-util/nm-connection.c | 35 +- libnm-util/nm-version.h | 6 - man/NetworkManager.8 | 2 +- man/NetworkManager.conf.5 | 2 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 6 +- man/nm-settings.xml | 2 +- po/POTFILES.in | 1 + po/POTFILES.skip | 1 - po/ar.po | 8028 ++++++++++++++++++- po/as.po | 5542 +++++++------ po/be@latin.po | 7955 ++++++++++++++++++- po/bg.po | 9403 ++++++++++++++++++---- po/bn_IN.po | 5844 ++++++++------ po/bs.po | 8068 ++++++++++++++++++- po/ca.po | 9494 ++++++++++++++++++---- po/cs.po | 9577 +++++++++++++++++++---- po/da.po | 9422 ++++++++++++++++++---- po/de.po | 5532 ++++++++----- po/dz.po | 8162 ++++++++++++++++++- po/el.po | 7277 ++++++++++------- po/en_CA.po | 8914 +++++++++++++++++++-- po/en_GB.po | 9460 +++++++++++++++++----- po/eo.po | 9521 +++++++++++++++++----- po/es.po | 7854 ++++++++++++------- po/et.po | 8060 ++++++++++++++++++- po/eu.po | 9098 +++++++++++++++++++--- po/fi.po | 8805 +++++++++++++++++---- po/fr.po | 8139 ++++++++++++------- po/gl.po | 9461 +++++++++++++++++----- po/gu.po | 7414 +++++++++++------- po/he.po | 7943 ++++++++++++++++++- po/hi.po | 5827 ++++++++------ po/hr.po | 9372 ++++++++++++++++++---- po/hu.po | 9558 +++++++++++++++++------ po/id.po | 9330 +++++++++++++++++----- po/it.po | 530 +- po/ja.po | 8006 ++++++++++++------- po/ka.po | 9097 ++++++++++++++++++++-- po/kn.po | 5963 ++++++++------ po/ko.po | 7933 ++++++++++++------- po/ku.po | 8099 +++++++++++++++++-- po/lt.po | 8230 ++++++++++++++------ po/lv.po | 9051 +++++++++++++++++++-- po/mk.po | 7954 ++++++++++++++++++- po/ml.po | 8128 ++++++++++++------- po/mr.po | 5596 ++++++++----- po/nb.po | 8004 ++++++++++++++++++- po/ne.po | 8165 ++++++++++++++++++- po/nl.po | 8044 ++++++++++++++++++- po/oc.po | 7911 ++++++++++++++++++- po/or.po | 7990 ++++++++++++------- po/pa.po | 7953 ++++++++++++------- po/pl.po | 518 +- po/pt.po | 8147 ++++++++++++++++++- po/pt_BR.po | 9958 +++++++++++++++++------- po/ru.po | 3654 +++++---- po/rw.po | 8299 +++++++++++++++++++- po/sk.po | 9060 +++++++++++++++++++-- po/sl.po | 9494 +++++++++++++++++----- po/sq.po | 8050 ++++++++++++++++++- po/sr.po | 9366 ++++++++++++++++++---- po/sr@latin.po | 9353 ++++++++++++++++++---- po/sv.po | 516 +- po/ta.po | 3975 +++++----- po/te.po | 5953 ++++++++------ po/th.po | 9017 +++++++++++++++++++-- po/tr.po | 4835 ++++++------ po/uk.po | 3843 ++++----- po/vi.po | 8048 ++++++++++++++++++- po/wa.po | 8064 ++++++++++++++++++- po/zh_CN.po | 7798 ++++++++++++------- po/zh_HK.po | 8455 +++++++++++++++++++- po/zh_TW.po | 7825 ++++++++++++------- src/devices/adsl/nm-atm-manager.c | 38 +- src/devices/adsl/nm-device-adsl.c | 383 +- src/devices/adsl/nm-device-adsl.h | 6 +- src/devices/nm-device-ethernet.c | 2 +- src/devices/nm-device-vlan.c | 12 +- src/devices/nm-device.c | 4 +- src/devices/wifi/nm-device-wifi.c | 40 +- src/dhcp-manager/nm-dhcp-helper.c | 4 + src/dhcp-manager/nm-dhcp-manager.c | 11 +- src/dhcp-manager/nm-dhcp-utils.c | 6 +- src/dns-manager/nm-dns-manager.c | 13 +- src/main-utils.c | 7 +- src/main.c | 28 +- src/nm-firewall-manager.c | 13 +- src/nm-iface-helper.c | 7 +- src/nm-ip4-config.c | 34 +- src/nm-ip6-config.c | 26 +- src/nm-manager.c | 14 +- src/nm-policy.c | 4 +- src/nm-sleep-monitor-systemd.c | 12 +- src/nm-sleep-monitor-upower.c | 12 +- src/platform/nm-linux-platform.c | 140 +- src/platform/tests/Makefile.am | 8 - src/platform/tests/Makefile.in | 62 +- src/platform/tests/dump.c | 139 - src/platform/tests/monitor.c | 22 +- src/platform/tests/platform.c | 902 --- src/platform/tests/test-link.c | 6 + src/ppp-manager/nm-ppp-manager.c | 3 +- src/settings/nm-agent-manager.c | 84 +- src/settings/nm-inotify-helper.c | 43 +- src/settings/nm-settings-connection.c | 2 +- src/settings/nm-settings.c | 2 +- src/supplicant-manager/nm-supplicant-manager.c | 14 +- src/tests/test-ip4-config.c | 22 + src/tests/test-ip6-config.c | 22 + src/vpn-manager/nm-vpn-connection.c | 5 +- src/vpn-manager/nm-vpn-manager.c | 14 +- tools/run-test-valgrind.sh | 95 +- 156 files changed, 404368 insertions(+), 93139 deletions(-) create mode 100644 clients/common/nm-vpn-helpers.c create mode 100644 clients/common/nm-vpn-helpers.h delete mode 100644 src/platform/tests/dump.c delete mode 100644 src/platform/tests/platform.c diff --git a/NEWS b/NEWS index 4966050a..1f6b10d1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,26 @@ +=============================================== +NetworkManager-1.0.10 +Overview of changes since NetworkManager-1.0.8 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* Added support for handling VPN secrets to nmtui and nmcli agent. + +* Fixed a regression that caused NetworkManager to ignore external deletion of + a device with master. + +* Fixed glitches with older versions of glib (prior to 2.36.0). + +* Fixed build with most recent versions of libsoup. + +* Fixed busy retry loop on non-transient errors from wpa_supplicant. + +* Improvements to testing infrastructure. + +* Updates to German, Galician, Occitan, Turkish, Ukrainian, Brazilian, Swedish, + Polish and Italian translations. + =============================================== NetworkManager-1.0.8 Overview of changes since NetworkManager-1.0.6 diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am index eef99cba..2f394098 100644 --- a/clients/cli/Makefile.am +++ b/clients/cli/Makefile.am @@ -14,7 +14,9 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(libdir)\" nmcli_SOURCES = \ agent.c \ @@ -38,6 +40,8 @@ nmcli_SOURCES = \ \ $(srcdir)/../common/nm-secret-agent-simple.c \ $(srcdir)/../common/nm-secret-agent-simple.h \ + $(srcdir)/../common/nm-vpn-helpers.c \ + $(srcdir)/../common/nm-vpn-helpers.h \ $(NULL) nmcli_LDADD = \ diff --git a/clients/cli/Makefile.in b/clients/cli/Makefile.in index d79f0e70..2abbf580 100644 --- a/clients/cli/Makefile.in +++ b/clients/cli/Makefile.in @@ -122,6 +122,8 @@ am__nmcli_SOURCES_DIST = agent.c agent.h common.c common.h \ utils.h polkit-agent.c polkit-agent.h \ $(srcdir)/../common/nm-secret-agent-simple.c \ $(srcdir)/../common/nm-secret-agent-simple.h \ + $(srcdir)/../common/nm-vpn-helpers.c \ + $(srcdir)/../common/nm-vpn-helpers.h \ $(srcdir)/../common/nm-polkit-listener.c \ $(srcdir)/../common/nm-polkit-listener.h @WITH_POLKIT_AGENT_TRUE@am__objects_1 = nm-polkit-listener.$(OBJEXT) @@ -129,7 +131,7 @@ am_nmcli_OBJECTS = agent.$(OBJEXT) common.$(OBJEXT) \ connections.$(OBJEXT) devices.$(OBJEXT) general.$(OBJEXT) \ settings.$(OBJEXT) nmcli.$(OBJEXT) utils.$(OBJEXT) \ polkit-agent.$(OBJEXT) nm-secret-agent-simple.$(OBJEXT) \ - $(am__objects_1) + nm-vpn-helpers.$(OBJEXT) $(am__objects_1) nmcli_OBJECTS = $(am_nmcli_OBJECTS) am__DEPENDENCIES_1 = @WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @@ -472,14 +474,17 @@ AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} \ -I${top_srcdir}/clients/common $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nmcli"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" $(am__append_1) + -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ + -DNMCONFDIR=\"$(nmconfdir)\" -DNMLIBDIR=\"$(libdir)\" \ + $(am__append_1) nmcli_SOURCES = agent.c agent.h common.c common.h connections.c \ connections.h devices.c devices.h general.c general.h \ settings.c settings.h nmcli.c nmcli.h utils.c utils.h \ polkit-agent.c polkit-agent.h \ $(srcdir)/../common/nm-secret-agent-simple.c \ - $(srcdir)/../common/nm-secret-agent-simple.h $(NULL) \ - $(am__append_2) + $(srcdir)/../common/nm-secret-agent-simple.h \ + $(srcdir)/../common/nm-vpn-helpers.c \ + $(srcdir)/../common/nm-vpn-helpers.h $(NULL) $(am__append_2) nmcli_LDADD = $(GLIB_LIBS) $(READLINE_LIBS) \ $(top_builddir)/libnm/libnm.la $(am__append_3) @BUILD_SETTING_DOCS_TRUE@BUILT_SOURCES = settings-docs.c @@ -587,6 +592,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/general.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-polkit-listener.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-secret-agent-simple.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-vpn-helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmcli.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/polkit-agent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Po@am__quote@ @@ -627,6 +633,20 @@ nm-secret-agent-simple.obj: $(srcdir)/../common/nm-secret-agent-simple.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-secret-agent-simple.obj `if test -f '$(srcdir)/../common/nm-secret-agent-simple.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-secret-agent-simple.c'; fi` +nm-vpn-helpers.o: $(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-vpn-helpers.o -MD -MP -MF $(DEPDIR)/nm-vpn-helpers.Tpo -c -o nm-vpn-helpers.o `test -f '$(srcdir)/../common/nm-vpn-helpers.c' || echo '$(srcdir)/'`$(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm-vpn-helpers.Tpo $(DEPDIR)/nm-vpn-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../common/nm-vpn-helpers.c' object='nm-vpn-helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-vpn-helpers.o `test -f '$(srcdir)/../common/nm-vpn-helpers.c' || echo '$(srcdir)/'`$(srcdir)/../common/nm-vpn-helpers.c + +nm-vpn-helpers.obj: $(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-vpn-helpers.obj -MD -MP -MF $(DEPDIR)/nm-vpn-helpers.Tpo -c -o nm-vpn-helpers.obj `if test -f '$(srcdir)/../common/nm-vpn-helpers.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-vpn-helpers.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm-vpn-helpers.Tpo $(DEPDIR)/nm-vpn-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../common/nm-vpn-helpers.c' object='nm-vpn-helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-vpn-helpers.obj `if test -f '$(srcdir)/../common/nm-vpn-helpers.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-vpn-helpers.c'; fi` + nm-polkit-listener.o: $(srcdir)/../common/nm-polkit-listener.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-polkit-listener.o -MD -MP -MF $(DEPDIR)/nm-polkit-listener.Tpo -c -o nm-polkit-listener.o `test -f '$(srcdir)/../common/nm-polkit-listener.c' || echo '$(srcdir)/'`$(srcdir)/../common/nm-polkit-listener.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm-polkit-listener.Tpo $(DEPDIR)/nm-polkit-listener.Po diff --git a/clients/cli/common.c b/clients/cli/common.c index 35676d0f..86f91d58 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -32,6 +32,7 @@ #include "nm-glib-compat.h" +#include "nm-vpn-helpers.h" #include "common.h" #include "utils.h" @@ -926,16 +927,97 @@ nmc_find_connection (const GPtrArray *connections, return found; } +static gboolean +vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) +{ + GError *error = NULL; + NMSettingVpn *s_vpn; + const char *vpn_type, *gw, *port; + char *cookie = NULL; + char *gateway = NULL; + char *gwcert = NULL; + int status = 0; + int i; + gboolean ret; + + if (!connection) + return FALSE; + + if (!nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME)) + return FALSE; + + s_vpn = nm_connection_get_setting_vpn (connection); + vpn_type = nm_setting_vpn_get_service_type (s_vpn); + if (g_strcmp0 (vpn_type, NM_DBUS_INTERFACE ".openconnect")) + return FALSE; + + /* Get gateway and port */ + gw = nm_setting_vpn_get_data_item (s_vpn, "gateway"); + port = gw ? strrchr (gw, ':') : NULL; + + /* Interactively authenticate to OpenConnect server and get secrets */ + ret = nm_vpn_openconnect_authenticate_helper (gw, &cookie, &gateway, &gwcert, &status, &error); + if (!ret) { + g_printerr (_("Error: openconnect failed: %s\n"), error->message); + g_clear_error (&error); + return FALSE; + } + + if (WIFEXITED (status)) { + if (WEXITSTATUS (status) != 0) + g_printerr (_("Error: openconnect failed with status %d\n"), WEXITSTATUS (status)); + } else if (WIFSIGNALED (status)) + g_printerr (_("Error: openconnect failed with signal %d\n"), WTERMSIG (status)); + + /* Append port to the host value */ + if (gateway && port) { + char *tmp = gateway; + gateway = g_strdup_printf ("%s%s", gateway, port); + g_free (tmp); + } + + /* Fill secrets to the array */ + for (i = 0; i < secrets->len; i++) { + NMSecretAgentSimpleSecret *secret = secrets->pdata[i]; + + if (!g_strcmp0 (secret->vpn_type, vpn_type)) { + if (!g_strcmp0 (secret->vpn_property, "cookie")) { + g_free (secret->value); + secret->value = cookie; + cookie = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gateway")) { + g_free (secret->value); + secret->value = gateway; + gateway = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gwcert")) { + g_free (secret->value); + secret->value = gwcert; + gwcert = NULL; + } + } + } + g_free (cookie); + g_free (gateway); + g_free (gwcert); + + return TRUE; +} + static gboolean get_secrets_from_user (const char *request_id, const char *title, const char *msg, + NMConnection *connection, gboolean ask, GHashTable *pwds_hash, GPtrArray *secrets) { int i; + /* Check if there is a VPN OpenConnect secret to ask for */ + if (ask) + vpn_openconnect_get_secrets (connection, secrets); + for (i = 0; i < secrets->len; i++) { NMSecretAgentSimpleSecret *secret = secrets->pdata[i]; char *pwd = NULL; @@ -945,17 +1027,23 @@ get_secrets_from_user (const char *request_id, if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->prop_name))) { pwd = g_strdup (pwd); } else { - g_print ("%s\n", msg); if (ask) { if (secret->value) { - /* Prefill the password if we have it. */ - rl_startup_hook = nmc_rl_set_deftext; - nmc_rl_pre_input_deftext = g_strdup (secret->value); + if (!g_strcmp0 (secret->vpn_type, NM_DBUS_INTERFACE ".openconnect")) { + /* Do not present and ask user for openconnect secrets, we already have them */ + continue; + } else { + /* Prefill the password if we have it. */ + rl_startup_hook = nmc_rl_set_deftext; + nmc_rl_pre_input_deftext = g_strdup (secret->value); + } } + g_print ("%s\n", msg); pwd = nmc_readline ("%s (%s): ", secret->name, secret->prop_name); if (!pwd) pwd = g_strdup (""); } else { + g_print ("%s\n", msg); g_printerr (_("Warning: password for '%s' not given in 'passwd-file' " "and nmcli cannot ask without '--ask' option.\n"), secret->prop_name); @@ -993,12 +1081,24 @@ nmc_secrets_requested (NMSecretAgentSimple *agent, gpointer user_data) { NmCli *nmc = (NmCli *) user_data; + NMConnection *connection = NULL; + char *path, *p; gboolean success = FALSE; if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); - success = get_secrets_from_user (request_id, title, msg, nmc->in_editor || nmc->ask, + /* Find the connection for the request */ + path = g_strdup (request_id); + if (path) { + p = strrchr (path, '/'); + if (p) + *p = '\0'; + connection = nmc_find_connection (nmc->connections, "path", path, NULL); + g_free (path); + } + + success = get_secrets_from_user (request_id, title, msg, connection, nmc->in_editor || nmc->ask, nmc->pwds_hash, secrets); if (success) nm_secret_agent_simple_response (agent, request_id, secrets); diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 55bde29a..e5aaa658 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -9087,12 +9087,6 @@ do_connection_reload (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_SUCCESS; nmc->should_wait = FALSE; - if (!nm_client_get_nm_running (nmc->client)) { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - return nmc->return_value; - } - if (!nm_client_reload_connections (nmc->client, NULL, &error)) { g_string_printf (nmc->return_text, _("Error: failed to reload connections: %s."), error->message); @@ -9113,12 +9107,6 @@ do_connection_load (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_SUCCESS; nmc->should_wait = FALSE; - if (!nm_client_get_nm_running (nmc->client)) { - g_string_printf (nmc->return_text, _("Error: NetworkManager is not running.")); - nmc->return_value = NMC_RESULT_ERROR_NM_NOT_RUNNING; - return nmc->return_value; - } - if (argc == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 8a6b5fa8..6a3c90c2 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -4150,13 +4150,26 @@ nmc_property_vlan_remove_egress_priority_map (NMSetting *setting, } /* --- NM_SETTING_VPN_SETTING_NAME property setter functions --- */ +/* Validate value of vpn 'data' and 'secret' options */ +static const char * +_validate_vpn_hash_value (const char *option, const char *value, GError **error) +{ + /* nm_setting_vpn_add_data_item() and nm_setting_vpn_add_secret() does not + * allow empty strings */ + if (!value || !*value) { + g_set_error (error, 1, 0, _("'%s' cannot be empty"), option); + return NULL; + } + return value; +} + /* 'data' */ DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_data, NM_SETTING_VPN, NMSettingVpn, nm_setting_vpn_add_data_item, NULL, - NULL) + _validate_vpn_hash_value) DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_data, NM_SETTING_VPN, nm_setting_vpn_remove_data_item) @@ -4167,7 +4180,7 @@ DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_secrets, NMSettingVpn, nm_setting_vpn_add_secret, NULL, - NULL) + _validate_vpn_hash_value) DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_secret, NM_SETTING_VPN, nm_setting_vpn_remove_secret) @@ -4273,12 +4286,23 @@ nmc_property_wired_set_s390_nettype (NMSetting *setting, const char *prop, const DEFINE_ALLOWED_VAL_FUNC (nmc_property_wired_allowed_s390_nettype, wired_valid_s390_nettypes) /* 's390-options' */ +/* Validate value of 's390-options' */ +static const char * +_validate_s390_option_value (const char *option, const char *value, GError **error) +{ + /* nm_setting_wired_add_s390_option() requires value len in <1,199> interval */ + if (!value || !*value || strlen (value) >= 200) { + g_set_error (error, 1, 0, _("'%s' string value should consist of 1 - 199 characters"), option); + return NULL; + } + return value; +} DEFINE_SETTER_OPTIONS (nmc_property_wired_set_s390_options, NM_SETTING_WIRED, NMSettingWired, nm_setting_wired_add_s390_option, nm_setting_wired_get_valid_s390_options, - NULL) + _validate_s390_option_value) DEFINE_REMOVER_OPTION (nmc_property_wired_remove_option_s390_options, NM_SETTING_WIRED, nm_setting_wired_remove_s390_option) diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 82df1b2d..c1c7c908 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -323,9 +323,11 @@ nm_polkit_listener_new (gboolean for_session, GError **error) listener = g_object_new (NM_TYPE_POLKIT_LISTENER, NULL); priv = NM_POLKIT_LISTENER_GET_PRIVATE (listener); - if (for_session) - session = polkit_unix_session_new_for_process_sync (getpid (), NULL, NULL); - else + if (for_session) { + session = polkit_unix_session_new_for_process_sync (getpid (), NULL, error); + if (!session) + return NULL; + } else session = polkit_unix_process_new_for_owner (getpid (), 0, getuid ()); priv->reg_handle = polkit_agent_listener_register (listener, POLKIT_AGENT_REGISTER_FLAGS_NONE, diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 8eddb440..6cb6c58d 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright 2011-2013 Red Hat, Inc. + * Copyright 2011-2015 Red Hat, Inc. * Copyright 2011 Giovanni Campagna */ @@ -32,8 +32,14 @@ #include "config.h" #include +#include +#include #include +#include +#include + +#include "nm-vpn-helpers.h" #include "nm-secret-agent-simple.h" G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD) @@ -157,6 +163,8 @@ nm_secret_agent_simple_secret_free (NMSecretAgentSimpleSecret *secret) g_free (secret->name); g_free (secret->prop_name); g_free (secret->value); + g_free (secret->vpn_property); + g_free (secret->vpn_type); g_free (real->property); g_clear_object (&real->setting); @@ -167,20 +175,29 @@ static NMSecretAgentSimpleSecret * nm_secret_agent_simple_secret_new (const char *name, NMSetting *setting, const char *property, + const char *vpn_property, + const char *vpn_type, gboolean password) { NMSecretAgentSimpleSecretReal *real; real = g_slice_new0 (NMSecretAgentSimpleSecretReal); real->base.name = g_strdup (name); - real->base.prop_name = g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property); + real->base.prop_name = vpn_property ? + g_strdup_printf ("%s.%s.%s", nm_setting_get_name (setting), property, vpn_property) : + g_strdup_printf ("%s.%s", nm_setting_get_name (setting), property); + real->base.vpn_property = g_strdup (vpn_property); + real->base.vpn_type = g_strdup (vpn_type); real->base.password = password; if (setting) { real->setting = g_object_ref (setting); real->property = g_strdup (property); - g_object_get (setting, property, &real->base.value, NULL); + if (vpn_property) + real->base.value = g_strdup (nm_setting_vpn_get_secret (NM_SETTING_VPN (setting), vpn_property)); + else + g_object_get (setting, property, &real->base.value, NULL); } return &real->base; @@ -209,11 +226,15 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Username"), NM_SETTING (s_8021x), NM_SETTING_802_1X_IDENTITY, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_8021x), NM_SETTING_802_1X_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); return TRUE; @@ -223,11 +244,15 @@ add_8021x_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Identity"), NM_SETTING (s_8021x), NM_SETTING_802_1X_IDENTITY, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); secret = nm_secret_agent_simple_secret_new (_("Private key password"), NM_SETTING (s_8021x), NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); return TRUE; @@ -251,6 +276,8 @@ add_wireless_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_wsec), NM_SETTING_WIRELESS_SECURITY_PSK, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); return TRUE; @@ -265,6 +292,8 @@ add_wireless_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Key"), NM_SETTING (s_wsec), key, + NULL, + NULL, TRUE); g_free (key); @@ -277,6 +306,8 @@ add_wireless_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_wsec), NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); return TRUE; @@ -300,21 +331,116 @@ add_pppoe_secrets (NMSecretAgentSimpleRequest *request, secret = nm_secret_agent_simple_secret_new (_("Username"), NM_SETTING (s_pppoe), NM_SETTING_PPPOE_USERNAME, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); secret = nm_secret_agent_simple_secret_new (_("Service"), NM_SETTING (s_pppoe), NM_SETTING_PPPOE_SERVICE, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_pppoe), NM_SETTING_PPPOE_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); return TRUE; } +static NMSettingSecretFlags +get_vpn_secret_flags (NMSettingVpn *s_vpn, const char *secret_name) +{ + NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NONE; + GHashTable *vpn_data; + char *flag_name; + const char *val; + unsigned long tmp; + + g_object_get (s_vpn, NM_SETTING_VPN_DATA, &vpn_data, NULL); + + flag_name = g_strdup_printf ("%s-flags", secret_name); + + /* Try new flags value first */ + val = g_hash_table_lookup (vpn_data, flag_name); + if (val) { + errno = 0; + tmp = strtoul (val, NULL, 10); + if (errno == 0 && tmp <= NM_SETTING_SECRET_FLAGS_ALL) + flags = (NMSettingSecretFlags) tmp; + } + g_free (flag_name); + g_hash_table_unref (vpn_data); + + return flags; +} + +static void +add_vpn_secret_helper (GPtrArray *secrets, NMSettingVpn *s_vpn, const char *name, const char *ui_name) +{ + NMSecretAgentSimpleSecret *secret; + NMSettingSecretFlags flags; + int i; + + /* Check for duplicates */ + for (i = 0; i < secrets->len; i++) { + secret = secrets->pdata[i]; + + if (g_strcmp0 (secret->vpn_property, name) == 0) + return; + } + + flags = get_vpn_secret_flags (s_vpn, name); + if ( flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED + || flags & NM_SETTING_SECRET_FLAG_NOT_SAVED) { + secret = nm_secret_agent_simple_secret_new (ui_name, + NM_SETTING (s_vpn), + NM_SETTING_VPN_SECRETS, + name, + nm_setting_vpn_get_service_type (s_vpn), + TRUE); + g_ptr_array_add (secrets, secret); + } +} + +#define VPN_MSG_TAG "x-vpn-message:" + +static gboolean +add_vpn_secrets (NMSecretAgentSimpleRequest *request, + GPtrArray *secrets, + char **msg) +{ + NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (request->connection); + const VpnPasswordName *secret_names, *p; + char *tmp = NULL; + char **iter; + + /* If hints are given, then always ask for what the hints require */ + if (request->hints && g_strv_length (request->hints)) { + for (iter = request->hints; iter && *iter; iter++) { + if (!tmp && g_str_has_prefix (*iter, VPN_MSG_TAG)) + tmp = g_strdup (*iter + strlen (VPN_MSG_TAG)); + else + add_vpn_secret_helper (secrets, s_vpn, *iter, *iter); + } + } + if (msg) + *msg = g_strdup (tmp); + + /* Now add what client thinks might be required, because hints may be empty or incomplete */ + p = secret_names = nm_vpn_get_secret_names (nm_setting_vpn_get_service_type (s_vpn)); + while (p && p->name) { + add_vpn_secret_helper (secrets, s_vpn, p->name, _(p->ui_name)); + p++; + } + + return TRUE; +} + static void request_secrets_from_ui (NMSecretAgentSimpleRequest *request) { @@ -351,6 +477,8 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("Network name"), NM_SETTING (s_con), NM_SETTING_CONNECTION_ID, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); ok = add_8021x_secrets (request, secrets); @@ -369,6 +497,8 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("PIN"), NM_SETTING (s_gsm), NM_SETTING_GSM_PIN, + NULL, + NULL, FALSE); g_ptr_array_add (secrets, secret); } else { @@ -379,6 +509,8 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_gsm), NM_SETTING_GSM_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); } @@ -392,6 +524,8 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("Password"), NM_SETTING (s_cdma), NM_SETTING_CDMA_PASSWORD, + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); } else if (nm_connection_is_type (request->connection, NM_SETTING_BLUETOOTH_SETTING_NAME)) { @@ -408,8 +542,22 @@ request_secrets_from_ui (NMSecretAgentSimpleRequest *request) secret = nm_secret_agent_simple_secret_new (_("Password"), setting, "password", + NULL, + NULL, TRUE); g_ptr_array_add (secrets, secret); + } else if (nm_connection_is_type (request->connection, NM_SETTING_VPN_SETTING_NAME)) { + NMSettingConnection *s_con; + + s_con = nm_connection_get_setting_connection (request->connection); + + title = _("VPN password required"); + msg = NULL; + + ok = add_vpn_secrets (request, secrets, &msg); + if (!msg) + msg = g_strdup_printf (_("A password is required to connect to '%s'."), + nm_connection_get_id (request->connection)); } else ok = FALSE; @@ -455,13 +603,6 @@ nm_secret_agent_simple_get_secrets (NMSecretAgentOld *agent, s_con = nm_connection_get_setting_connection (connection); connection_type = nm_setting_connection_get_connection_type (s_con); - if (!strcmp (connection_type, NM_SETTING_VPN_SETTING_NAME)) { - /* We don't support VPN secrets yet */ - error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_NO_SECRETS, - "VPN secrets not supported"); - goto nope; - } - if (!(flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION)) { /* We don't do stored passwords */ error = g_error_new (NM_SECRET_AGENT_ERROR, NM_SECRET_AGENT_ERROR_NO_SECRETS, @@ -515,9 +656,13 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self, if (secrets) { GVariantBuilder conn_builder, *setting_builder; + GVariantBuilder vpn_secrets_builder; GHashTable *settings; GHashTableIter iter; const char *name; + const char *vpn_secrets_base_name = NULL; + + g_variant_builder_init (&vpn_secrets_builder, G_VARIANT_TYPE ("a{ss}")); settings = g_hash_table_new (g_str_hash, g_str_equal); for (i = 0; i < secrets->len; i++) { @@ -530,9 +675,23 @@ nm_secret_agent_simple_response (NMSecretAgentSimple *self, setting_builder); } + if (secret->base.vpn_property) { + /* VPN secrets need slightly different treatment. + * "secrets" property is actually a hash table of secrets. */ + vpn_secrets_base_name = secret->property; + g_variant_builder_add (&vpn_secrets_builder, "{ss}", + secret->base.vpn_property, secret->base.value); + } else { + g_variant_builder_add (setting_builder, "{sv}", + secret->property, + g_variant_new_string (secret->base.value)); + } + } + + if (vpn_secrets_base_name) { g_variant_builder_add (setting_builder, "{sv}", - secret->property, - g_variant_new_string (secret->base.value)); + vpn_secrets_base_name, + g_variant_builder_end (&vpn_secrets_builder)); } g_variant_builder_init (&conn_builder, NM_VARIANT_TYPE_CONNECTION); @@ -691,5 +850,6 @@ nm_secret_agent_simple_new (const char *name) { return g_initable_new (NM_TYPE_SECRET_AGENT_SIMPLE, NULL, NULL, NM_SECRET_AGENT_OLD_IDENTIFIER, name, + NM_SECRET_AGENT_OLD_CAPABILITIES, NM_SECRET_AGENT_CAPABILITY_VPN_HINTS, NULL); } diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h index 81fec651..d2c58822 100644 --- a/clients/common/nm-secret-agent-simple.h +++ b/clients/common/nm-secret-agent-simple.h @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Copyright 2013 - 2014 Red Hat, Inc. + * Copyright 2013 - 2015 Red Hat, Inc. */ #ifndef __NM_SECRET_AGENT_SIMPLE_H__ @@ -43,6 +43,8 @@ typedef struct { typedef struct { char *name, *prop_name, *value; + char *vpn_property; + char *vpn_type; gboolean password; } NMSecretAgentSimpleSecret; diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c new file mode 100644 index 00000000..370e128c --- /dev/null +++ b/clients/common/nm-vpn-helpers.c @@ -0,0 +1,348 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright 2013 - 2015 Red Hat, Inc. + */ + +/** + * SECTION:nm-vpn-helpers + * @short_description: VPN-related utilities + * + * Some functions should probably eventually move into libnm. + */ + +#include "config.h" + +#include +#include +#include +#include + +#include + +#include "nm-utils.h" +#include "nm-vpn-helpers.h" +#include "nm-glib-compat.h" + +#define VPN_NAME_FILES_DIR NMCONFDIR "/VPN" +#define DEFAULT_DIR_LIB NMLIBDIR"/VPN" + +static gboolean plugins_loaded = FALSE; +static GHashTable *plugins_hash = NULL; +static GSList *plugins_list = NULL; + + +GQuark nm_vpn_error_quark (void); +G_DEFINE_QUARK (NM_VPN_ERROR, nm_vpn_error) +#define NM_VPN_ERROR nm_vpn_error_quark () +#define NM_VPN_ERROR_GENERIC 0 + +NMVpnEditorPlugin * +nm_vpn_get_plugin_by_service (const char *service) +{ + NMVpnEditorPlugin *plugin; + const char *str; + char *tmp = NULL; + + g_return_val_if_fail (service != NULL, NULL); + + if (G_UNLIKELY (!plugins_loaded)) + nm_vpn_get_plugins (NULL); + + if (!plugins_hash) + return NULL; + + if (g_str_has_prefix (service, NM_DBUS_SERVICE)) + str = service; + else + str = tmp = g_strdup_printf ("%s.%s", NM_DBUS_SERVICE, service); + + plugin = g_hash_table_lookup (plugins_hash, str); + g_free (tmp); + + return plugin; +} + +GSList * +nm_vpn_get_plugins (GError **error) +{ + GDir *dir; + const char *f; + GHashTableIter iter; + NMVpnEditorPlugin *plugin; + + if (error) + g_return_val_if_fail (*error == NULL, NULL); + + if (G_LIKELY (plugins_loaded)) + return plugins_list; + + plugins_loaded = TRUE; + + dir = g_dir_open (VPN_NAME_FILES_DIR, 0, NULL); + if (!dir) { + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "Couldn't read VPN .name files directory " VPN_NAME_FILES_DIR "."); + return NULL; + } + + plugins_hash = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); + + while ((f = g_dir_read_name (dir))) { + char *path = NULL, *service = NULL; + char *so_path = NULL, *so_name = NULL; + GKeyFile *keyfile = NULL; + GModule *module = NULL; + NMVpnEditorPluginFactory factory = NULL; + + if (!g_str_has_suffix (f, ".name")) + continue; + + path = g_strdup_printf ("%s/%s", VPN_NAME_FILES_DIR, f); + + keyfile = g_key_file_new (); + if (!g_key_file_load_from_file (keyfile, path, 0, NULL)) + goto next; + + service = g_key_file_get_string (keyfile, "VPN Connection", "service", NULL); + if (!service) + goto next; + + so_path = g_key_file_get_string (keyfile, "libnm", "plugin", NULL); + if (!so_path) + goto next; + + if (g_path_is_absolute (so_path)) + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + + if (!module) { + /* Remove any path and extension components, then reconstruct path + * to the SO in LIBDIR + */ + so_name = g_path_get_basename (so_path); + g_free (so_path); + so_path = g_strdup_printf ("%s/NetworkManager/%s", NMLIBDIR, so_name); + g_free (so_name); + + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + if (!module) { + g_clear_error (error); + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "Cannot load the VPN plugin which provides the " + "service '%s'.", service); + goto next; + } + } + + if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) { + GError *factory_error = NULL; + gboolean success = FALSE; + + plugin = factory (&factory_error); + if (plugin) { + char *plug_name = NULL, *plug_service = NULL; + + /* Validate plugin properties */ + g_object_get (G_OBJECT (plugin), + NM_VPN_EDITOR_PLUGIN_NAME, &plug_name, + NM_VPN_EDITOR_PLUGIN_SERVICE, &plug_service, + NULL); + if (!plug_name || !strlen (plug_name)) { + g_clear_error (error); + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "cannot load VPN plugin in '%s': missing plugin name", + g_module_name (module)); + } else if (!plug_service || strcmp (plug_service, service)) { + g_clear_error (error); + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "cannot load VPN plugin in '%s': invalid service name", + g_module_name (module)); + } else { + /* Success! */ + g_object_set_data_full (G_OBJECT (plugin), "gmodule", module, + (GDestroyNotify) g_module_close); + g_hash_table_insert (plugins_hash, g_strdup (service), plugin); + success = TRUE; + } + g_free (plug_name); + g_free (plug_service); + } else { + g_clear_error (error); + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "cannot load VPN plugin in '%s': %s", + g_module_name (module), g_module_error ()); + } + + if (!success) + g_module_close (module); + } else { + g_clear_error (error); + g_set_error (error, NM_VPN_ERROR, NM_VPN_ERROR_GENERIC, "cannot locate nm_vpn_editor_plugin_factory() in '%s': %s", + g_module_name (module), g_module_error ()); + g_module_close (module); + } + + next: + g_free (so_path); + g_free (service); + g_key_file_free (keyfile); + g_free (path); + } + g_dir_close (dir); + + /* Copy hash to list */ + g_hash_table_iter_init (&iter, plugins_hash); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &plugin)) + plugins_list = g_slist_prepend (plugins_list, plugin); + + return plugins_list; +} + +gboolean +nm_vpn_supports_ipv6 (NMConnection *connection) +{ + NMSettingVpn *s_vpn; + const char *service_type; + NMVpnEditorPlugin *plugin; + guint32 capabilities; + + s_vpn = nm_connection_get_setting_vpn (connection); + g_return_val_if_fail (s_vpn != NULL, FALSE); + + service_type = nm_setting_vpn_get_service_type (s_vpn); + g_return_val_if_fail (service_type != NULL, FALSE); + + plugin = nm_vpn_get_plugin_by_service (service_type); + g_return_val_if_fail (plugin != NULL, FALSE); + + capabilities = nm_vpn_editor_plugin_get_capabilities (plugin); + return (capabilities & NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6) != 0; +} + +const VpnPasswordName * +nm_vpn_get_secret_names (const char *vpn_type) +{ + const char *type; + static VpnPasswordName generic_vpn_secrets[] = { {"password", N_("Password")}, {NULL, NULL} }; + static VpnPasswordName vpnc_secrets[] = { {"Xauth password", N_("Password")}, + {"IPSec secret", N_("Group password")}, + {NULL, NULL} }; + static VpnPasswordName swan_secrets[] = { {"xauthpassword", N_("Password")}, + {"pskvalue", N_("Group password")}, + {NULL, NULL} }; + static VpnPasswordName openconnect_secrets[] = { {"gateway", N_("Gateway")}, + {"cookie", N_("Cookie")}, + {"gwcert", N_("Gateway certificate hash")}, + {NULL, NULL} }; + + if (!vpn_type) + return NULL; + + if (g_str_has_prefix (vpn_type, NM_DBUS_INTERFACE)) + type = vpn_type + strlen (NM_DBUS_INTERFACE) + 1; + else + type = vpn_type; + + if ( !g_strcmp0 (type, "openvpn") + || !g_strcmp0 (type, "pptp") + || !g_strcmp0 (type, "iodine") + || !g_strcmp0 (type, "ssh") + || !g_strcmp0 (type, "l2tp") + || !g_strcmp0 (type, "fortisslvpn")) + return generic_vpn_secrets; + else if (!g_strcmp0 (type, "vpnc")) + return vpnc_secrets; + else if ( !g_strcmp0 (type, "openswan") + || !g_strcmp0 (type, "libreswan") + || !g_strcmp0 (type, "strongswan")) + return swan_secrets; + else if (!g_strcmp0 (type, "openconnect")) + return openconnect_secrets; + return NULL; +} + +static gboolean +_extract_variable_value (char *line, const char *tag, char **value) +{ + char *p1, *p2; + + if (g_str_has_prefix (line, tag)) { + p1 = line + strlen (tag); + p2 = line + strlen (line) - 1; + if ((*p1 == '\'' || *p1 == '"') && (*p1 == *p2)) { + p1++; + *p2 = '\0'; + } + if (value) + *value = g_strdup (p1); + return TRUE; + } + return FALSE; +} + +gboolean +nm_vpn_openconnect_authenticate_helper (const char *host, + char **cookie, + char **gateway, + char **gwcert, + int *status, + GError **error) +{ + char *output = NULL; + gboolean ret; + char **strv = NULL, **iter; + char *argv[4]; + const char *path; + const char *const DEFAULT_PATHS[] = { + "/sbin/", + "/usr/sbin/", + "/usr/local/sbin/", + "/bin/", + "/usr/bin/", + "/usr/local/bin/", + NULL, + }; + + path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, + G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); + if (!path) + return FALSE; + + argv[0] = (char *) path; + argv[1] = "--authenticate"; + argv[2] = (char *) host; + argv[3] = NULL; + + ret = g_spawn_sync (NULL, argv, NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN, + NULL, NULL, &output, NULL, + status, error); + + if (!ret) + return FALSE; + + /* Parse output and set cookie, gateway and gwcert + * output example: + * COOKIE='loremipsum' + * HOST='1.2.3.4' + * FINGERPRINT='sha1:32bac90cf09a722e10ecc1942c67fe2ac8c21e2e' + */ + strv = g_strsplit_set (output ? output : "", "\r\n", 0); + for (iter = strv; iter && *iter; iter++) { + _extract_variable_value (*iter, "COOKIE=", cookie); + _extract_variable_value (*iter, "HOST=", gateway); + _extract_variable_value (*iter, "FINGERPRINT=", gwcert); + } + g_strfreev (strv); + + return TRUE; +} + diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h new file mode 100644 index 00000000..6b3396ef --- /dev/null +++ b/clients/common/nm-vpn-helpers.h @@ -0,0 +1,47 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Copyright 2013 - 2015 Red Hat, Inc. + */ + +#ifndef __NM_VPN_HELPERS_H__ +#define __NM_VPN_HELPERS_H__ + +#include +#include + +#include + +struct { + const char *name; + const char *ui_name; +} typedef VpnPasswordName; + +GSList *nm_vpn_get_plugins (GError **error); + +NMVpnEditorPlugin *nm_vpn_get_plugin_by_service (const char *service); + +gboolean nm_vpn_supports_ipv6 (NMConnection *connection); + +const VpnPasswordName * nm_vpn_get_secret_names (const char *vpn_type); + +gboolean nm_vpn_openconnect_authenticate_helper (const char *host, + char **cookie, + char **gateway, + char **gwcert, + int *status, + GError **error); + +#endif /* __NM_VPN_HELPERS_H__ */ diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am index f6d93be2..a84fcdff 100644 --- a/clients/tui/Makefile.am +++ b/clients/tui/Makefile.am @@ -18,6 +18,8 @@ AM_CPPFLAGS= \ -DG_LOG_DOMAIN=\""nmtui"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DLOCALEDIR=\""$(localedir)"\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(libdir)\" \ $(NULL) bin_PROGRAMS = nmtui @@ -116,6 +118,8 @@ nmtui_SOURCES = \ nmt-widget-list.h \ $(srcdir)/../common/nm-secret-agent-simple.c \ $(srcdir)/../common/nm-secret-agent-simple.h \ + $(srcdir)/../common/nm-vpn-helpers.c \ + $(srcdir)/../common/nm-vpn-helpers.h \ $(NULL) nmtui_LDADD = \ diff --git a/clients/tui/Makefile.in b/clients/tui/Makefile.in index 26f00406..866ae462 100644 --- a/clients/tui/Makefile.in +++ b/clients/tui/Makefile.in @@ -140,7 +140,9 @@ am__nmtui_SOURCES_DIST = nmtui.c nmtui.h nmtui-connect.c \ nmt-route-table.h nmt-slave-list.c nmt-slave-list.h \ nmt-utils.c nmt-utils.h nmt-widget-list.c nmt-widget-list.h \ $(srcdir)/../common/nm-secret-agent-simple.c \ - $(srcdir)/../common/nm-secret-agent-simple.h + $(srcdir)/../common/nm-secret-agent-simple.h \ + $(srcdir)/../common/nm-vpn-helpers.c \ + $(srcdir)/../common/nm-vpn-helpers.h @BUILD_NMTUI_TRUE@am_nmtui_OBJECTS = nmtui.$(OBJEXT) \ @BUILD_NMTUI_TRUE@ nmtui-connect.$(OBJEXT) nmtui-edit.$(OBJEXT) \ @BUILD_NMTUI_TRUE@ nmtui-hostname.$(OBJEXT) \ @@ -177,7 +179,8 @@ am__nmtui_SOURCES_DIST = nmtui.c nmtui.h nmtui-connect.c \ @BUILD_NMTUI_TRUE@ nmt-route-table.$(OBJEXT) \ @BUILD_NMTUI_TRUE@ nmt-slave-list.$(OBJEXT) nmt-utils.$(OBJEXT) \ @BUILD_NMTUI_TRUE@ nmt-widget-list.$(OBJEXT) \ -@BUILD_NMTUI_TRUE@ nm-secret-agent-simple.$(OBJEXT) +@BUILD_NMTUI_TRUE@ nm-secret-agent-simple.$(OBJEXT) \ +@BUILD_NMTUI_TRUE@ nm-vpn-helpers.$(OBJEXT) nmtui_OBJECTS = $(am_nmtui_OBJECTS) am__DEPENDENCIES_1 = @BUILD_NMTUI_TRUE@nmtui_DEPENDENCIES = $(top_builddir)/libnm/libnm.la \ @@ -573,6 +576,8 @@ with_valgrind = @with_valgrind@ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ @BUILD_NMTUI_TRUE@ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ @BUILD_NMTUI_TRUE@ -DLOCALEDIR=\""$(localedir)"\" \ +@BUILD_NMTUI_TRUE@ -DNMCONFDIR=\"$(nmconfdir)\" \ +@BUILD_NMTUI_TRUE@ -DNMLIBDIR=\"$(libdir)\" \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@links = nmtui-edit nmtui-connect nmtui-hostname @@ -659,6 +664,8 @@ with_valgrind = @with_valgrind@ @BUILD_NMTUI_TRUE@ nmt-widget-list.h \ @BUILD_NMTUI_TRUE@ $(srcdir)/../common/nm-secret-agent-simple.c \ @BUILD_NMTUI_TRUE@ $(srcdir)/../common/nm-secret-agent-simple.h \ +@BUILD_NMTUI_TRUE@ $(srcdir)/../common/nm-vpn-helpers.c \ +@BUILD_NMTUI_TRUE@ $(srcdir)/../common/nm-vpn-helpers.h \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@nmtui_LDADD = \ @@ -765,6 +772,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-editor-bindings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-editor-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-secret-agent-simple.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nm-vpn-helpers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmt-address-list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmt-connect-connection-list.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmt-device-entry.Po@am__quote@ @@ -838,6 +846,20 @@ nm-secret-agent-simple.obj: $(srcdir)/../common/nm-secret-agent-simple.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-secret-agent-simple.obj `if test -f '$(srcdir)/../common/nm-secret-agent-simple.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-secret-agent-simple.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-secret-agent-simple.c'; fi` +nm-vpn-helpers.o: $(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-vpn-helpers.o -MD -MP -MF $(DEPDIR)/nm-vpn-helpers.Tpo -c -o nm-vpn-helpers.o `test -f '$(srcdir)/../common/nm-vpn-helpers.c' || echo '$(srcdir)/'`$(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm-vpn-helpers.Tpo $(DEPDIR)/nm-vpn-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../common/nm-vpn-helpers.c' object='nm-vpn-helpers.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-vpn-helpers.o `test -f '$(srcdir)/../common/nm-vpn-helpers.c' || echo '$(srcdir)/'`$(srcdir)/../common/nm-vpn-helpers.c + +nm-vpn-helpers.obj: $(srcdir)/../common/nm-vpn-helpers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nm-vpn-helpers.obj -MD -MP -MF $(DEPDIR)/nm-vpn-helpers.Tpo -c -o nm-vpn-helpers.obj `if test -f '$(srcdir)/../common/nm-vpn-helpers.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-vpn-helpers.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/nm-vpn-helpers.Tpo $(DEPDIR)/nm-vpn-helpers.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(srcdir)/../common/nm-vpn-helpers.c' object='nm-vpn-helpers.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nm-vpn-helpers.obj `if test -f '$(srcdir)/../common/nm-vpn-helpers.c'; then $(CYGPATH_W) '$(srcdir)/../common/nm-vpn-helpers.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../common/nm-vpn-helpers.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index f936c959..fa2a2752 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -32,20 +32,20 @@ #include "nm-editor-utils.h" #if 0 -#include "vpn-helpers.h" +#include "nm-vpn-helpers.h" static GSList *vpn_plugins; static gint sort_vpn_plugins (gconstpointer a, gconstpointer b) { - NMVpnPluginUiInterface *aa = NM_VPN_PLUGIN_UI_INTERFACE (a); - NMVpnPluginUiInterface *bb = NM_VPN_PLUGIN_UI_INTERFACE (b); + NMVpnEditorPlugin *aa = NM_VPN_EDITOR_PLUGIN (a); + NMVpnEditorPlugin *bb = NM_VPN_EDITOR_PLUGIN (b); char *aa_desc = NULL, *bb_desc = NULL; int ret; - g_object_get (aa, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &aa_desc, NULL); - g_object_get (bb, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &bb_desc, NULL); + g_object_get (aa, NM_VPN_EDITOR_PLUGIN_NAME, &aa_desc, NULL); + g_object_get (bb, NM_VPN_EDITOR_PLUGIN_NAME, &bb_desc, NULL); ret = g_strcmp0 (aa_desc, bb_desc); @@ -224,7 +224,7 @@ nm_editor_utils_get_connection_type_list (void) #if 0 /* Add "VPN" only if there are plugins */ - vpn_plugins_hash = vpn_get_plugins (NULL); + vpn_plugins_hash = nm_vpn_get_plugins (NULL); have_vpn_plugins = vpn_plugins_hash && g_hash_table_size (vpn_plugins_hash); if (have_vpn_plugins) { GHashTableIter iter; diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index aeece121..bf29dcf5 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -154,6 +154,8 @@ nmt_password_dialog_constructed (GObject *object) if (secret->password) flags |= NMT_NEWT_ENTRY_PASSWORD; widget = nmt_newt_entry_new (30, flags); + if (secret->value) + nmt_newt_entry_set_text (NMT_NEWT_ENTRY (widget), secret->value); nmt_newt_grid_add (secret_grid, widget, 1, i); g_ptr_array_add (priv->entries, widget); diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index cacb0b44..9838b6fd 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -39,8 +39,60 @@ #include "nmt-connect-connection-list.h" #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" +#include "nm-vpn-helpers.h" #include "nmt-utils.h" +/** + * Runs openconnect to authenticate. The current screen state is saved + * before starting the command and restored after it returns. + */ +static gboolean +openconnect_authenticate (NMConnection *connection, char **cookie, char **gateway, char **gwcert) +{ + GError *error = NULL; + NMSettingVpn *s_vpn; + gboolean ret; + int status = 0; + const char *gw, *port; + + nmt_newt_message_dialog (_("openconnect will be run to authenticate.\nIt will return to nmtui when completed.")); + + /* Get port */ + s_vpn = nm_connection_get_setting_vpn (connection); + gw = nm_setting_vpn_get_data_item (s_vpn, "gateway"); + port = gw ? strrchr (gw, ':') : NULL; + + newtSuspend (); + + ret = nm_vpn_openconnect_authenticate_helper (gw, cookie, gateway, gwcert, &status, &error); + + newtResume (); + + if (!ret) { + nmt_newt_message_dialog (_("Error: openconnect failed: %s"), error->message); + g_clear_error (&error); + return FALSE; + } + + if (WIFEXITED (status)) { + if (WEXITSTATUS (status) != 0) { + nmt_newt_message_dialog (_("openconnect failed with status %d"), WEXITSTATUS (status)); + return FALSE; + } + } else if (WIFSIGNALED (status)) { + nmt_newt_message_dialog (_("openconnect failed with signal %d"), WTERMSIG (status)); + return FALSE; + } + + if (gateway && *gateway && port) { + char *tmp = *gateway; + *gateway = g_strdup_printf ("%s%s", *gateway, port); + g_free (tmp); + } + + return TRUE; +} + static void secrets_requested (NMSecretAgentSimple *agent, const char *request_id, @@ -50,6 +102,44 @@ secrets_requested (NMSecretAgentSimple *agent, gpointer user_data) { NmtNewtForm *form; + NMConnection *connection = NM_CONNECTION (user_data); + char *cookie = NULL; + char *gateway = NULL; + char *gwcert = NULL; + int i; + + /* Get secrets for OpenConnect VPN */ + if (connection && nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME)) { + NMSettingVpn *s_vpn = nm_connection_get_setting_vpn (connection); + const char *vpn_type = nm_setting_vpn_get_service_type (s_vpn); + + if (!g_strcmp0 (vpn_type, NM_DBUS_INTERFACE ".openconnect")) { + openconnect_authenticate (connection, &cookie, &gateway, &gwcert); + + for (i = 0; i < secrets->len; i++) { + NMSecretAgentSimpleSecret *secret = secrets->pdata[i]; + + if (!g_strcmp0 (secret->vpn_type, NM_DBUS_INTERFACE ".openconnect")) { + if (!g_strcmp0 (secret->vpn_property, "cookie")) { + g_free (secret->value); + secret->value = cookie; + cookie = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gateway")) { + g_free (secret->value); + secret->value = gateway; + gateway = NULL; + } else if (!g_strcmp0 (secret->vpn_property, "gwcert")) { + g_free (secret->value); + secret->value = gwcert; + gwcert = NULL; + } + } + } + g_free (cookie); + g_free (gateway); + g_free (gwcert); + } + } form = nmt_password_dialog_new (request_id, title, msg, secrets); nmt_newt_form_run_sync (form); @@ -153,7 +243,7 @@ activate_connection (NMConnection *connection, nm_secret_agent_simple_enable (NM_SECRET_AGENT_SIMPLE (agent), nm_object_get_path (NM_OBJECT (connection))); } - g_signal_connect (agent, "request-secrets", G_CALLBACK (secrets_requested), NULL); + g_signal_connect (agent, "request-secrets", G_CALLBACK (secrets_requested), connection); } specific_object_path = specific_object ? nm_object_get_path (specific_object) : NULL; diff --git a/configure b/configure index 1d885322..775544bb 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.8. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.0.10. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.0.8' -PACKAGE_STRING='NetworkManager 1.0.8' +PACKAGE_VERSION='1.0.10' +PACKAGE_STRING='NetworkManager 1.0.10' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1683,7 +1683,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.0.8 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.0.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1753,7 +1753,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.0.8:";; + short | recursive ) echo "Configuration of NetworkManager 1.0.10:";; esac cat <<\_ACEOF @@ -2040,7 +2040,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.0.8 +NetworkManager configure 1.0.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2584,7 +2584,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.0.8, which was +It was created by NetworkManager $as_me 1.0.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3454,7 +3454,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.0.8' + VERSION='1.0.10' cat >>confdefs.h <<_ACEOF @@ -17334,9 +17334,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=0 -NM_MICRO_VERSION=8 -NM_VERSION=1.0.8 -NM_GIT_SHA=faea1ff074740431d9af5804f090e1d904d61156 +NM_MICRO_VERSION=10 +NM_VERSION=1.0.10 +NM_GIT_SHA=c163759fe463d1f4e1f4f8599c7ff3e4b537fe0d @@ -24757,12 +24757,12 @@ if test -n "$LIBSOUP_CFLAGS"; then pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.26" 2>/dev/null` + pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.40" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -24774,12 +24774,12 @@ if test -n "$LIBSOUP_LIBS"; then pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.40\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.40") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.26" 2>/dev/null` + pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.40" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -24800,9 +24800,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.26" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1` else - LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.26" 2>&1` + LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.40" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBSOUP_PKG_ERRORS" >&5 @@ -24848,6 +24848,7 @@ else WITH_LIBSOUP_FALSE= fi +LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_40" # Check whether --enable-concheck was given. if test "${enable_concheck+set}" = set; then : @@ -25787,7 +25788,7 @@ else fi fi if test "$with_valgrind" != "no"; then : - VALGRIND_RULES='LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions" + VALGRIND_RULES='LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions" fi if test "${with_valgrind}" != "no"; then @@ -27019,7 +27020,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.0.8, which was +This file was extended by NetworkManager $as_me 1.0.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27085,7 +27086,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.0.8 +NetworkManager config.status 1.0.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9c461ab1..1ed69354 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [0]) -m4_define([nm_micro_version], [8]) +m4_define([nm_micro_version], [10]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) @@ -796,7 +796,7 @@ fi AC_DEFINE_UNQUOTED(KERNEL_FIRMWARE_DIR, "$KERNEL_FIRMWARE_DIR", [Define to path of the kernel firmware directory]) AC_SUBST(KERNEL_FIRMWARE_DIR) -PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26], [have_libsoup=yes],[have_libsoup=no]) +PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.40], [have_libsoup=yes],[have_libsoup=no]) AC_ARG_WITH(libsoup, AS_HELP_STRING([--with-libsoup=yes|no], [Link against libsoup]), [], [with_libsoup=${have_libsoup}]) if test "$with_libsoup" != "no"; then if test "$have_libsoup" != "yes"; then @@ -808,6 +808,7 @@ else AC_DEFINE(WITH_LIBSOUP, 0, [Define if you have libsoup]) fi AM_CONDITIONAL(WITH_LIBSOUP, test "$with_libsoup" != "no") +LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_40" AC_ARG_ENABLE(concheck, AS_HELP_STRING([--enable-concheck], [enable connectivity checking support]), [enable_concheck=${enableval}], [enable_concheck=${with_libsoup}]) @@ -891,7 +892,7 @@ else fi fi AS_IF([test "$with_valgrind" != "no"], - AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"), + AC_SUBST(VALGRIND_RULES, 'LOG_COMPILER = "$(top_srcdir)/tools/run-test-valgrind.sh" --called-from-make "$(LIBTOOL)" "$(with_valgrind)" '"$with_valgrind_suppressions"), AC_SUBST(VALGRIND_RULES, [])) AM_CONDITIONAL(WITH_VALGRIND, test "${with_valgrind}" != "no") diff --git a/docs/api/html/index.html b/docs/api/html/index.html index 3e41a4ce..d4495dc0 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,7 +14,7 @@
-

Version 1.0.8 +

Version 1.0.10

Copyright © 2012 The NetworkManager Authors

diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index 8d8f7dfa..870e837f 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -1,4 +1,4 @@ -NetworkManager D-Bus Interface Specification version 1.0.8

NetworkManager D-Bus Interface Specification

Version 1.0.8

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 1.0.10

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/spec.html b/docs/api/spec.html index 8d8f7dfa..870e837f 100644 --- a/docs/api/spec.html +++ b/docs/api/spec.html @@ -1,4 +1,4 @@ -NetworkManager D-Bus Interface Specification version 1.0.8

NetworkManager D-Bus Interface Specification

Version 1.0.8

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.
+

NetworkManager D-Bus Interface Specification

Version 1.0.10

Copyright (C) 2008 - 2011 Red Hat, Inc.
Copyright (C) 2008 - 2009 Novell, Inc.

This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff --git a/docs/api/version.xml b/docs/api/version.xml index b0f3d96f..7ee7020b 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.0.8 +1.0.10 diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index c2803d06..b81e2b44 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -15,7 +15,7 @@

- for libnm-glib 1.0.8 + for libnm-glib 1.0.10 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-glib/0.9/. diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index 420d1610..adc746bf 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -103,6 +103,7 @@ NM_CLIENT_CONNECTIVITY NM_CLIENT_PRIMARY_CONNECTION NM_CLIENT_ACTIVATING_CONNECTION NM_CLIENT_DEVICES +NM_CLIENT_ALL_DEVICES NMClientPermission NMClientPermissionResult NMClientError @@ -112,6 +113,7 @@ nm_client_new nm_client_new_async nm_client_new_finish nm_client_get_devices +nm_client_get_all_devices nm_client_get_device_by_path nm_client_get_device_by_iface NMClientActivateFn @@ -171,6 +173,7 @@ NM_DEVICE_DRIVER NM_DEVICE_DRIVER_VERSION NM_DEVICE_FIRMWARE_VERSION NM_DEVICE_CAPABILITIES +NM_DEVICE_REAL NM_DEVICE_MANAGED NM_DEVICE_AUTOCONNECT NM_DEVICE_FIRMWARE_MISSING @@ -198,6 +201,7 @@ nm_device_get_type_description nm_device_get_hw_address nm_device_get_capabilities nm_device_get_managed +nm_device_set_managed nm_device_get_autoconnect nm_device_set_autoconnect nm_device_get_firmware_missing @@ -212,6 +216,7 @@ nm_device_get_available_connections nm_device_get_physical_port_id nm_device_get_mtu nm_device_is_software +nm_device_is_real nm_device_get_product nm_device_get_vendor nm_device_get_description @@ -951,17 +956,49 @@ nm_vpn_plugin_ui_interface_delete_connection nm_vpn_plugin_ui_widget_interface_get_widget nm_vpn_plugin_ui_widget_interface_update_connection nm_vpn_plugin_ui_widget_interface_save_secrets +nm_vpn_editor_plugin_factory +NMVpnEditorPluginCapability +NM_VPN_EDITOR_PLUGIN_CAPABILITY_NONE +NM_VPN_EDITOR_PLUGIN_CAPABILITY_IMPORT +NM_VPN_EDITOR_PLUGIN_CAPABILITY_EXPORT +NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6 +NM_VPN_EDITOR_PLUGIN_NAME +NM_VPN_EDITOR_PLUGIN_DESCRIPTION +NM_VPN_EDITOR_PLUGIN_SERVICE +NMVpnEditorPluginInterface +get_editor +get_suggested_filename +nm_vpn_editor_plugin_get_editor +nm_vpn_editor_plugin_get_capabilities +nm_vpn_editor_plugin_import +nm_vpn_editor_plugin_export +nm_vpn_editor_plugin_get_suggested_filename +NMVpnEditorInterface +nm_vpn_editor_get_widget +nm_vpn_editor_update_connection +NMVpnEditor +NMVpnEditorPlugin NMVpnPluginUiInterface NMVpnPluginUiWidgetInterface +NM_IS_VPN_EDITOR +NM_IS_VPN_EDITOR_PLUGIN NM_IS_VPN_PLUGIN_UI_INTERFACE NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE +NM_TYPE_VPN_EDITOR +NM_TYPE_VPN_EDITOR_PLUGIN NM_TYPE_VPN_PLUGIN_UI_INTERFACE NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE +NM_VPN_EDITOR +NM_VPN_EDITOR_GET_INTERFACE +NM_VPN_EDITOR_PLUGIN +NM_VPN_EDITOR_PLUGIN_GET_INTERFACE NM_VPN_PLUGIN_UI_INTERFACE NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE NM_VPN_PLUGIN_UI_WIDGET_INTERFACE NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE +nm_vpn_editor_get_type +nm_vpn_editor_plugin_get_type nm_vpn_plugin_ui_interface_get_type nm_vpn_plugin_ui_widget_interface_get_type diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index b0f3d96f..7ee7020b 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.0.8 +1.0.10 diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 164e6e6e..eef425a4 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,7 +15,7 @@

- for libnm-util 1.0.8 + for libnm-util 1.0.10 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm-util/0.9/. diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index b0f3d96f..7ee7020b 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.0.8 +1.0.10 diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index 0400e114..f9a2a57e 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -412,10 +412,6 @@ NM_AVAILABLE_IN_1_0_6, macro in nm-version

-
-NM_AVAILABLE_IN_1_0_8, macro in nm-version -
-

B

NMBluetoothCapabilities, enum in nm-dbus-interface diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 78d6e12c..2c0ecc72 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

- for libnm 1.0.8 + for libnm 1.0.10 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm/1.0/. diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml index 9f0bc381..4e149c2a 100644 --- a/docs/libnm/html/index.sgml +++ b/docs/libnm/html/index.sgml @@ -2475,7 +2475,6 @@ - diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 0f983c27..f403a773 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -94,10 +94,6 @@ #define NM_AVAILABLE_IN_1_0_6 - -#define -NM_AVAILABLE_IN_1_0_8 -

@@ -166,12 +162,6 @@

NM_AVAILABLE_IN_1_0_6

#define             NM_AVAILABLE_IN_1_0_6
-
-
-

NM_AVAILABLE_IN_1_0_8

-
# define NM_AVAILABLE_IN_1_0_8          G_UNAVAILABLE(1,0.8)
-
-
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index cbecd2b3..b4f89d29 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -1710,7 +1710,6 @@ - diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index dfbfec46..43a9ac63 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -2191,7 +2191,6 @@ NM_DEPRECATED_IN_1_0_FOR NM_AVAILABLE_IN_1_0 NM_AVAILABLE_IN_1_0_4 NM_AVAILABLE_IN_1_0_6 -NM_AVAILABLE_IN_1_0_8
diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index b0f3d96f..7ee7020b 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.0.8 +1.0.10 diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h index dc39d2b9..691f9935 100644 --- a/include/nm-glib-compat.h +++ b/include/nm-glib-compat.h @@ -111,6 +111,17 @@ __g_type_ensure (GType type) #define g_test_initialized() (g_test_config_vars->test_initialized) #endif +/* Rumtime check for glib version. First do a compile time check which + * (if satisfied) shortcuts the runtime check. */ +#define nm_glib_check_version(major, minor, micro) \ + ( GLIB_CHECK_VERSION ((major), (minor), (micro)) \ + || ( ( glib_major_version > (major)) \ + || ( glib_major_version == (major) \ + && glib_minor_version > (minor)) \ + || ( glib_major_version == (major) \ + && glib_minor_version == (minor) \ + && glib_micro_version >= (micro)))) + /* g_test_skip() is only available since glib 2.38. Add a compatibility wrapper. */ inline static void __nmtst_g_test_skip (const gchar *msg) diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h index a2f2da5a..123c49bb 100644 --- a/include/nm-macros-internal.h +++ b/include/nm-macros-internal.h @@ -177,6 +177,7 @@ (cond) ? (prefix) : "", \ (cond) ? (str) : (str_else), \ (cond) ? (suffix) : "" +#define NM_PRINT_FMT_QUOTE_STRING(arg) NM_PRINT_FMT_QUOTED((arg), "\"", (arg), "\"", "(null)") /*****************************************************************************/ diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 258d3937..d23672b8 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -69,6 +69,8 @@ * If you set the level to DEBUG or TRACE, it also sets G_MESSAGES_DEBUG=all (unless * in assert-logging mode and unless G_MESSAGES_DEBUG is already defined). * + * "TRACE", this is shorthand for "log-level=TRACE". + * * "sudo-cmd=PATH": when running root tests as normal user, the test will execute * itself by invoking sudo at PATH. * For example @@ -80,6 +82,10 @@ * - respect g_test_quick(), if the command line contains '-mslow', '-mquick', '-mthorough'. * - use compile time default * + * "p=PATH"|"s=PATH": passes the path to g_test_init() as "-p" and "-s", respectively. + * Unfortunately, these options conflict with "--tap" which our makefile passes to the + * tests, thus it's only useful outside of `make check`. + * *******************************************************************************/ #include @@ -123,6 +129,28 @@ nmtst_assert_error (GError *error, } } +#define NMTST_WAIT(max_wait_ms, wait) \ + ({ \ + gboolean _not_expired = TRUE; \ + gint64 _nmtst_end, _nmtst_max_wait_us = (max_wait_ms) * 1000L; \ + \ + _nmtst_end = g_get_monotonic_time () + _nmtst_max_wait_us; \ + while (TRUE) { \ + { wait }; \ + if (g_get_monotonic_time () > _nmtst_end) { \ + _not_expired = FALSE; \ + break; \ + } \ + } \ + _not_expired; \ + }) + +#define NMTST_WAIT_ASSERT(max_wait_ms, wait) \ + G_STMT_START { \ + if (!(NMTST_WAIT (max_wait_ms, wait))) \ + g_assert_not_reached (); \ + } G_STMT_END + inline static void _nmtst_assert_success (gboolean success, GError *error, const char *file, int line) { @@ -142,6 +170,7 @@ struct __nmtst_internal gboolean assert_logging; gboolean no_expect_message; gboolean test_quick; + gboolean test_tap_log; char *sudo_cmd; char **orig_argv; }; @@ -256,6 +285,8 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ gboolean test_quick = FALSE; gboolean test_quick_set = FALSE; gboolean test_quick_argv = FALSE; + gs_unref_ptrarray GPtrArray *p_tests = NULL; + gs_unref_ptrarray GPtrArray *s_tests = NULL; if (!out_set_logging) out_set_logging = &_out_set_logging; @@ -275,17 +306,6 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ if (argc) __nmtst_internal.orig_argv = g_strdupv (*argv); - if (argc && !g_test_initialized ()) { - /* g_test_init() is a variadic function, so we cannot pass it - * (variadic) arguments. If you need to pass additional parameters, - * call nmtst_init() with argc==NULL and call g_test_init() yourself. */ - - /* g_test_init() sets g_log_set_always_fatal() for G_LOG_LEVEL_WARNING - * and G_LOG_LEVEL_CRITICAL. So, beware that the test will fail if you - * have any WARN or ERR log messages -- unless you g_test_expect_message(). */ - g_test_init (argc, argv, NULL); - } - __nmtst_internal.assert_logging = !!assert_logging; #if !GLIB_CHECK_VERSION (2, 35, 0) @@ -317,6 +337,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ } else if (!g_ascii_strncasecmp (debug, "log-level=", strlen ("log-level="))) { g_free (c_log_level); log_level = c_log_level = g_strdup (&debug[strlen ("log-level=")]); + } else if (!g_ascii_strcasecmp (debug, "TRACE")) { + g_free (c_log_level); + log_level = c_log_level = g_strdup (debug); } else if (!g_ascii_strncasecmp (debug, "log-domains=", strlen ("log-domains="))) { g_free (c_log_domains); log_domains = c_log_domains = g_strdup (&debug[strlen ("log-domains=")]); @@ -325,6 +348,14 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ sudo_cmd = g_strdup (&debug[strlen ("sudo-cmd=")]); } else if (!g_ascii_strcasecmp (debug, "no-expect-message")) { no_expect_message = TRUE; + } else if (!g_ascii_strncasecmp (debug, "p=", strlen ("p="))) { + if (!p_tests) + p_tests = g_ptr_array_new_with_free_func (g_free); + g_ptr_array_add (p_tests, g_strdup (&debug[strlen ("p=")])); + } else if (!g_ascii_strncasecmp (debug, "s=", strlen ("s="))) { + if (!s_tests) + s_tests = g_ptr_array_new_with_free_func (g_free); + g_ptr_array_add (s_tests, g_strdup (&debug[strlen ("s=")])); } else if (!g_ascii_strcasecmp (debug, "slow") || !g_ascii_strcasecmp (debug, "thorough")) { test_quick = FALSE; test_quick_set = TRUE; @@ -358,6 +389,90 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ || !strcmp (*(a+1), "slow") || !strcmp (*(a+1), "thorough")))) test_quick_argv = TRUE; + else if (strcmp (*a, "--tap") == 0) + __nmtst_internal.test_tap_log = TRUE; + } + } + + if (!argc || g_test_initialized ()) { + if (p_tests || s_tests) { + char *msg = g_strdup_printf (">>> nmtst: ignore -p and -s options for test which calls g_test_init() itself"); + + g_array_append_val (debug_messages, msg); + } + } else { + /* g_test_init() is a variadic function, so we cannot pass it + * (variadic) arguments. If you need to pass additional parameters, + * call nmtst_init() with argc==NULL and call g_test_init() yourself. */ + + /* g_test_init() sets g_log_set_always_fatal() for G_LOG_LEVEL_WARNING + * and G_LOG_LEVEL_CRITICAL. So, beware that the test will fail if you + * have any WARN or ERR log messages -- unless you g_test_expect_message(). */ + GPtrArray *arg_array = g_ptr_array_new (); + gs_free char **arg_array_c = NULL; + int arg_array_n, j; + static char **s_tests_x, **p_tests_x; + + if (*argc) { + for (i = 0; i < *argc; i++) + g_ptr_array_add (arg_array, (*argv)[i]); + } else + g_ptr_array_add (arg_array, "./test"); + + if (test_quick_set && !test_quick_argv) + g_ptr_array_add (arg_array, "-m=quick"); + + if (!__nmtst_internal.test_tap_log) { + for (i = 0; p_tests && i < p_tests->len; i++) { + g_ptr_array_add (arg_array, "-p"); + g_ptr_array_add (arg_array, p_tests->pdata[i]); + } + for (i = 0; s_tests && i < s_tests->len; i++) { + g_ptr_array_add (arg_array, "-s"); + g_ptr_array_add (arg_array, s_tests->pdata[i]); + } + } else if (p_tests || s_tests) { + char *msg = g_strdup_printf (">>> nmtst: ignore -p and -s options for tap-tests"); + + g_array_append_val (debug_messages, msg); + } + + g_ptr_array_add (arg_array, NULL); + + arg_array_n = arg_array->len - 1; + arg_array_c = (char **) g_ptr_array_free (arg_array, FALSE); + + g_test_init (&arg_array_n, &arg_array_c, NULL); + + if (*argc > 1) { + /* collaps argc/argv by removing the arguments detected + * by g_test_init(). */ + for (i = 1, j = 1; i < *argc; i++) { + if ((*argv)[i] == arg_array_c[j]) + j++; + else + (*argv)[i] = NULL; + } + for (i = 1, j = 1; i < *argc; i++) { + if ((*argv)[i]) { + (*argv)[j++] = (*argv)[i]; + if (i >= j) + (*argv)[i] = NULL; + } + } + *argc = j; + } + + /* we must "leak" the test paths because they are not cloned by g_test_init(). */ + if (!__nmtst_internal.test_tap_log) { + if (p_tests) { + p_tests_x = (char **) g_ptr_array_free (p_tests, FALSE); + p_tests = NULL; + } + if (s_tests) { + s_tests_x = (char **) g_ptr_array_free (s_tests, FALSE); + s_tests = NULL; + } } } diff --git a/include/nm-version-macros.h b/include/nm-version-macros.h index a3c5dc9b..2e15dcc1 100644 --- a/include/nm-version-macros.h +++ b/include/nm-version-macros.h @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (8) +#define NM_MICRO_VERSION (10) /** * NM_CHECK_VERSION: @@ -72,8 +72,9 @@ #define NM_VERSION_1_0_6 (NM_ENCODE_VERSION (1, 0, 6)) #define NM_VERSION_1_0_8 (NM_ENCODE_VERSION (1, 0, 8)) #define NM_VERSION_1_0_10 (NM_ENCODE_VERSION (1, 0, 10)) +#define NM_VERSION_1_0_12 (NM_ENCODE_VERSION (1, 0, 12)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_8 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_10 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_10 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_12 #endif /* __NM_VERSION_MACROS_H__ */ diff --git a/include/nm-version-macros.h.in b/include/nm-version-macros.h.in index 92df50ba..0051e005 100644 --- a/include/nm-version-macros.h.in +++ b/include/nm-version-macros.h.in @@ -72,8 +72,9 @@ #define NM_VERSION_1_0_6 (NM_ENCODE_VERSION (1, 0, 6)) #define NM_VERSION_1_0_8 (NM_ENCODE_VERSION (1, 0, 8)) #define NM_VERSION_1_0_10 (NM_ENCODE_VERSION (1, 0, 10)) +#define NM_VERSION_1_0_12 (NM_ENCODE_VERSION (1, 0, 12)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_8 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_10 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_0_10 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_0_12 #endif /* __NM_VERSION_MACROS_H__ */ diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index 5f3a8c94..730330ab 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -88,10 +88,4 @@ # define NM_AVAILABLE_IN_1_0_6 #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_8 -# define NM_AVAILABLE_IN_1_0_8 G_UNAVAILABLE(1,0.8) -#else -# define NM_AVAILABLE_IN_1_0_8 -#endif - #endif /* NM_VERSION_H */ diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 3a929b04..e952835d 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -301,28 +301,6 @@ nm_connection_get_setting_by_name (NMConnection *connection, const char *name) return type ? nm_connection_get_setting (connection, type) : NULL; } -/* not exposed until we actually need it */ -static NMSetting * -_get_type_setting (NMConnection *connection) -{ - NMSettingConnection *s_con; - const char *type; - NMSetting *base; - - g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - type = nm_setting_connection_get_connection_type (s_con); - g_assert (type); - - base = nm_connection_get_setting_by_name (connection, type); - g_assert (base); - - return base; -} - static gboolean validate_permissions_type (GHashTable *hash, GError **error) { @@ -1430,12 +1408,21 @@ nm_connection_get_interface_name (NMConnection *connection) const char * nm_connection_get_virtual_iface_name (NMConnection *connection) { + NMSettingConnection *s_con; + const char *type; NMSetting *base; g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); - base = _get_type_setting (connection); - g_assert (base); + s_con = nm_connection_get_setting_connection (connection); + g_return_val_if_fail (s_con, NULL); + + type = nm_setting_connection_get_connection_type (s_con); + g_return_val_if_fail (type, NULL); + + base = nm_connection_get_setting_by_name (connection, type); + if (!base) + return NULL; return nm_setting_get_virtual_iface_name (base); } diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h index 68955099..63895dda 100644 --- a/libnm-util/nm-version.h +++ b/libnm-util/nm-version.h @@ -88,10 +88,4 @@ # define NM_AVAILABLE_IN_1_0_6 #endif -#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0_8 -# define NM_AVAILABLE_IN_1_0_8 G_UNAVAILABLE(1,0.8) -#else -# define NM_AVAILABLE_IN_1_0_8 -#endif - #endif /* NM_VERSION_H */ diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 52b0aa3a..58fc9bd8 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,7 +2,7 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 11/23/2015 +.\" Date: 12/23/2015 .\" Manual: Network management daemons .\" Source: NetworkManager 1.0 .\" Language: English diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 376d528d..e85af1b4 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,7 +2,7 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 11/23/2015 +.\" Date: 12/23/2015 .\" Manual: Configuration .\" Source: NetworkManager 1.0 .\" Language: English diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index a843aa5f..ddc9062f 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 23 November 2015 +.\" Date: 23 December 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.7 +.\" Source: NetworkManager 1.0.9 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.0\&.9" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 3fc7403f..c5360f54 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -23 November 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.7nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION +23 December 2015nm-settings-ifcfg-rh5NetworkManagerConfiguration1.0.9nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDESCRIPTION NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 7f712d18..91f0a93a 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 23 November 2015 +.\" Date: 23 December 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.7 +.\" Source: NetworkManager 1.0.9 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.0\&.9" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index d999a2aa..6e0e36a3 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -23 November 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.7nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION +23 December 2015nm-settings-keyfile5NetworkManagerConfiguration1.0.9nm-settings-keyfileDescription of keyfile settings pluginDESCRIPTION NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index 9f96278c..858cd6ef 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 23 November 2015 +.\" Date: 23 December 2015 .\" Manual: Configuration -.\" Source: NetworkManager 1.0.7 +.\" Source: NetworkManager 1.0.9 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.7" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.0\&.9" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings.xml b/man/nm-settings.xml index b191aa1b..f809e1ea 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -23 November 2015nm-settings5NetworkManagerConfiguration1.0.7nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION +23 December 2015nm-settings5NetworkManagerConfiguration1.0.9nm-settingsDescription of settings and properties of NetworkManager connection profilesDESCRIPTION NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff --git a/po/POTFILES.in b/po/POTFILES.in index 6c09b21f..19ef9df3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,6 +12,7 @@ clients/cli/settings.c clients/cli/utils.c clients/common/nm-polkit-listener.c clients/common/nm-secret-agent-simple.c +clients/common/nm-vpn-helpers.c clients/nm-online.c clients/tui/newt/nmt-newt-utils.c clients/tui/nm-editor-utils.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 3fc7b521..d4ecf227 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,4 +1,3 @@ -clients/tui/vpn-helpers.c examples/python/NetworkManager.py examples/python/systray/eggtrayicon.c policy/org.freedesktop.NetworkManager.policy.in diff --git a/po/ar.po b/po/ar.po index f0209156..cffa6b8f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-07-31 10:41+0100\n" +"POT-Creation-Date: 2015-12-23 14:29+0100\n" "PO-Revision-Date: 2007-12-26 09:20+0100\n" "Last-Translator: Djihed Afifi \n" "Language-Team: Arabic \n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,243 +22,7987 @@ msgstr "" "X-Poedit-Language: Arabic\n" "X-Generator: KBabel 1.11.4\n" -#: ../src/nm-netlink-monitor.c:193 ../src/nm-netlink-monitor.c:471 +#: ../clients/cli/agent.c:42 #, c-format -msgid "error processing netlink message: %s" +msgid "" +"Usage: nmcli agent { COMMAND | help }\n" +"\n" +"COMMAND := { secret | polkit | all }\n" +"\n" +msgstr "" + +#: ../clients/cli/agent.c:50 +#, c-format +msgid "" +"Usage: nmcli agent secret { help }\n" +"\n" +"Runs nmcli as NetworkManager secret agent. When NetworkManager requires\n" +"a password it asks registered agents for it. This command keeps nmcli " +"running\n" +"and if a password is required asks the user for it.\n" +"\n" +msgstr "" + +#: ../clients/cli/agent.c:60 +#, c-format +msgid "" +"Usage: nmcli agent polkit { help }\n" +"\n" +"Registers nmcli as a polkit action for the user session.\n" +"When a polkit daemon requires an authorization, nmcli asks the user and " +"gives\n" +"the response back to polkit.\n" +"\n" +msgstr "" + +#: ../clients/cli/agent.c:70 +#, c-format +msgid "" +"Usage: nmcli agent all { help }\n" +"\n" +"Runs nmcli as both NetworkManager secret and a polkit agent.\n" +"\n" +msgstr "" + +#: ../clients/cli/agent.c:152 +#, c-format +msgid "nmcli successfully registered as a NetworkManager's secret agent.\n" +msgstr "" + +#: ../clients/cli/agent.c:154 +#, c-format +msgid "Error: secret agent initialization failed" +msgstr "" + +#: ../clients/cli/agent.c:169 +#, c-format +msgid "Error: polkit agent initialization failed: %s" +msgstr "" + +#: ../clients/cli/agent.c:177 +#, c-format +msgid "nmcli successfully registered as a polkit agent.\n" +msgstr "" + +#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:9246 +#: ../clients/cli/devices.c:3060 ../clients/cli/general.c:325 +#: ../clients/cli/general.c:463 +#, c-format +msgid "Error: NetworkManager is not running." +msgstr "" + +#: ../clients/cli/agent.c:245 +#, c-format +msgid "Error: 'agent' command '%s' is not valid." +msgstr "" + +#: ../clients/cli/common.c:41 ../clients/cli/common.c:54 +#: ../clients/cli/common.c:62 ../clients/cli/common.c:74 +#: ../clients/cli/connections.c:173 ../clients/cli/connections.c:195 +msgid "GROUP" +msgstr "" + +#. 0 +#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 +msgid "ADDRESS" +msgstr "" + +#. 1 +#. 2 +#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 +#: ../clients/cli/connections.c:198 +msgid "GATEWAY" +msgstr "" + +#. 2 +#: ../clients/cli/common.c:44 ../clients/cli/common.c:65 +msgid "ROUTE" +msgstr "" + +#. 3 +#: ../clients/cli/common.c:45 ../clients/cli/common.c:66 +msgid "DNS" +msgstr "" + +#. 4 +#: ../clients/cli/common.c:46 ../clients/cli/common.c:67 +msgid "DOMAIN" +msgstr "" + +#. 5 +#: ../clients/cli/common.c:47 +msgid "WINS" +msgstr "" + +#. 0 +#: ../clients/cli/common.c:55 ../clients/cli/common.c:75 +msgid "OPTION" +msgstr "" + +#: ../clients/cli/common.c:379 ../clients/cli/common.c:439 +#, c-format +msgid "invalid prefix '%s'; <1-%d> allowed" +msgstr "" + +#: ../clients/cli/common.c:387 +#, c-format +msgid "invalid IP address: %s" +msgstr "" + +#: ../clients/cli/common.c:451 +#, c-format +msgid "" +"the second component of route ('%s') is neither a next hop address nor a " +"metric" +msgstr "" + +#: ../clients/cli/common.c:460 +#, c-format +msgid "invalid metric '%s'" +msgstr "" + +#: ../clients/cli/common.c:468 +#, c-format +msgid "invalid route: %s" +msgstr "" + +#: ../clients/cli/common.c:480 +msgid "default route cannot be added (NetworkManager handles it by itself)" +msgstr "" + +#: ../clients/cli/common.c:497 +msgid "unmanaged" +msgstr "" + +#: ../clients/cli/common.c:499 +msgid "unavailable" +msgstr "" + +#: ../clients/cli/common.c:501 ../clients/cli/general.c:260 +msgid "disconnected" +msgstr "" + +#: ../clients/cli/common.c:503 +msgid "connecting (prepare)" +msgstr "" + +#: ../clients/cli/common.c:505 +msgid "connecting (configuring)" +msgstr "" + +#: ../clients/cli/common.c:507 +msgid "connecting (need authentication)" +msgstr "" + +#: ../clients/cli/common.c:509 +msgid "connecting (getting IP configuration)" +msgstr "" + +#: ../clients/cli/common.c:511 +msgid "connecting (checking IP connectivity)" +msgstr "" + +#: ../clients/cli/common.c:513 +msgid "connecting (starting secondary connections)" +msgstr "" + +#: ../clients/cli/common.c:515 ../clients/cli/general.c:256 +msgid "connected" +msgstr "" + +#: ../clients/cli/common.c:517 ../clients/cli/connections.c:544 +msgid "deactivating" +msgstr "" + +#: ../clients/cli/common.c:519 +msgid "connection failed" +msgstr "" + +#: ../clients/cli/common.c:521 ../clients/cli/common.c:538 +#: ../clients/cli/connections.c:549 ../clients/cli/connections.c:572 +#: ../clients/cli/connections.c:1712 ../clients/cli/devices.c:891 +#: ../clients/cli/devices.c:932 ../clients/cli/devices.c:934 +#: ../clients/cli/general.c:263 ../clients/cli/general.c:281 +#: ../clients/cli/general.c:411 ../clients/cli/general.c:427 +#: ../clients/cli/settings.c:732 ../clients/cli/settings.c:817 +#: ../clients/cli/settings.c:1118 ../clients/cli/settings.c:2839 +#: ../clients/cli/utils.c:1200 ../src/main.c:241 ../src/main.c:386 +#: ../src/main.c:436 +msgid "unknown" +msgstr "" + +#. "CAPABILITIES" +#: ../clients/cli/common.c:530 ../clients/cli/connections.c:819 +#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823 +#: ../clients/cli/connections.c:855 ../clients/cli/connections.c:922 +#: ../clients/cli/connections.c:923 ../clients/cli/connections.c:925 +#: ../clients/cli/connections.c:3158 ../clients/cli/connections.c:7239 +#: ../clients/cli/connections.c:7240 ../clients/cli/devices.c:598 +#: ../clients/cli/devices.c:648 ../clients/cli/devices.c:856 +#: ../clients/cli/devices.c:857 ../clients/cli/devices.c:858 +#: ../clients/cli/devices.c:859 ../clients/cli/devices.c:895 +#: ../clients/cli/devices.c:897 ../clients/cli/devices.c:925 +#: ../clients/cli/devices.c:926 ../clients/cli/devices.c:927 +#: ../clients/cli/devices.c:928 ../clients/cli/devices.c:929 +#: ../clients/cli/devices.c:930 ../clients/cli/devices.c:931 +#: ../clients/cli/devices.c:933 ../clients/cli/devices.c:935 +#: ../clients/cli/general.c:421 ../clients/cli/settings.c:2834 +msgid "yes" +msgstr "" + +#: ../clients/cli/common.c:532 ../clients/cli/connections.c:819 +#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823 +#: ../clients/cli/connections.c:922 ../clients/cli/connections.c:923 +#: ../clients/cli/connections.c:925 ../clients/cli/connections.c:3159 +#: ../clients/cli/connections.c:7239 ../clients/cli/connections.c:7240 +#: ../clients/cli/devices.c:598 ../clients/cli/devices.c:648 +#: ../clients/cli/devices.c:856 ../clients/cli/devices.c:857 +#: ../clients/cli/devices.c:858 ../clients/cli/devices.c:859 +#: ../clients/cli/devices.c:895 ../clients/cli/devices.c:897 +#: ../clients/cli/devices.c:925 ../clients/cli/devices.c:926 +#: ../clients/cli/devices.c:927 ../clients/cli/devices.c:928 +#: ../clients/cli/devices.c:929 ../clients/cli/devices.c:930 +#: ../clients/cli/devices.c:931 ../clients/cli/devices.c:933 +#: ../clients/cli/devices.c:935 ../clients/cli/general.c:423 +#: ../clients/cli/settings.c:2836 +#, fuzzy +msgid "no" +msgstr "بلا" + +#: ../clients/cli/common.c:534 +msgid "yes (guessed)" +msgstr "" + +#: ../clients/cli/common.c:536 +msgid "no (guessed)" +msgstr "" + +#: ../clients/cli/common.c:547 +msgid "No reason given" +msgstr "" + +#: ../clients/cli/common.c:550 ../clients/cli/connections.c:2729 +#, c-format +msgid "Unknown error" +msgstr "" + +#: ../clients/cli/common.c:553 +msgid "Device is now managed" +msgstr "" + +#: ../clients/cli/common.c:556 +msgid "Device is now unmanaged" +msgstr "" + +#: ../clients/cli/common.c:559 +msgid "The device could not be readied for configuration" +msgstr "" + +#: ../clients/cli/common.c:562 +msgid "" +"IP configuration could not be reserved (no available address, timeout, etc.)" +msgstr "" + +#: ../clients/cli/common.c:565 +msgid "The IP configuration is no longer valid" +msgstr "" + +#: ../clients/cli/common.c:568 +msgid "Secrets were required, but not provided" +msgstr "" + +#: ../clients/cli/common.c:571 +msgid "802.1X supplicant disconnected" +msgstr "" + +#: ../clients/cli/common.c:574 +msgid "802.1X supplicant configuration failed" +msgstr "" + +#: ../clients/cli/common.c:577 +msgid "802.1X supplicant failed" +msgstr "" + +#: ../clients/cli/common.c:580 +msgid "802.1X supplicant took too long to authenticate" +msgstr "" + +#: ../clients/cli/common.c:583 +msgid "PPP service failed to start" +msgstr "" + +#: ../clients/cli/common.c:586 +msgid "PPP service disconnected" +msgstr "" + +#: ../clients/cli/common.c:589 +msgid "PPP failed" +msgstr "" + +#: ../clients/cli/common.c:592 +msgid "DHCP client failed to start" +msgstr "" + +#: ../clients/cli/common.c:595 +msgid "DHCP client error" +msgstr "" + +#: ../clients/cli/common.c:598 +msgid "DHCP client failed" +msgstr "" + +#: ../clients/cli/common.c:601 +msgid "Shared connection service failed to start" +msgstr "" + +#: ../clients/cli/common.c:604 +msgid "Shared connection service failed" +msgstr "" + +#: ../clients/cli/common.c:607 +msgid "AutoIP service failed to start" +msgstr "" + +#: ../clients/cli/common.c:610 +msgid "AutoIP service error" +msgstr "" + +#: ../clients/cli/common.c:613 +msgid "AutoIP service failed" +msgstr "" + +#: ../clients/cli/common.c:616 +msgid "The line is busy" +msgstr "" + +#: ../clients/cli/common.c:619 +msgid "No dial tone" +msgstr "" + +#: ../clients/cli/common.c:622 +msgid "No carrier could be established" +msgstr "" + +#: ../clients/cli/common.c:625 +msgid "The dialing request timed out" +msgstr "" + +#: ../clients/cli/common.c:628 +msgid "The dialing attempt failed" +msgstr "" + +#: ../clients/cli/common.c:631 +msgid "Modem initialization failed" +msgstr "" + +#: ../clients/cli/common.c:634 +msgid "Failed to select the specified APN" +msgstr "" + +#: ../clients/cli/common.c:637 +msgid "Not searching for networks" +msgstr "" + +#: ../clients/cli/common.c:640 +msgid "Network registration denied" +msgstr "" + +#: ../clients/cli/common.c:643 +msgid "Network registration timed out" +msgstr "" + +#: ../clients/cli/common.c:646 +msgid "Failed to register with the requested network" +msgstr "" + +#: ../clients/cli/common.c:649 +msgid "PIN check failed" +msgstr "" + +#: ../clients/cli/common.c:652 +msgid "Necessary firmware for the device may be missing" +msgstr "" + +#: ../clients/cli/common.c:655 +msgid "The device was removed" +msgstr "" + +#: ../clients/cli/common.c:658 +msgid "NetworkManager went to sleep" +msgstr "" + +#: ../clients/cli/common.c:661 +msgid "The device's active connection disappeared" +msgstr "" + +#: ../clients/cli/common.c:664 +msgid "Device disconnected by user or client" +msgstr "" + +#: ../clients/cli/common.c:667 +msgid "Carrier/link changed" +msgstr "" + +#: ../clients/cli/common.c:670 +msgid "The device's existing connection was assumed" +msgstr "" + +#: ../clients/cli/common.c:673 +msgid "The supplicant is now available" +msgstr "" + +#: ../clients/cli/common.c:676 +msgid "The modem could not be found" +msgstr "" + +#: ../clients/cli/common.c:679 +msgid "The Bluetooth connection failed or timed out" +msgstr "" + +#: ../clients/cli/common.c:682 +msgid "GSM Modem's SIM card not inserted" +msgstr "" + +#: ../clients/cli/common.c:685 +msgid "GSM Modem's SIM PIN required" +msgstr "" + +#: ../clients/cli/common.c:688 +msgid "GSM Modem's SIM PUK required" +msgstr "" + +#: ../clients/cli/common.c:691 +msgid "GSM Modem's SIM wrong" +msgstr "" + +#: ../clients/cli/common.c:694 +msgid "InfiniBand device does not support connected mode" +msgstr "" + +#: ../clients/cli/common.c:697 +msgid "A dependency of the connection failed" +msgstr "" + +#: ../clients/cli/common.c:700 +msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" +msgstr "" + +#: ../clients/cli/common.c:703 +msgid "ModemManager is unavailable" +msgstr "" + +#: ../clients/cli/common.c:706 +msgid "The Wi-Fi network could not be found" +msgstr "" + +#: ../clients/cli/common.c:709 +msgid "A secondary connection of the base connection failed" +msgstr "" + +#: ../clients/cli/common.c:712 +msgid "DCB or FCoE setup failed" +msgstr "" + +#: ../clients/cli/common.c:715 +msgid "teamd control failed" +msgstr "" + +#: ../clients/cli/common.c:718 +msgid "Modem failed or no longer available" +msgstr "" + +#: ../clients/cli/common.c:721 +msgid "Modem now ready and available" +msgstr "" + +#: ../clients/cli/common.c:724 +msgid "SIM PIN was incorrect" +msgstr "" + +#: ../clients/cli/common.c:727 +msgid "New connection activation was enqueued" +msgstr "" + +#: ../clients/cli/common.c:730 +msgid "The device's parent changed" +msgstr "" + +#: ../clients/cli/common.c:733 +msgid "The device parent's management changed" +msgstr "" + +#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) +#: ../clients/cli/common.c:737 ../clients/cli/devices.c:628 +#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1658 +msgid "Unknown" +msgstr "" + +#: ../clients/cli/common.c:779 +#, c-format +msgid "invalid priority map '%s'" +msgstr "" + +#: ../clients/cli/common.c:786 ../clients/cli/common.c:792 +#, c-format +msgid "priority '%s' is not valid (<0-%ld>)" +msgstr "" + +#: ../clients/cli/common.c:859 +#, c-format +msgid "'%s' is not a valid team configuration or file name." +msgstr "" + +#: ../clients/cli/common.c:961 +#, c-format +msgid "Error: openconnect failed: %s\n" +msgstr "" + +#: ../clients/cli/common.c:968 +#, c-format +msgid "Error: openconnect failed with status %d\n" +msgstr "" + +#: ../clients/cli/common.c:970 +#, c-format +msgid "Error: openconnect failed with signal %d\n" +msgstr "" + +#: ../clients/cli/common.c:1047 +#, c-format +msgid "" +"Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " +"without '--ask' option.\n" +msgstr "" + +#. define some prompts for connection editor +#: ../clients/cli/connections.c:42 +msgid "Setting name? " +msgstr "" + +#: ../clients/cli/connections.c:43 +msgid "Property name? " +msgstr "" + +#: ../clients/cli/connections.c:44 +msgid "Enter connection type: " +msgstr "" + +#. define some other prompts +#: ../clients/cli/connections.c:47 +#, fuzzy +msgid "Connection type: " +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:48 +msgid "VPN type: " +msgstr "" + +#: ../clients/cli/connections.c:49 +msgid "Bond master: " +msgstr "" + +#: ../clients/cli/connections.c:50 +msgid "Team master: " +msgstr "" + +#: ../clients/cli/connections.c:51 +msgid "Bridge master: " +msgstr "" + +#: ../clients/cli/connections.c:52 +msgid "Connection (name, UUID, or path): " +msgstr "" + +#: ../clients/cli/connections.c:53 +msgid "Connection(s) (name, UUID, or path): " +msgstr "" + +#. 0 +#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174 +#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:91 +#: ../clients/cli/devices.c:101 ../clients/cli/devices.c:112 +#: ../clients/cli/devices.c:121 ../clients/cli/devices.c:138 +#: ../clients/cli/devices.c:151 ../clients/cli/devices.c:177 +#: ../clients/cli/devices.c:192 ../clients/cli/devices.c:201 +#: ../clients/cli/devices.c:211 +msgid "NAME" +msgstr "" + +#. 0 +#. 1 +#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:175 +msgid "UUID" +msgstr "" + +#. 1 +#. 0 +#. 1 +#. 2 +#: ../clients/cli/connections.c:63 ../clients/cli/connections.c:196 +#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:60 +#: ../clients/cli/devices.c:180 +msgid "TYPE" +msgstr "" + +#. 2 +#: ../clients/cli/connections.c:64 +msgid "TIMESTAMP" +msgstr "" + +#. 3 +#: ../clients/cli/connections.c:65 +msgid "TIMESTAMP-REAL" +msgstr "" + +#. 4 +#. 16 +#: ../clients/cli/connections.c:66 ../clients/cli/devices.c:75 +msgid "AUTOCONNECT" +msgstr "" + +#. 5 +#: ../clients/cli/connections.c:67 +msgid "AUTOCONNECT-PRIORITY" +msgstr "" + +#. 6 +#: ../clients/cli/connections.c:68 +msgid "READONLY" +msgstr "" + +#. 7 +#. 8 +#. 2 +#. 15 +#. 5 +#: ../clients/cli/connections.c:69 ../clients/cli/connections.c:182 +#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:167 +#: ../clients/cli/devices.c:183 +msgid "DBUS-PATH" +msgstr "" + +#. 8 +#. 13 +#. 4 +#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:165 +#: ../clients/cli/devices.c:182 +msgid "ACTIVE" +msgstr "" + +#. 9 +#. 0 +#. 12 +#. 3 +#: ../clients/cli/connections.c:71 ../clients/cli/devices.c:43 +#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:164 +#: ../clients/cli/devices.c:181 +msgid "DEVICE" +msgstr "" + +#. 10 +#. 3 +#. 1 +#. 10 +#. 1 +#: ../clients/cli/connections.c:72 ../clients/cli/connections.c:177 +#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:69 +#: ../clients/cli/general.c:37 +msgid "STATE" +msgstr "" + +#. 11 +#: ../clients/cli/connections.c:73 +msgid "ACTIVE-PATH" +msgstr "" + +#. 2 +#: ../clients/cli/connections.c:176 +msgid "DEVICES" +msgstr "" + +#. 4 +#: ../clients/cli/connections.c:178 +msgid "DEFAULT" +msgstr "" + +#. 5 +#: ../clients/cli/connections.c:179 +msgid "DEFAULT6" +msgstr "" + +#. 6 +#: ../clients/cli/connections.c:180 +msgid "SPEC-OBJECT" +msgstr "" + +#. 7 +#. 4 +#. Ask for optional 'vpn' arguments. +#: ../clients/cli/connections.c:181 ../clients/cli/connections.c:219 +#: ../clients/cli/connections.c:3863 ../clients/tui/nm-editor-utils.c:234 +#: ../clients/tui/nmt-connect-connection-list.c:406 +msgid "VPN" +msgstr "" + +#. 9 +#. 5 +#. 21 +#: ../clients/cli/connections.c:183 ../clients/cli/devices.c:49 +#: ../clients/cli/devices.c:80 +msgid "CON-PATH" +msgstr "" + +#. 10 +#: ../clients/cli/connections.c:184 +msgid "ZONE" +msgstr "" + +#. 11 +#: ../clients/cli/connections.c:185 +msgid "MASTER-PATH" +msgstr "" + +#. 1 +#: ../clients/cli/connections.c:197 +msgid "USERNAME" +msgstr "" + +#. 3 +#: ../clients/cli/connections.c:199 +msgid "BANNER" +msgstr "" + +#. 4 +#: ../clients/cli/connections.c:200 +msgid "VPN-STATE" +msgstr "" + +#. 5 +#: ../clients/cli/connections.c:201 +msgid "CFG" +msgstr "" + +#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226 +msgid "GENERAL" +msgstr "" + +#. 0 +#. 6 +#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:233 +msgid "IP4" +msgstr "" + +#. 1 +#. 7 +#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:234 +msgid "DHCP4" +msgstr "" + +#. 2 +#. 8 +#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:235 +msgid "IP6" +msgstr "" + +#. 3 +#. 9 +#: ../clients/cli/connections.c:218 ../clients/cli/devices.c:236 +msgid "DHCP6" +msgstr "" + +#: ../clients/cli/connections.c:253 +#, c-format +msgid "" +"Usage: nmcli connection { COMMAND | help }\n" +"\n" +"COMMAND := { show | up | down | add | modify | edit | delete | reload | " +"load }\n" +"\n" +" show [--active] [[--show-secrets] [id | uuid | path | apath] ] ...\n" +"\n" +" up [[id | uuid | path] ] [ifname ] [ap ] [nsp ] " +"[passwd-file ]\n" +"\n" +" up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file " +"]\n" +"\n" +" down [id | uuid | path | apath] ...\n" +"\n" +" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" +"\n" +" modify [--temporary] [id | uuid | path] ([+|-]. " +")+\n" +"\n" +" edit [id | uuid | path] \n" +" edit [type ] [con-name ]\n" +"\n" +" delete [id | uuid | path] \n" +"\n" +" reload\n" +"\n" +" load [ ... ]\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:274 +#, c-format +msgid "" +"Usage: nmcli connection show { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [--active]\n" +"\n" +"List in-memory and on-disk connection profiles, some of which may also be\n" +"active if a device is using that connection profile. Without a parameter, " +"all\n" +"profiles are listed. When --active option is specified, only the active\n" +"profiles are shown.\n" +"\n" +"ARGUMENTS := [--active] [--show-secrets] [id | uuid | path | apath] " +" ...\n" +"\n" +"Show details for specified connections. By default, both static " +"configuration\n" +"and active connection data are displayed. It is possible to filter the " +"output\n" +"using global '--fields' option. Refer to the manual page for more " +"information.\n" +"When --active option is specified, only the active profiles are taken into\n" +"account. --show-secrets option will reveal associated secrets as well.\n" +msgstr "" + +#: ../clients/cli/connections.c:295 +#, c-format +msgid "" +"Usage: nmcli connection up { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] [ifname ] [ap ] [nsp " +"] [passwd-file ]\n" +"\n" +"Activate a connection on a device. The profile to activate is identified by " +"its\n" +"name, UUID or D-Bus path.\n" +"\n" +"ARGUMENTS := ifname [ap ] [nsp ] [passwd-file ]\n" +"\n" +"Activate a device with a connection. The connection profile is selected\n" +"automatically by NetworkManager.\n" +"\n" +"ifname - specifies the device to active the connection on\n" +"ap - specifies AP to connect to (only valid for Wi-Fi)\n" +"nsp - specifies NSP to connect to (only valid for WiMAX)\n" +"passwd-file - file with password(s) required to activate the connection\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:316 +#, c-format +msgid "" +"Usage: nmcli connection down { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path | apath] ...\n" +"\n" +"Deactivate a connection from a device (without preventing the device from\n" +"further auto-activation). The profile to deactivate is identified by its " +"name,\n" +"UUID or D-Bus path.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:328 +#, c-format +msgid "" +"Usage: nmcli connection add { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" +"\n" +" COMMON_OPTIONS:\n" +" type \n" +" ifname | \"*\"\n" +" [con-name ]\n" +" [autoconnect yes|no]\n" +"\n" +" [save yes|no]\n" +"\n" +" TYPE_SPECIFIC_OPTIONS:\n" +" ethernet: [mac ]\n" +" [cloned-mac ]\n" +" [mtu ]\n" +"\n" +" wifi: ssid \n" +" [mac ]\n" +" [cloned-mac ]\n" +" [mtu ]\n" +" [mode infrastructure|ap|adhoc]\n" +"\n" +" wimax: [mac ]\n" +" [nsp ]\n" +"\n" +" pppoe: username \n" +" [password ]\n" +" [service ]\n" +" [mtu ]\n" +" [mac ]\n" +"\n" +" gsm: apn \n" +" [user ]\n" +" [password ]\n" +"\n" +" cdma: [user ]\n" +" [password ]\n" +"\n" +" infiniband: [mac ]\n" +" [mtu ]\n" +" [transport-mode datagram | connected]\n" +" [parent ]\n" +" [p-key ]\n" +"\n" +" bluetooth: [addr ]\n" +" [bt-type panu|dun-gsm|dun-cdma]\n" +"\n" +" vlan: dev \n" +" id \n" +" [flags ]\n" +" [ingress ]\n" +" [egress ]\n" +" [mtu ]\n" +"\n" +" bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) " +"| broadcast (3) |\n" +" 802.3ad (4) | balance-tlb (5) | balance-alb " +"(6)]\n" +" [primary ]\n" +" [miimon ]\n" +" [downdelay ]\n" +" [updelay ]\n" +" [arp-interval ]\n" +" [arp-ip-target ]\n" +" [lacp-rate slow (0) | fast (1)]\n" +"\n" +" bond-slave: master \n" +"\n" +" team: [config |]\n" +"\n" +" team-slave: master \n" +" [config |]\n" +"\n" +" bridge: [stp yes|no]\n" +" [priority ]\n" +" [forward-delay <2-30>]\n" +" [hello-time <1-10>]\n" +" [max-age <6-40>]\n" +" [ageing-time <0-1000000>]\n" +" [mac ]\n" +"\n" +" bridge-slave: master \n" +" [priority <0-63>]\n" +" [path-cost <1-65535>]\n" +" [hairpin yes|no]\n" +"\n" +" vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan|libreswan|" +"ssh|l2tp|iodine|...\n" +" [user ]\n" +"\n" +" olpc-mesh: ssid \n" +" [channel <1-13>]\n" +" [dhcp-anycast ]\n" +"\n" +" adsl: username \n" +" protocol pppoa|pppoe|ipoatm\n" +" [password ]\n" +" [encapsulation vcmux|llc]\n" +"\n" +" IP_OPTIONS:\n" +" [ip4 ] [gw4 ]\n" +" [ip6 ] [gw6 ]\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:412 +#, c-format +msgid "" +"Usage: nmcli connection modify { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] ([+|-]. )+\n" +"\n" +"Modify one or more properties of the connection profile.\n" +"The profile is identified by its name, UUID or D-Bus path. For multi-valued\n" +"properties you can use optional '+' or '-' prefix to the property name.\n" +"The '+' sign allows appending items instead of overwriting the whole value.\n" +"The '-' sign allows removing selected items instead of the whole value.\n" +"\n" +"Examples:\n" +"nmcli con mod home-wifi wifi.ssid rakosnicek\n" +"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, " +"10.10.1.5/8\"\n" +"nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n" +"nmcli con mod em1-1 -ipv4.dns 1\n" +"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n" +"nmcli con mod bond0 +bond.options mii=500\n" +"nmcli con mod bond0 -bond.options downdelay\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:435 +#, c-format +msgid "" +"Usage: nmcli connection edit { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] \n" +"\n" +"Edit an existing connection profile in an interactive editor.\n" +"The profile is identified by its name, UUID or D-Bus path\n" +"\n" +"ARGUMENTS := [type ] [con-name ]\n" +"\n" +"Add a new connection profile in an interactive editor.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:450 +#, c-format +msgid "" +"Usage: nmcli connection delete { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [id | uuid | path] \n" +"\n" +"Delete a connection profile.\n" +"The profile is identified by its name, UUID or D-Bus path.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:461 +#, c-format +msgid "" +"Usage: nmcli connection reload { help }\n" +"\n" +"Reload all connection files from disk.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:469 +#, c-format +msgid "" +"Usage: nmcli connection load { ARGUMENTS | help }\n" +"\n" +"ARGUMENTS := [...]\n" +"\n" +"Load/reload one or more connection files from disk. Use this after manually\n" +"editing a connection file to ensure that NetworkManager is aware of its " +"latest\n" +"state.\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:540 +msgid "activating" +msgstr "" + +#: ../clients/cli/connections.c:542 +msgid "activated" +msgstr "" + +#: ../clients/cli/connections.c:546 +msgid "deactivated" +msgstr "" + +#: ../clients/cli/connections.c:558 +#, fuzzy +msgid "VPN connecting (prepare)" +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:560 +msgid "VPN connecting (need authentication)" +msgstr "" + +#: ../clients/cli/connections.c:562 +#, fuzzy +msgid "VPN connecting" +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:564 +msgid "VPN connecting (getting IP configuration)" +msgstr "" + +#: ../clients/cli/connections.c:566 +#, fuzzy +msgid "VPN connected" +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:568 +#, fuzzy +msgid "VPN connection failed" +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:570 +#, fuzzy +msgid "VPN disconnected" +msgstr "إتّصالات VPN" + +#: ../clients/cli/connections.c:640 +#, c-format +msgid "Error updating secrets for %s: %s\n" +msgstr "" + +#: ../clients/cli/connections.c:660 +msgid "Connection profile details" +msgstr "" + +#: ../clients/cli/connections.c:672 ../clients/cli/connections.c:1081 +#, fuzzy, c-format +msgid "Error: 'connection show': %s" +msgstr "خطأ أثناء فتح اتصال VPN '%s'" + +#: ../clients/cli/connections.c:818 +msgid "never" +msgstr "" + +#: ../clients/cli/connections.c:1069 +msgid "Activate connection details" +msgstr "" + +#: ../clients/cli/connections.c:1305 +#, c-format +msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" +msgstr "" + +#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1328 +#, c-format +msgid "'%s' has to be alone" +msgstr "" + +#. Add headers +#: ../clients/cli/connections.c:1383 +msgid "NetworkManager active profiles" +msgstr "" + +#: ../clients/cli/connections.c:1384 +msgid "NetworkManager connection profiles" +msgstr "" + +#: ../clients/cli/connections.c:1424 ../clients/cli/connections.c:2152 +#: ../clients/cli/connections.c:2174 ../clients/cli/connections.c:2183 +#: ../clients/cli/connections.c:2193 ../clients/cli/connections.c:2203 +#: ../clients/cli/connections.c:2365 ../clients/cli/connections.c:8815 +#: ../clients/cli/connections.c:9020 ../clients/cli/devices.c:2028 +#: ../clients/cli/devices.c:2036 ../clients/cli/devices.c:2359 +#: ../clients/cli/devices.c:2366 ../clients/cli/devices.c:2380 +#: ../clients/cli/devices.c:2387 ../clients/cli/devices.c:2404 +#: ../clients/cli/devices.c:2412 ../clients/cli/devices.c:2425 +#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2676 +#: ../clients/cli/devices.c:2795 ../clients/cli/devices.c:2802 +#, c-format +msgid "Error: %s argument is missing." +msgstr "" + +#: ../clients/cli/connections.c:1439 +#, c-format +msgid "Error: %s - no such connection profile." +msgstr "" + +#: ../clients/cli/connections.c:1498 ../clients/cli/connections.c:2226 +#: ../clients/cli/connections.c:9319 ../clients/cli/devices.c:2636 +#: ../clients/cli/devices.c:3149 ../clients/cli/general.c:518 +#: ../clients/cli/general.c:567 ../clients/cli/general.c:584 +#: ../clients/cli/general.c:623 ../clients/cli/general.c:637 +#: ../clients/cli/general.c:755 ../clients/cli/general.c:802 +#: ../clients/cli/general.c:822 +#, c-format +msgid "Error: %s." +msgstr "" + +#: ../clients/cli/connections.c:1594 +#, c-format +msgid "no active connection on device '%s'" +msgstr "" + +#: ../clients/cli/connections.c:1602 +msgid "no active connection or device" +msgstr "" + +#: ../clients/cli/connections.c:1673 +#, c-format +msgid "device '%s' not compatible with connection '%s'" +msgstr "" + +#: ../clients/cli/connections.c:1676 +#, fuzzy, c-format +msgid "no device found for connection '%s'" +msgstr "خطأ أثناء فتح اتصال VPN '%s'" + +#: ../clients/cli/connections.c:1688 +msgid "unknown reason" +msgstr "" + +#: ../clients/cli/connections.c:1690 ../clients/cli/general.c:272 +msgid "none" +msgstr "بلا" + +#: ../clients/cli/connections.c:1692 +msgid "the user was disconnected" +msgstr "" + +#: ../clients/cli/connections.c:1694 +msgid "the base network connection was interrupted" +msgstr "" + +#: ../clients/cli/connections.c:1696 +msgid "the VPN service stopped unexpectedly" +msgstr "" + +#: ../clients/cli/connections.c:1698 +msgid "the VPN service returned invalid configuration" +msgstr "" + +#: ../clients/cli/connections.c:1700 +msgid "the connection attempt timed out" +msgstr "" + +#: ../clients/cli/connections.c:1702 +msgid "the VPN service did not start in time" +msgstr "" + +#: ../clients/cli/connections.c:1704 +msgid "the VPN service failed to start" +msgstr "" + +#: ../clients/cli/connections.c:1706 +msgid "no valid VPN secrets" +msgstr "" + +#: ../clients/cli/connections.c:1708 +msgid "invalid VPN secrets" +msgstr "" + +#: ../clients/cli/connections.c:1710 +msgid "the connection was removed" +msgstr "" + +#: ../clients/cli/connections.c:1732 ../clients/cli/connections.c:1760 +#: ../clients/cli/connections.c:1921 ../clients/cli/connections.c:7130 +#, c-format +msgid "Connection successfully activated (D-Bus active path: %s)\n" +msgstr "" + +#: ../clients/cli/connections.c:1739 +#, c-format +msgid "" +"Connection successfully activated (master waiting for slaves) (D-Bus active " +"path: %s)\n" +msgstr "" + +#: ../clients/cli/connections.c:1743 ../clients/cli/connections.c:1765 +#, c-format +msgid "Error: Connection activation failed." +msgstr "" + +#: ../clients/cli/connections.c:1816 +#, c-format +msgid "VPN connection successfully activated (D-Bus active path: %s)\n" +msgstr "" + +#: ../clients/cli/connections.c:1824 +#, c-format +msgid "Error: Connection activation failed: %s." +msgstr "" + +#: ../clients/cli/connections.c:1843 ../clients/cli/devices.c:1339 +#, c-format +msgid "Error: Timeout %d sec expired." +msgstr "" + +#: ../clients/cli/connections.c:1903 +#, c-format +msgid "Error: Connection activation failed: %s" +msgstr "" + +#: ../clients/cli/connections.c:1988 +#, c-format +msgid "failed to read passwd-file '%s': %s" +msgstr "" + +#: ../clients/cli/connections.c:2000 +#, c-format +msgid "missing colon in 'password' entry '%s'" +msgstr "" + +#: ../clients/cli/connections.c:2008 +#, c-format +msgid "missing dot in 'password' entry '%s'" +msgstr "" + +#: ../clients/cli/connections.c:2021 +#, c-format +msgid "invalid setting name in 'password' entry '%s'" +msgstr "" + +#: ../clients/cli/connections.c:2068 ../clients/cli/connections.c:2227 +msgid "unknown error" +msgstr "" + +#: ../clients/cli/connections.c:2077 +#, c-format +msgid "unknown device '%s'." +msgstr "" + +#: ../clients/cli/connections.c:2082 +msgid "neither a valid connection nor device given" +msgstr "" + +#: ../clients/cli/connections.c:2165 +#, c-format +msgid "Error: Connection '%s' does not exist." +msgstr "" + +#: ../clients/cli/connections.c:2211 ../clients/cli/devices.c:1238 +#: ../clients/cli/devices.c:2042 ../clients/cli/devices.c:2436 +#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2808 +#, c-format +msgid "Unknown parameter: %s\n" +msgstr "" + +#: ../clients/cli/connections.c:2235 +msgid "preparing" +msgstr "" + +#: ../clients/cli/connections.c:2259 +#, c-format +msgid "Connection '%s' (%s) successfully deleted.\n" +msgstr "" + +#: ../clients/cli/connections.c:2275 +#, c-format +msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" +msgstr "" + +#: ../clients/cli/connections.c:2347 ../clients/cli/connections.c:9006 +#: ../clients/cli/connections.c:9111 +#, c-format +msgid "Error: No connection specified." +msgstr "" + +#: ../clients/cli/connections.c:2379 +#, c-format +msgid "Error: '%s' is not an active connection.\n" +msgstr "" + +#: ../clients/cli/connections.c:2380 ../clients/cli/connections.c:9035 +#, c-format +msgid "Error: not all active connections found." +msgstr "" + +#: ../clients/cli/connections.c:2389 +#, c-format +msgid "Error: no active connection provided." +msgstr "" + +#: ../clients/cli/connections.c:2708 ../clients/cli/utils.c:569 +#, c-format +msgid "'%s' not among [%s]" +msgstr "" + +#: ../clients/cli/connections.c:2787 +#, c-format +msgid "Error: '%s': '%s' is not a valid %s MAC address." +msgstr "" + +#. Ask for optional arguments +#: ../clients/cli/connections.c:2788 ../clients/cli/connections.c:3273 +#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1614 +#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1646 +msgid "InfiniBand" +msgstr "" + +#: ../clients/cli/connections.c:2788 ../clients/tui/nm-editor-utils.c:147 +#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1634 +msgid "Ethernet" +msgstr "" + +#: ../clients/cli/connections.c:2808 +#, c-format +msgid "Error: 'mtu': '%s' is not a valid MTU." +msgstr "" + +#: ../clients/cli/connections.c:2824 +#, c-format +msgid "Error: 'parent': '%s' is not a valid interface name." +msgstr "" + +#: ../clients/cli/connections.c:2845 +#, c-format +msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." +msgstr "" + +#: ../clients/cli/connections.c:2890 +#, c-format +msgid "Error: '%s': '%s' is not a valid %s %s." +msgstr "" + +#: ../clients/cli/connections.c:2903 +msgid "Wi-Fi mode" +msgstr "" + +#: ../clients/cli/connections.c:2912 +msgid "InfiniBand transport mode" +msgstr "" + +#: ../clients/cli/connections.c:2924 +msgid "ADSL protocol" +msgstr "" + +#: ../clients/cli/connections.c:2935 +msgid "ADSL encapsulation" +msgstr "" + +#: ../clients/cli/connections.c:2948 +#, c-format +msgid "Error: 'flags': '%s' is not valid; use <0-7>." +msgstr "" + +#: ../clients/cli/connections.c:2970 +#, c-format +msgid "Error: '%s': '%s' is not valid; %s " +msgstr "" + +#: ../clients/cli/connections.c:3149 +#, c-format +msgid "Error: '%s': '%s' is not valid; use <%u-%u>." +msgstr "" + +#. Ask for optional arguments. +#: ../clients/cli/connections.c:3205 +#, c-format +msgid "There is %d optional argument for '%s' connection type.\n" +msgid_plural "There are %d optional arguments for '%s' connection type.\n" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: ../clients/cli/connections.c:3208 +#, c-format +msgid "Do you want to provide it? %s" +msgid_plural "Do you want to provide them? %s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#. Ask for optional arguments +#: ../clients/cli/connections.c:3225 +msgid "ethernet" +msgstr "" + +#: ../clients/cli/connections.c:3230 ../clients/cli/connections.c:3278 +#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3491 +msgid "MTU [auto]: " +msgstr "" + +#: ../clients/cli/connections.c:3241 ../clients/cli/connections.c:3289 +#: ../clients/cli/connections.c:3384 ../clients/cli/connections.c:3423 +#: ../clients/cli/connections.c:3795 +msgid "MAC [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3252 +msgid "Cloned MAC [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3300 +#, c-format +msgid "Transport mode %s" +msgstr "" + +#: ../clients/cli/connections.c:3313 +msgid "Parent interface [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3324 +msgid "P_KEY [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3334 +#, c-format +msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n" +msgstr "" + +#. Ask for optional arguments +#: ../clients/cli/connections.c:3351 ../clients/tui/nm-editor-utils.c:155 +#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1636 +msgid "Wi-Fi" +msgstr "" + +#: ../clients/cli/connections.c:3359 +#, c-format +msgid "Mode %s" +msgstr "" + +#. Ask for optional 'wimax' arguments. +#: ../clients/cli/connections.c:3379 ../libnm-glib/nm-device.c:1797 +#: ../libnm/nm-device.c:1642 +msgid "WiMAX" +msgstr "" + +#. Ask for optional 'pppoe' arguments. +#: ../clients/cli/connections.c:3402 +msgid "PPPoE" +msgstr "" + +#: ../clients/cli/connections.c:3406 ../clients/cli/connections.c:3444 +#: ../clients/cli/connections.c:3917 +msgid "Password [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3408 +msgid "Service [none]: " +msgstr "" + +#. Ask for optional 'gsm' or 'cdma' arguments. +#: ../clients/cli/connections.c:3438 +msgid "mobile broadband" +msgstr "" + +#: ../clients/cli/connections.c:3442 ../clients/cli/connections.c:3867 +msgid "Username [none]: " +msgstr "" + +#. Ask for optional 'bluetooth' arguments. +#: ../clients/cli/connections.c:3457 +msgid "bluetooth" +msgstr "" + +#: ../clients/cli/connections.c:3464 +#, c-format +msgid "Bluetooth type %s" +msgstr "" + +#: ../clients/cli/connections.c:3470 +#, c-format +msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" +msgstr "" + +#. Ask for optional 'vlan' arguments. +#. 13 +#: ../clients/cli/connections.c:3486 ../clients/cli/devices.c:240 +#: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:97 +#: ../libnm-core/nm-connection.c:1612 ../libnm-glib/nm-device.c:1809 +#: ../libnm-util/nm-connection.c:1601 ../libnm/nm-device.c:1654 +msgid "VLAN" +msgstr "" + +#: ../clients/cli/connections.c:3502 +msgid "VLAN flags (<0-7>) [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3513 +msgid "Ingress priority maps [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3524 +msgid "Egress priority maps [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3535 +msgid "Bonding mode [balance-rr]: " +msgstr "" + +#. Ask for optional 'bond' arguments. +#: ../clients/cli/connections.c:3551 +msgid "bond" +msgstr "" + +#: ../clients/cli/connections.c:3573 +msgid "Bonding primary interface [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3576 +#, c-format +msgid "Error: 'primary': '%s' is not a valid interface name.\n" +msgstr "" + +#: ../clients/cli/connections.c:3584 +#, c-format +msgid "Bonding monitoring mode %s" +msgstr "" + +#: ../clients/cli/connections.c:3590 +#, c-format +msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" +msgstr "" + +#: ../clients/cli/connections.c:3599 +msgid "Bonding miimon [100]: " +msgstr "" + +#: ../clients/cli/connections.c:3602 +#, c-format +msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3610 +msgid "Bonding downdelay [0]: " +msgstr "" + +#: ../clients/cli/connections.c:3613 +#, c-format +msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3621 +msgid "Bonding updelay [0]: " +msgstr "" + +#: ../clients/cli/connections.c:3624 +#, c-format +msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3633 +msgid "Bonding arp-interval [0]: " +msgstr "" + +#: ../clients/cli/connections.c:3636 +#, c-format +msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n" +msgstr "" + +#. FIXME: verify the string +#: ../clients/cli/connections.c:3644 +msgid "Bonding arp-ip-target [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3651 +msgid "LACP rate ('slow' or 'fast') [slow]: " +msgstr "" + +#: ../clients/cli/connections.c:3657 +#, c-format +msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n" +msgstr "" + +#: ../clients/cli/connections.c:3680 +msgid "Team JSON configuration [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3697 +msgid "team" +msgstr "" + +#: ../clients/cli/connections.c:3703 +msgid "team-slave" +msgstr "" + +#. Ask for optional 'bridge' arguments. +#: ../clients/cli/connections.c:3715 +msgid "bridge" +msgstr "" + +#: ../clients/cli/connections.c:3721 +#, c-format +msgid "Enable STP %s" +msgstr "" + +#: ../clients/cli/connections.c:3726 +#, c-format +msgid "Error: 'stp': %s.\n" +msgstr "" + +#: ../clients/cli/connections.c:3734 +msgid "STP priority [32768]: " +msgstr "" + +#: ../clients/cli/connections.c:3738 +#, c-format +msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3746 +msgid "Forward delay [15]: " +msgstr "" + +#: ../clients/cli/connections.c:3750 +#, c-format +msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3759 +msgid "Hello time [2]: " +msgstr "" + +#: ../clients/cli/connections.c:3763 +#, c-format +msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3771 +msgid "Max age [20]: " +msgstr "" + +#: ../clients/cli/connections.c:3775 +#, c-format +msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3783 +msgid "MAC address ageing time [300]: " +msgstr "" + +#: ../clients/cli/connections.c:3787 +#, c-format +msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n" +msgstr "" + +#. Ask for optional 'bridge-slave' arguments. +#: ../clients/cli/connections.c:3814 +msgid "bridge-slave" +msgstr "" + +#: ../clients/cli/connections.c:3819 +msgid "Bridge port priority [32]: " +msgstr "" + +#: ../clients/cli/connections.c:3832 +msgid "Bridge port STP path cost [100]: " +msgstr "" + +#: ../clients/cli/connections.c:3846 +#, c-format +msgid "Hairpin %s" +msgstr "" + +#: ../clients/cli/connections.c:3851 +#, c-format +msgid "Error: 'hairpin': %s.\n" +msgstr "" + +#. Ask for optional 'olpc' arguments. +#: ../clients/cli/connections.c:3878 ../libnm-glib/nm-device.c:1795 +#: ../libnm/nm-device.c:1640 +msgid "OLPC Mesh" +msgstr "" + +#: ../clients/cli/connections.c:3883 +msgid "OLPC Mesh channel [1]: " +msgstr "" + +#: ../clients/cli/connections.c:3886 +#, c-format +msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n" +msgstr "" + +#: ../clients/cli/connections.c:3894 +msgid "DHCP anycast MAC address [none]: " +msgstr "" + +#. Ask for optional 'adsl' arguments. +#: ../clients/cli/connections.c:3913 ../libnm-glib/nm-device.c:1811 +#: ../libnm/nm-device.c:1656 +msgid "ADSL" +msgstr "" + +#: ../clients/cli/connections.c:3921 +#, c-format +msgid "ADSL encapsulation %s" +msgstr "" + +#: ../clients/cli/connections.c:3963 +msgid "IPv4 address (IP[/plen]) [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3965 +msgid "IPv6 address (IP[/plen]) [none]: " +msgstr "" + +#: ../clients/cli/connections.c:3979 +#, c-format +msgid " Address successfully added: %s\n" +msgstr "" + +#: ../clients/cli/connections.c:3981 +#, c-format +msgid " Warning: address already present: %s\n" +msgstr "" + +#: ../clients/cli/connections.c:3983 +#, c-format +msgid " Warning: ignoring garbage at the end: '%s'\n" +msgstr "" + +#: ../clients/cli/connections.c:3985 ../clients/cli/connections.c:4867 +#: ../clients/cli/connections.c:4928 ../clients/cli/connections.c:5401 +#: ../clients/cli/connections.c:5434 +msgid "Error: " +msgstr "" + +#: ../clients/cli/connections.c:4005 +msgid "IPv4 gateway [none]: " +msgstr "" + +#: ../clients/cli/connections.c:4008 +msgid "IPv6 gateway [none]: " +msgstr "" + +#: ../clients/cli/connections.c:4028 +#, c-format +msgid "Error: invalid gateway address '%s'\n" +msgstr "" + +#. Ask for IP addresses +#: ../clients/cli/connections.c:4041 +#, c-format +msgid "Do you want to add IP addresses? %s" +msgstr "" + +#: ../clients/cli/connections.c:4049 +#, c-format +msgid "Press to finish adding addresses.\n" +msgstr "" + +#: ../clients/cli/connections.c:4189 +#, c-format +msgid "Error: 'parent': not valid without 'p-key'." +msgstr "" + +#: ../clients/cli/connections.c:4244 ../clients/cli/connections.c:5249 +msgid "SSID: " +msgstr "" + +#: ../clients/cli/connections.c:4247 ../clients/cli/connections.c:5252 +msgid "Error: 'ssid' is required." +msgstr "" + +#: ../clients/cli/connections.c:4311 +msgid "WiMAX NSP name: " +msgstr "" + +#: ../clients/cli/connections.c:4314 +msgid "Error: 'nsp' is required." +msgstr "" + +#: ../clients/cli/connections.c:4366 +msgid "PPPoE username: " +msgstr "" + +#: ../clients/cli/connections.c:4369 ../clients/cli/connections.c:5319 +msgid "Error: 'username' is required." +msgstr "" + +#: ../clients/cli/connections.c:4438 +msgid "APN: " +msgstr "" + +#: ../clients/cli/connections.c:4441 +msgid "Error: 'apn' is required." +msgstr "" + +#: ../clients/cli/connections.c:4499 +msgid "Bluetooth device address: " +msgstr "" + +#: ../clients/cli/connections.c:4502 +msgid "Error: 'addr' is required." +msgstr "" + +#: ../clients/cli/connections.c:4543 +#, c-format +msgid "Error: 'bt-type': '%s' not valid; use [%s, %s (%s), %s]." +msgstr "" + +#: ../clients/cli/connections.c:4587 +msgid "VLAN parent device or connection UUID: " +msgstr "" + +#: ../clients/cli/connections.c:4590 +msgid "Error: 'dev' is required." +msgstr "" + +#: ../clients/cli/connections.c:4594 +msgid "VLAN ID <0-4095>: " +msgstr "" + +#: ../clients/cli/connections.c:4597 +msgid "Error: 'id' is required." +msgstr "" + +#: ../clients/cli/connections.c:4603 +#, c-format +msgid "Error: 'id': '%s' is not valid; use <0-4095>." +msgstr "" + +#: ../clients/cli/connections.c:4613 +#, c-format +msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." +msgstr "" + +#: ../clients/cli/connections.c:4747 +#, c-format +msgid "Error: 'mode': %s." +msgstr "" + +#: ../clients/cli/connections.c:4756 +#, c-format +msgid "Error: 'primary': '%s' is not a valid interface name." +msgstr "" + +#: ../clients/cli/connections.c:4808 ../clients/cli/connections.c:4906 +#: ../clients/cli/connections.c:5108 +msgid "Error: 'master' is required." +msgstr "" + +#: ../clients/cli/connections.c:4814 ../clients/cli/connections.c:4912 +#: ../clients/cli/connections.c:5114 +#, c-format +msgid "Warning: master='%s' doesn't refer to any existing profile.\n" +msgstr "" + +#: ../clients/cli/connections.c:4817 ../clients/cli/connections.c:4920 +#: ../clients/cli/connections.c:5117 +#, c-format +msgid "" +"Warning: 'type' is currently ignored. We only support ethernet slaves for " +"now.\n" +msgstr "" + +#: ../clients/cli/connections.c:5014 +#, c-format +msgid "Error: 'stp': %s." +msgstr "" + +#: ../clients/cli/connections.c:5144 +#, c-format +msgid "Error: 'hairpin': %s." +msgstr "" + +#: ../clients/cli/connections.c:5197 +msgid "Error: 'vpn-type' is required." +msgstr "" + +#: ../clients/cli/connections.c:5204 +#, c-format +msgid "Warning: 'vpn-type': %s not known.\n" +msgstr "" + +#: ../clients/cli/connections.c:5265 +#, c-format +msgid "Error: 'channel': '%s' is not valid; use <1-13>." +msgstr "" + +#: ../clients/cli/connections.c:5316 +msgid "Username: " +msgstr "" + +#: ../clients/cli/connections.c:5325 +#, c-format +msgid "Protocol %s" +msgstr "" + +#: ../clients/cli/connections.c:5328 +msgid "Error: 'protocol' is required." +msgstr "" + +#: ../clients/cli/connections.c:5369 +#, c-format +msgid "Error: '%s' is not a valid connection type." +msgstr "" + +#: ../clients/cli/connections.c:5413 +#, c-format +msgid "Error: IPv4 gateway specified without IPv4 addresses" +msgstr "" + +#: ../clients/cli/connections.c:5417 +#, c-format +msgid "Error: multiple IPv4 gateways specified" +msgstr "" + +#: ../clients/cli/connections.c:5421 +#, c-format +msgid "Error: Invalid IPv4 gateway '%s'" +msgstr "" + +#: ../clients/cli/connections.c:5446 +#, c-format +msgid "Error: IPv6 gateway specified without IPv6 addresses" +msgstr "" + +#: ../clients/cli/connections.c:5450 +#, c-format +msgid "Error: multiple IPv6 gateways specified" +msgstr "" + +#: ../clients/cli/connections.c:5454 +#, c-format +msgid "Error: Invalid IPv6 gateway '%s'" +msgstr "" + +#: ../clients/cli/connections.c:5514 +#, fuzzy, c-format +msgid "Error: Failed to add '%s' connection: %s" +msgstr "خطأ أثناء فتح اتصال VPN '%s'" + +#: ../clients/cli/connections.c:5519 +#, c-format +msgid "Connection '%s' (%s) successfully added.\n" +msgstr "" + +#: ../clients/cli/connections.c:5757 +#, c-format +msgid "Error: 'type' argument is required." +msgstr "" + +#: ../clients/cli/connections.c:5765 +#, fuzzy, c-format +msgid "Error: invalid connection type; %s." +msgstr "خطأ أثناء فتح اتصال VPN '%s'" + +#: ../clients/cli/connections.c:5774 +#, c-format +msgid "Error: 'autoconnect': %s." +msgstr "" + +#: ../clients/cli/connections.c:5784 +#, c-format +msgid "Error: 'save': %s." +msgstr "" + +#: ../clients/cli/connections.c:5801 +msgid "Interface name [*]: " +msgstr "" + +#: ../clients/cli/connections.c:5806 +#, c-format +msgid "Error: 'ifname' argument is required." +msgstr "" + +#: ../clients/cli/connections.c:5808 +#, c-format +msgid "Error: mandatory 'ifname' not seen before '%s'." +msgstr "" + +#: ../clients/cli/connections.c:5817 +#, c-format +msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." +msgstr "" + +#: ../clients/cli/connections.c:6712 +#, c-format +msgid "['%s' setting values]\n" +msgstr "" + +#. TRANSLATORS: do not translate command names and keywords before :: +#. * However, you should translate terms enclosed in <>. +#. +#: ../clients/cli/connections.c:6794 +#, c-format +msgid "" +"---[ Main menu ]---\n" +"goto [ | ] :: go to a setting or property\n" +"remove [.] | :: remove setting or reset property " +"value\n" +"set [. ] :: set property value\n" +"describe [.] :: describe property\n" +"print [all | [.]] :: print the connection\n" +"verify [all | fix] :: verify the connection\n" +"save [persistent|temporary] :: save the connection\n" +"activate [] [/|] :: activate the connection\n" +"back :: go one level up (back)\n" +"help/? [] :: print this help\n" +"nmcli :: nmcli configuration\n" +"quit :: exit nmcli\n" +msgstr "" + +#: ../clients/cli/connections.c:6821 +#, c-format +msgid "" +"goto [.] | :: enter setting/property for editing\n" +"\n" +"This command enters into a setting or property for editing it.\n" +"\n" +"Examples: nmcli> goto connection\n" +" nmcli connection> goto secondaries\n" +" nmcli> goto ipv4.addresses\n" +msgstr "" + +#: ../clients/cli/connections.c:6828 +#, c-format +msgid "" +"remove [.] :: remove setting or reset property value\n" +"\n" +"This command removes an entire setting from the connection, or if a " +"property\n" +"is given, resets that property to the default value.\n" +"\n" +"Examples: nmcli> remove wifi-sec\n" +" nmcli> remove eth.mtu\n" +msgstr "" + +#: ../clients/cli/connections.c:6835 +#, c-format +msgid "" +"set [. ] :: set property value\n" +"\n" +"This command sets property value.\n" +"\n" +"Example: nmcli> set con.id My connection\n" +msgstr "" + +#: ../clients/cli/connections.c:6840 +#, c-format +msgid "" +"describe [.] :: describe property\n" +"\n" +"Shows property description. You can consult nm-settings(5) manual page to " +"see all NM settings and properties.\n" +msgstr "" + +#: ../clients/cli/connections.c:6845 +#, c-format +msgid "" +"print [all] :: print setting or connection values\n" +"\n" +"Shows current property or the whole connection.\n" +"\n" +"Example: nmcli ipv4> print all\n" +msgstr "" + +#: ../clients/cli/connections.c:6850 +#, c-format +msgid "" +"verify [all | fix] :: verify setting or connection validity\n" +"\n" +"Verifies whether the setting or connection is valid and can be saved later.\n" +"It indicates invalid values on error. Some errors may be fixed " +"automatically\n" +"by 'fix' option.\n" +"\n" +"Examples: nmcli> verify\n" +" nmcli> verify fix\n" +" nmcli bond> verify\n" +msgstr "" + +#: ../clients/cli/connections.c:6859 +#, c-format +msgid "" +"save [persistent|temporary] :: save the connection\n" +"\n" +"Sends the connection profile to NetworkManager that either will save it\n" +"persistently, or will only keep it in memory. 'save' without an argument\n" +"means 'save persistent'.\n" +"Note that once you save the profile persistently those settings are saved\n" +"across reboot or restart. Subsequent changes can also be temporary or\n" +"persistent, but any temporary changes will not persist across reboot or\n" +"restart. If you want to fully remove the persistent connection, the " +"connection\n" +"profile must be deleted.\n" +msgstr "" + +#: ../clients/cli/connections.c:6870 +#, c-format +msgid "" +"activate [] [/|] :: activate the connection\n" +"\n" +"Activates the connection.\n" +"\n" +"Available options:\n" +" - device the connection will be activated on\n" +"/| - AP (Wi-Fi) or NSP (WiMAX) (prepend with / when is not " +"specified)\n" +msgstr "" + +#: ../clients/cli/connections.c:6877 ../clients/cli/connections.c:7035 +#, c-format +msgid "" +"back :: go to upper menu level\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:6880 +#, c-format +msgid "" +"help/? [] :: help for the nmcli commands\n" +"\n" +msgstr "" + +#: ../clients/cli/connections.c:6883 +#, c-format +msgid "" +"nmcli [ ] :: nmcli configuration\n" +"\n" +"Configures nmcli. The following options are available:\n" +"status-line yes | no [default: no]\n" +"save-confirmation yes | no [default: yes]\n" +"show-secrets yes | no [default: no]\n" +"prompt-color <0-8> [default: 0]\n" +" 0 = normal\n" +" 1 = black\n" +" 2 = red\n" +" 3 = green\n" +" 4 = yellow\n" +" 5 = blue\n" +" 6 = magenta\n" +" 7 = cyan\n" +" 8 = white\n" +"\n" +"Examples: nmcli> nmcli status-line yes\n" +" nmcli> nmcli save-confirmation no\n" +" nmcli> nmcli prompt-color 3\n" +msgstr "" + +#: ../clients/cli/connections.c:6904 ../clients/cli/connections.c:7041 +#, c-format +msgid "" +"quit :: exit nmcli\n" +"\n" +"This command exits nmcli. When the connection being edited is not saved, the " +"user is asked to confirm the action.\n" +msgstr "" + +#: ../clients/cli/connections.c:6909 ../clients/cli/connections.c:7046 +#: ../clients/cli/connections.c:7469 ../clients/cli/connections.c:8391 +#, c-format +msgid "Unknown command: '%s'\n" +msgstr "" + +#. TRANSLATORS: do not translate command names and keywords before :: +#. * However, you should translate terms enclosed in <>. +#. +#: ../clients/cli/connections.c:6975 +#, c-format +msgid "" +"---[ Property menu ]---\n" +"set [] :: set new value\n" +"add [] :: add new option to the property\n" +"change :: change current value\n" +"remove [ |