Commit graph

17599 commits

Author SHA1 Message Date
Thomas Haller
8841eb6fea contrib: update fedora's REQUIRED_PACKAGES list
(cherry picked from commit fb2ef01d85)
2017-09-20 12:49:19 +02:00
Thomas Haller
b1134f2d3b contrib/rpm: allow building RPM without fatal warnings
A newer compiler version might emit some warnings and break the build
of the RPM. Of course, such warnings must be fixed. But it is still very
inconvenient to break the build of an old RPM version without easy workaround.

When building without "test" (which is on by default), don't use fatal warnings
for compilation.

(cherry picked from commit 7d00a96d23)
2017-09-20 12:47:39 +02:00
Thomas Haller
1685c79c19 man: fix docu of AUTOCONNECT_SLAVES variable in nm-settings-ifcfg-rh
Fixes: 6caafab258

https://bugzilla.redhat.com/show_bug.cgi?id=1492912
(cherry picked from commit 39d30a170d)
2017-09-20 12:28:49 +02:00
Beniamino Galvani
dc3cbc6012 cli: wifi: connect with PSK when the AP supports WPA-PSK and WPA-EAP
'nmcli device wifi connect' only supports WEP and WPA-PSK at the
moment, but not WPA-EAP. If the AP supports both WPA-PSK and WPA-EAP,
nmcli doesn't add the PSK to the connection, causing a connection
failure. Fix this.

https://bugzilla.redhat.com/show_bug.cgi?id=1492064
(cherry picked from commit 7af471919a)
2017-09-20 09:41:50 +02:00
Francesco Giudici
5499dda250 dhcp: dhclient: remove the --timeout argument from the command line
the --timeout command line option is a custom feature added in some
linux distributions (fedora). Passing that command line argument will
make dhclient fail if the binary does not support it, preventing
activation of dhcp based connections.
Worse, the option has just been recently changed from "-timeout", so
that we are currently incompatibile with Centos, RedHat and older
versions of Fedora too.

Leverage the "timeout" option in dhclient config file: it will produce
the expected behavior and will be universally supported.

Fixes test: dhcp-timeout
Fixes: fa46736013

https://bugzilla.redhat.com/show_bug.cgi?id=1491243
(cherry picked from commit 1cb4832f09)
2017-09-15 12:51:22 +02:00
Francesco Giudici
b946aefe24 dhcp: dhclient: fix daemon start when dhcp-timeout is specified
A typo in the new dhcp-timeout option caused the dhclient daemon to exit
with error when the dhcp-timeout option was specified.
This prevents dhcp connection to be upped.

