diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-12 16:39:05 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-16 14:13:25 +0100 |
| commit | 329ac02d386f1b3bfd63a5dbc0025d612110c8af (patch) | |
| tree | 2995aeed3d32e1a5b0a08d7bca0f7ab5acea34b0 | |
| parent | 3f00899bdedaee8fcd0168a267785565de20e794 (diff) | |
| download | NetworkManager-329ac02d386f1b3bfd63a5dbc0025d612110c8af.tar.gz | |
platform: don't set @err during stop: in event_handler_recvmsgs()
If we break the loop normally, @err must be already set to zero.
The only other way this can happen is when the credentials are
invalid. Move setting @err to there.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 0723bf3099..a5b277d6a5 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -5618,6 +5618,7 @@ continue_reading: _LOGT ("netlink: recvmsg: received non-kernel message (pid %d)", creds->pid); else _LOGT ("netlink: recvmsg: received message without credentials"); + err = 0; goto stop; } @@ -5719,7 +5720,6 @@ stop: * Repeat reading. */ goto continue_reading; } - err = 0; out: if (interrupted) err = -NLE_DUMP_INTR; |