From c282abc6bd9bbc6dc204d217d8e94ea4565e68ca Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 6 Nov 2016 00:00:38 -0700
Subject: [PATCH] Thomas Bereknyei, Mic92: 39831: find "getent" by the usual
 command search, not just /usr/bin/

Also tweak the replacement getent to handle /etc/hosts format.
---
 ChangeLog            | 6 ++++++
 Completion/compaudit | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8b55b4bb..6499cf06e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-11-05  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* unposted: Completion/compaudit: tweak replacement getent
+	to handle /etc/hosts format.
+
+	* Thomas Bereknyei, Mic92: 39831: Completion/compaudit: find
+	"getent" by the usual command search, not just /usr/bin/.
+
 	* unposted: Test/A05execution.ztst:  tests for 39839, 39844
 
 	* 39844: Src/loop.c: fix "while" condition as per 39839
diff --git a/Completion/compaudit b/Completion/compaudit
index fb0463ca5..93a043124 100644
--- a/Completion/compaudit
+++ b/Completion/compaudit
@@ -15,8 +15,10 @@ compaudit() {                           # Define and then call
 emulate -L zsh
 setopt extendedglob
 
-[[ -x /usr/bin/getent ]] || getent() {
-  if [[ $2 = <-> ]]; then
+[[ -n $commands[getent] ]] || getent() {
+  if [[ $1 = hosts ]]; then
+    sed 's/#.*//' /etc/$1 | grep -w $2
+  elif [[ $2 = <-> ]]; then
     grep ":$2:[^:]*$" /etc/$1
   else
     grep "^$2:" /etc/$1