From bac76512fb66e29a9e7abfab64ee2f8e67fd65e7 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Sat, 5 Dec 2020 08:51:06 -0700
Subject: [PATCH] Log submit group to event log.

---
 plugins/sudoers/logging.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c
index 33597d607..d13deed87 100644
--- a/plugins/sudoers/logging.c
+++ b/plugins/sudoers/logging.c
@@ -652,8 +652,13 @@ void
 sudoers_to_eventlog(struct eventlog *evlog, char * const argv[],
     char * const envp[])
 {
+    struct group *grp;
     debug_decl(sudoers_to_eventlog, SUDOERS_DEBUG_LOGGING);
 
+    /* We rely on the reference held by the group cache. */
+    if ((grp = sudo_getgrgid(sudo_user.pw->pw_gid)) != NULL)
+	sudo_gr_delref(grp);
+
     memset(evlog, 0, sizeof(*evlog));
     evlog->iolog_file = sudo_user.iolog_file;
     evlog->iolog_path = sudo_user.iolog_path;
@@ -674,7 +679,8 @@ sudoers_to_eventlog(struct eventlog *evlog, char * const argv[],
     }
     evlog->submithost = user_host;
     evlog->submituser = user_name;
-    /* TODO - submitgroup */
+    if (grp != NULL)
+	evlog->submitgroup = grp->gr_name;
     evlog->ttyname = user_ttypath;
     evlog->argv = (char **)argv;
     evlog->env_add = (char **)sudo_user.env_vars;