Fixes: 82ef497cc9
(cherry picked from commit fa46736013)
2017-09-11 15:14:37 +02:00
Piotr Drąg
2b827fa8f2 po: mark broken strings in Japanese translation as fuzzy (bgo#787382)
https://bugzilla.gnome.org/show_bug.cgi?id=787382
2017-09-07 12:23:42 +02:00
Piotr Drąg
01fb989605 po: update Polish (pl) translation (bgo #787380)
https://bugzilla.gnome.org/show_bug.cgi?id=787380
2017-09-07 12:20:50 +02:00
Beniamino Galvani
b4e9cea4b0 route-manager: fix route comparison
When comparing a platform route with a route from configuration, we
must translate the value of rt_source.

This fixes CI test @ipv6_preserve_cached_routes
2017-09-05 09:49:47 +02:00
Beniamino Galvani
4542ab3a60 libnm: disconnect signal handlers from old object-manager
When NM is restarted and a new object-manager is created, ensure that
signal handlers are disconnected from the old one.

Fixes the following:
  assertion failed: (object_manager == priv->object_manager)

 #0  __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56
 #1  __GI_abort () at abort.c:90
 #2  g_assertion_message (domain=domain@entry=0x7fcac0b845ff "libnm", file=file@entry=0x7fcac0b84c95 "libnm/nm-client.c", line=line@entry=2506, func=func@entry=0x7fcac0b863a0 <__func__.34881> "name_owner_changed", message=message@entry=0x7fcac20b05f0 "assertion failed: (object_manager == priv->object_manager)") at gtestutils.c:2429
 #3  g_assertion_message_expr (domain=domain@entry=0x7fcac0b845ff "libnm", file=file@entry=0x7fcac0b84c95 "libnm/nm-client.c", line=line@entry=2506, func=func@entry=0x7fcac0b863a0 <__func__.34881> "name_owner_changed", expr=expr@entry=0x7fcac0b856a0 "object_manager == priv->object_manager") at gtestutils.c:2444
 #4  name_owner_changed (object=<optimized out>, pspec=<optimized out>, user_data=0x7fcac204e480) at libnm/nm-client.c:2506
 #8  <emit signal notify:name-owner on instance 0x7fcac2053c60 [GDBusObjectManagerClient]> (instance=instance@entry=0x7fcac2053c60, signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3439
     #5  g_closure_invoke (closure=0x7fcac20af390, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7ffde58d9ec0, invocation_hint=invocation_hint@entry=0x7ffde58d9e60) at gclosure.c:801
     #6  signal_emit_unlocked_R (node=node@entry=0x7fcac2052090, detail=detail@entry=185, instance=instance@entry=0x7fcac2053c60, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7ffde58d9ec0) at gsignal.c:3627
     #7  g_signal_emit_valist (instance=<optimized out>, signal_id=<optimized out>, detail=<optimized out>, var_args=var_args@entry=0x7ffde58da050) at gsignal.c:3383
 #9  g_object_dispatch_properties_changed (object=0x7fcac2053c60 [GDBusObjectManagerClient], n_pspecs=<optimized out>, pspecs=<optimized out>) at gobject.c:1061
 #10 g_object_notify (pspec=<optimized out>, object=0x7fcac2053c60 [GDBusObjectManagerClient]) at gobject.c:1155
 #11 g_object_notify (object=object@entry=0x7fcac2053c60 [GDBusObjectManagerClient], property_name=property_name@entry=0x7fcabe9d2b29 "name-owner") at gobject.c:1202
 #12 on_notify_g_name_owner (object=<optimized out>, pspec=<optimized out>, user_data=0x7fcac2053c60) at gdbusobjectmanagerclient.c:1262
 #16 <emit signal notify:g-name-owner on instance 0x7fcaa8004440 [GDBusProxy]> (instance=instance@entry=0x7fcaa8004440, signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3439
     #13 g_closure_invoke (closure=0x7fcaa80194f0, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7ffde58da370, invocation_hint=invocation_hint@entry=0x7ffde58da310) at gclosure.c:801
     #14 signal_emit_unlocked_R (node=node@entry=0x7fcac2052090, detail=detail@entry=299, instance=instance@entry=0x7fcaa8004440, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7ffde58da370) at gsignal.c:3627
     #15 g_signal_emit_valist (instance=<optimized out>, signal_id=<optimized out>, detail=<optimized out>, var_args=var_args@entry=0x7ffde58da500) at gsignal.c:3383
 #17 g_object_dispatch_properties_changed (object=0x7fcaa8004440 [GDBusProxy], n_pspecs=<optimized out>, pspecs=<optimized out>) at gobject.c:1061
 #18 g_object_notify (pspec=<optimized out>, object=0x7fcaa8004440 [GDBusProxy]) at gobject.c:1155
 #19 g_object_notify (object=object@entry=0x7fcaa8004440 [GDBusProxy], property_name=property_name@entry=0x7fcabe9d2b27 "g-name-owner") at gobject.c:1202
 #20 on_name_owner_changed (connection=<optimized out>, sender_name=<optimized out>, object_path=<optimized out>, interface_name=<optimized out>, signal_name=<optimized out>, parameters=<optimized out>, user_data=0x7fcaa8015b50) at gdbusproxy.c:1353
 #21 emit_signal_instance_in_idle_cb (data=0x7fcaa40ff400) at gdbusconnection.c:3701
 #22 g_main_context_dispatch (context=0x7fcac204eea0) at gmain.c:3152
 #23 g_main_context_dispatch (context=context@entry=0x7fcac204eea0) at gmain.c:3767
 #24 g_main_context_iterate (context=context@entry=0x7fcac204eea0, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at gmain.c:3838
 #25 g_main_context_iteration (context=0x7fcac204eea0, context@entry=0x0, may_block=may_block@entry=1) at gmain.c:3899
 #26 nmc_readline_helper (prompt=prompt@entry=0x7fcac2087f60 "The connection is not saved. Do you really want to quit? (yes/no) [no] ") at clients/cli/common.c:986
 #27 nmc_readline (prompt_fmt=<optimized out>) at clients/cli/common.c:1055
 #28 confirm_quit () at clients/cli/connections.c:6459
 #29 do_connection_edit (connection_type=<optimized out>, connection=0x7fcac208eca0, nmc=0x7fcac12a3a60 <nm_cli>) at clients/cli/connections.c:7611
 #30 do_connection_edit (nmc=0x7fcac12a3a60 <nm_cli>, argc=1, argv=0x7ffde58db0b0) at clients/cli/connections.c:7948
 #31 call_cmd (nmc=0x7fcac12a3a60 <nm_cli>, simple=0x7fcac2052490 [GSimpleAsyncResult], cmd=0x7fcac1291ae0 <connection_cmds+128>, argc=2, argv=0x7ffde58db0a8) at clients/cli/common.c:1315
 #32 got_client (source_object=<optimized out>, res=<optimized out>, user_data=0x7fcac2051830) at clients/cli/common.c:1297
 #33 g_simple_async_result_complete (simple=0x7fcac2052500 [GSimpleAsyncResult]) at gsimpleasyncresult.c:801
 #34 client_inited (source=0x7fcac204e480 [NMClient], result=0x7fcac20565f0, user_data=0x7fcac2052500) at libnm/nm-client.c:1839
 #35 g_simple_async_result_complete (simple=0x7fcac20565f0 [GSimpleAsyncResult]) at gsimpleasyncresult.c:801
 #36 init_async_complete (init_data=init_data@entry=0x7fcac2046820) at libnm/nm-client.c:2339
 #37 async_inited_obj_nm (init_data=0x7fcac2046820) at libnm/nm-client.c:2337
 #38 async_inited_obj_nm (object=0x7fcac2073080 [NMRemoteConnection], result=0x7fcac2089ed0, user_data=0x7fcac2046820) at libnm/nm-client.c:2357
 #39 g_simple_async_result_complete (simple=0x7fcac2089ed0 [GSimpleAsyncResult]) at gsimpleasyncresult.c:801
 #40 init_async_parent_inited (error=0x0, init_data=0x7fcaa408a0f0) at libnm/nm-remote-connection.c:677
 #41 init_async_parent_inited (source=<optimized out>, result=<optimized out>, user_data=0x7fcaa408a0f0) at libnm/nm-remote-connection.c:689
 #42 g_simple_async_result_complete (simple=0x7fcac2089c30 [GSimpleAsyncResult]) at gsimpleasyncresult.c:801
 #43 complete_in_idle_cb (data=<optimized out>) at gsimpleasyncresult.c:813
 #44 g_main_context_dispatch (context=0x7fcac204eea0) at gmain.c:3152
 #45 g_main_context_dispatch (context=context@entry=0x7fcac204eea0) at gmain.c:3767
 #46 g_main_context_iterate (context=0x7fcac204eea0, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at gmain.c:3838
 #47 g_main_loop_run (loop=0x7fcac2045ab0) at gmain.c:4032
 #48 main (argc=<optimized out>, argv=<optimized out>) at clients/cli/nmcli.c:642

https://bugzilla.redhat.com/show_bug.cgi?id=1471245
(cherry picked from commit 7758071c28)
2017-09-05 09:38:40 +02:00
Beniamino Galvani
6bc73f1590 core: merge branch 'bg/external-slaves-rh1442361'
https://bugzilla.redhat.com/show_bug.cgi?id=1442361
(cherry picked from commit 6a740fa247)
2017-09-02 10:46:31 +02:00
Beniamino Galvani
ac7d908d36 device: don't release external slaves on state change
If the slave is 'external' we should never touch it, in particular we
should not release the link from its master; we only have to remove it
from master's list.

https://bugzilla.redhat.com/show_bug.cgi?id=1442361
(cherry picked from commit 981f90e324)
2017-09-02 10:46:16 +02:00
Beniamino Galvani
52b4df5127 device: don't promote slave devices to managed
Previously, if a master device had internal state 'managed', we would
promote the slave to 'managed' as well. However,

 - if the slave is 'external', it should stay as is because we don't
   want to start managing it

 - if the slave is 'assumed', it will become managed when the
   activation succeeds, so it's not necessary to do it here

Fixes: 850c977953
(cherry picked from commit 9e99590508)
2017-09-02 10:46:14 +02:00
Beniamino Galvani
bc9269ffcb default-route: skip addition when the route already exists
Re-adding the default route has side-effects, as it also prunes the
cloned routes from the kernel FIB.

https://bugzilla.redhat.com/show_bug.cgi?id=1470930
(cherry picked from commit bea6d05c1d)
2017-08-29 10:46:49 +02:00
Beniamino Galvani
fb5834c3c1 checkpoint: better restore device managed state on rollback
Manage a device again if it was managed before the checkpoint.

https://bugzilla.redhat.com/show_bug.cgi?id=1464904
(cherry picked from commit 67bfdbfc91)
2017-08-28 10:33:04 +02:00
Thomas Haller
f43222d411 service: don't install dependency for "NetworkManager-wait-online.service" to "network-online.target.wants"
If we install "NetworkManager-wait-online.service" in the
"network-online.target.wants" directory, network-online.target always
pulls in NetworkManager-wait-online.service. As it was, it could only
be disabled by masking the service.

Instead, we should enable NetworkManager-wait-online.sevice via
systemd's preset. That is already done for Fedora 26 and newer.

Note that NetworkManager-wait-online.sevice already has Install.WantedBy.
This way, the dependency is created automatically when enabling the service.

https://bugzilla.redhat.com/show_bug.cgi?id=1455704
(cherry picked from commit d61eaf2545)
2017-07-26 18:48:19 +02:00
Thomas Haller
b77b259ff4 contrib/rpm: skip tests for -Q build option
Previously, the --quick option only mattered when creating
the source tarball, to run `make dist` instead of the slower
`make distcheck`.

Extend its meaning to also skip unit tests while building the RPM.
You still can enable them with

  $ ./contrib/fedora/rpm/build_clean.sh -Q -w test

(cherry picked from commit c528a89519)
2017-07-26 18:47:53 +02:00
Lubomir Rintel
75efe912c8 contrib/rpm: provide NetworkManager-devel
The package no longer exists.

Fixes: 03586743f0
(cherry picked from commit 1ac92ac355)
2017-07-26 18:47:09 +02:00
Stephen Gallagher
48598e037e contrib/rpm: fix Requires/Provides on subpackages
NetworkManager-wifi and NetworkManager-glib-devel should require
NetworkManager, not provide it.

https://bugzilla.redhat.com/show_bug.cgi?id=1454505
(cherry picked from commit 03586743f0)
2017-07-26 18:47:08 +02:00
Beniamino Galvani
c8d0a0fcf7 device: don't set a fake permanent hardware address
Software devices don't have a permanent hardware address and thus it
doesn't make sense to enforce the 'fake' (generated) permanent one
when cloned-mac-address=permanent.  Also, setting the fake permanent
address on bond devices, prevents them from inheriting the first slave
hardware address, so let's just skip the setting of MAC when
cloned-mac-address=permanent and there is no real permanent address.

https://bugzilla.redhat.com/show_bug.cgi?id=1472965
(cherry picked from commit 2f4dfd0f2e)
2017-07-26 14:08:23 +02:00
Beniamino Galvani
20c55bf5a6 checkpoint: document flags availability
Flags DELETE_NEW_CONNECTIONS and DISCONNECT_NEW_DEVICES were added in
1.6, document that.

https://bugzilla.redhat.com/show_bug.cgi?id=1474039
(cherry picked from commit 7382441433)
2017-07-25 23:14:24 +02:00
Beniamino Galvani
2e80b66427 libnm-core: clarify the meaning of the connection.permissions property
https://bugzilla.redhat.com/show_bug.cgi?id=1457939
(cherry picked from commit 378a2f2486)
2017-07-25 18:05:38 +02:00
Beniamino Galvani
8dc198d586 libnm-core: improve documentation for ipv4.dhcp-client-id property
https://bugzilla.redhat.com/show_bug.cgi?id=1468358
(cherry picked from commit 4b51f5b1a8)
2017-07-25 17:49:10 +02:00
Thomas Haller
44c412d524 travis: fix travis build to use Ubuntu 12.04 LTS (Precise Pangolin)
Travis used by default Ubuntu 12.04 which is now EOL. Hence, the default
changed.

Eventually, we may want to upgrade the tests to run on Ubuntu 14.04.5
LTS (Trusty Tahr). But for that we need to adjust the travis test
script.

For now, explicitly select precise.

https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming?utm_source=web&utm_medium=banner&&utm_campaign=trusty-default
(cherry picked from commit e260f2a08a)
2017-07-25 16:26:34 +02:00
Thomas Haller
9b5b0eb022 travis: enable gcc+clang compiler for travis builds
(cherry picked from commit 4efab710e4)
2017-07-25 16:26:31 +02:00
Thomas Haller
faf3cef542 core: fix creating lower-case MAC address with nm_utils_hwaddr_ntoa_buf()
There is only one caller at the moment, and he passes TRUE anyway.

(cherry picked from commit f0adca00f3)
2017-07-25 15:40:34 +02:00
Richard Fontana
91cb458349 Make licensing of contributions more explicit
Signed-off-by: Richard Fontana <rfontana@redhat.com>

https://mail.gnome.org/archives/networkmanager-list/2017-July/msg00034.html
(cherry picked from commit 0c6f88d4f0)
2017-07-25 07:18:14 +02:00
Thomas Haller
39b947fc7f platform: fix return value for do_delete_object()
The return value for the delete methods checks whether the object
is actually deleted. That is questionable behavior, because if the netlink
request succeeds, there is little point in checking with the platform cache.
As it is, it is racy.

Anyway, the previous value was totally wrong.

But it also uncovers another platform bug, which currently breaks
route tests. Will be fixed next.

(cherry picked from commit 5b09f7151b)
2017-07-25 06:57:26 +02:00
Beniamino Galvani
b72b8ef34c connectivity: fix memory leak
Fixes: 9d43869e47
(cherry picked from commit 7204472de5)
2017-07-19 22:16:46 +02:00
Beniamino Galvani
e80163c713 dns: perform the public-suffix check only for the hostname-derived domain
The DNS manager drops from the search list domains that are public
suffixes to prevent a possible domain hijack when using two-labels
hostnames [1].

This is a problem now that every single-label domain can be a TLD
since this means that such domains can't be used in the search list.

While it's useful to apply such restriction to the domain
automatically derived from the system hostname, it seems wrong to drop
domains specified by users in the configuration or provided by DHCP.

This commit keeps the public-suffix check only for the
hostname-derived domain

[1] https://bugzilla.redhat.com/show_bug.cgi?id=812394

https://bugzilla.redhat.com/show_bug.cgi?id=1404350
(cherry picked from commit 5aa22ed8c9)
2017-07-17 17:04:28 +02:00
Thomas Haller
beeb8df9ac dhcp/tests: add test parsing dhclient config
(cherry picked from commit 0c23191b01)
2017-07-10 11:55:54 +02:00
Jonathan Kang
7200906a62 dhcp/dhclient: improve "interface" statement parsing
In commit d405cfd908, parsing "interface"
statement is introduced. But it leads to uncommplete parsing of the
"request" entry, if one of the lines in "request" entry is prefixed with
word "interface". For example, the default configuration of openSUSE
distribution:

request subnet-mask, broadcast-address, routers,
	rfc3442-classless-static-routes,
	interface-mtu, host-name, domain-name, domain-search,
	domain-name-servers, nis-domain, nis-servers,
	nds-context, nds-servers, nds-tree-name,
	netbios-name-servers, netbios-dd-server,
	netbios-node-type, netbios-scope, ntp-servers;

Fixes: d405cfd908

https://bugzilla.opensuse.org/show_bug.cgi?id=1047004
https://mail.gnome.org/archives/networkmanager-list/2017-July/msg00015.html
(cherry picked from commit 3646ed083d)
2017-07-10 11:55:52 +02:00
Thomas Haller
d8164d57e2 build: belatedly bump version macros 2017-07-07 17:42:28 +02:00
Thomas Haller
ec0a2e19c6 release: bump version to 1.8.3 (development) 2017-07-07 14:05:11 +02:00
Thomas Haller
9ed1921ce3 release: bump version to 1.8.2 2017-07-07 14:02:12 +02:00
Thomas Haller
ca116a6c9f release: update NEWS 2017-07-07 13:59:08 +02:00
Lubomir Rintel
61b1ab2fcd ifcfg: drop an unused variable
(cherry picked from commit 0d71c0569f)
2017-07-07 13:44:30 +02:00
Beniamino Galvani
75fb2897d7 checkpoint: disconnect device before reactivation during rollback
Since commit 0922a17738 ("manager: avoid that auto-activations
preempt user activations") the manager doesn't allow a internal
activation to disconnect the same connection already active on the
device.  Thus, during a rollback we must ensure that the device is
deactivated before.

Fixes: 0922a17738
(cherry picked from commit 348959cfa2)
2017-07-05 11:19:55 +02:00
Thomas Haller
e96ee7fe53 libnm: merge branch 'th/libnm-client-async-revert'
Revert the change to initialize the GDBusObjectManager
synchronously. I still maintain that GDBusObjectManager's
async initialization is severely broken on it's own, but this
change broke

  $ systemctl restart NetworkManager
  $ nmcli connection up "$NAME"

leaving nmcli hanging, as libnm fails to process some D-Bus signals.
I think that hints to another bug, but apparently the previous
version was less broken. So revert for now.

https://bugzilla.redhat.com/show_bug.cgi?id=1450075

(cherry picked from commit 95ff2b8e8a)
2017-06-29 10:03:27 +02:00
Thomas Haller
c0844be7a2 libnm: refactor name-owner check for object-manager
(cherry picked from commit 196bae36bb)
2017-06-29 10:03:03 +02:00
Thomas Haller
a90ab3a401 libnm: move check for pending_init to init_async_complete()
(cherry picked from commit a73e73eae1)
2017-06-29 10:03:03 +02:00
Thomas Haller
5a489ef03e libnm: fix leaking init_data in got_object_manager()
Only happens if there are no objects, which would be very unusual.

(cherry picked from commit 4f0a621d43)
2017-06-29 10:03:03 +02:00
Thomas Haller
5e7dedc48d libnm: assert in async_inited_obj_nm() for existing pending_init count
(cherry picked from commit 958ae36c17)
2017-06-29 10:03:03 +02:00
Thomas Haller
adeaadc1ae libnm/trivial: move code
(cherry picked from commit efac9ecadd)
2017-06-29 10:03:03 +02:00
Thomas Haller
85863b4506 libnm: clear cancellable in new_object_manager() before emitting signal
Emitting signals may have side-effects. Just clear the cancellable
first, it is handled for good.

(cherry picked from commit d5efcc1115)
2017-06-29 10:03:03 +02:00
Thomas Haller
cafa720918 libnm: fix leaking cancellable in NMClient's name_owner_changed()
(cherry picked from commit e0ddf64522)
2017-06-29 10:03:03 +02:00
Thomas Haller
388954c93c libnm: fix getting self pointer in NMClient's new_object_manager()
(cherry picked from commit df6e2e2e78)
2017-06-29 10:03:03 +02:00
Thomas Haller
3dd9a430fa libnm: clear NMClientPrivate.object_manager in name_owner_changed()
Don't leave dangling pointers.

(cherry picked from commit 880a7061f2)
2017-06-29 10:03:03 +02:00
Thomas Haller
6d8a400d3f Revert "libnm: don't use async constructor for GDBusObjectManager"
Strangely, this breaks

  systemctl restart NetworkManager
  nmcli connection up "$NAME"

It seems that with this change, libnm misses some events from D-Bus.
It looks like there is something seriously broken. Before fixing it,
revert the previous state.

https://bugzilla.redhat.com/show_bug.cgi?id=1450075

This reverts commit 529d620a59.

(cherry picked from commit 45d6147098)
2017-06-29 10:03:03 +02:00
Thomas Haller
2fae2cbf02 Revert "libnm: refactor error handling in got_object_manager()"
This reverts commit c5370ea71a.

(cherry picked from commit 7cd4711e31)
2017-06-29 10:03:03 +02:00