From 05e66d52025d7cbe8bcfafd93c31aa5a5b852566 Mon Sep 17 00:00:00 2001
From: Aidan Delaney <aidan@ontologyengineering.org>
Date: Fri, 30 Sep 2016 15:57:24 +0100
Subject: [PATCH] core: search in /usr/local before system paths for the
 dnsmasq binary

When looking for the dnsmasq (or any) binary, NetworkManager should
check /usr/local before it checks any system installed version. This
allows the user to replace the binary with a newer version should they
desire and is more consistent with the search behaviour commonly found
in $PATH.

https://github.com/NetworkManager/NetworkManager/pull/10
---
 src/nm-core-utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 6dfbb4ce10..e85f9c38bf 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -1152,12 +1152,12 @@ nm_utils_kill_process_sync (pid_t pid, guint64 start_time, int sig, NMLogDomain
 const char *const NM_PATHS_DEFAULT[] = {
 	PREFIX "/sbin/",
 	PREFIX "/bin/",
+	"/usr/local/sbin/",
 	"/sbin/",
 	"/usr/sbin/",
-	"/usr/local/sbin/",
+	"/usr/local/bin/",
 	"/bin/",
 	"/usr/bin/",
-	"/usr/local/bin/",
 	NULL,
 };