From 74355750325b0c3547e1682c3f5b9412cf4f983f Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Tue, 17 Nov 2020 05:24:12 -0700
Subject: [PATCH] git-daemon-verify: include from address in log message

Just like git-shell-verify includes the from address of the remote
client in its log messages, do the same for git-daemon-verify
provided peek_packet can extract the remote client (i.e. using
getpeername) address.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 bin/git-daemon-verify | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/git-daemon-verify b/bin/git-daemon-verify
index 06ecbb7..209757b 100755
--- a/bin/git-daemon-verify
+++ b/bin/git-daemon-verify
@@ -21,11 +21,12 @@ fi
 [ -n "$cfg_git_daemon_bin" ] ||
 	cfg_git_daemon_bin="$var_git_exec_path/git-daemon"
 
+fromip=
 logmsg()
 {
 	[ "${cfg_suppress_git_ssh_logging:-0}" = "0" ] || return 0
 	_msg="$(LC_ALL=C tr -c '\040-\176' '[?*]' <<EOT
-$*
+$fromip$*
 EOT
 	)" && _msg="${_msg%[?]}" &&
 	logger -t "${0##*/}[$$]" <<EOT
@@ -88,6 +89,9 @@ request="$1"
 shift
 
 # Extract host and port now
+REMOTE_ADDR=
+SERVER_ADDR=
+SERVER_PORT=
 [ "${hnam+set}" != "set" ] || unset hnam
 [ "${pnum+set}" != "set" ] || unset pnum
 [ "${hostport+set}" != "set" ] || unset hostport
@@ -95,9 +99,14 @@ for extra in "$@"; do
 	case "$extra" in
 	"host="*) hnam="${extra#host=}";;
 	"port="*) pnum="${extra#port=}";;
+	"server_addr="*) SERVER_ADDR="${extra#server_addr=}";;
+	"server_port="*) SERVER_PORT="${extra#server_port=}";;
+	"remote_addr="*) REMOTE_ADDR="${extra#remote_addr=}";;
 	esac
 done
 # Make nice hostport variable for later use
+fromip="$REMOTE_ADDR"
+fromip="${fromip:+$fromip }"
 if [ "${hnam+set}" = "set" ]; then
 	case "$hnam" in
 	*":"*)	hostport="[$hnam]";;
-- 
2.11.4.GIT