From 19bfe9e7f259f8e38340db80467366c39b129b09 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Sat, 15 Oct 2016 21:53:47 +0200
Subject: [PATCH] Include 'Configure owner' in -bV output

---
 src/src/exim.c    | 2 ++
 src/src/globals.c | 4 ++++
 src/src/globals.h | 4 ----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/src/exim.c b/src/src/exim.c
index 3fdfa62b5..b1fff4ddf 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1016,6 +1016,8 @@ if (fixed_never_users[0] > 0)
   fprintf(f, "%d\n", (unsigned int)fixed_never_users[i]);
   }
 
+fprintf(f, "Configure owner: %d:%d\n", config_uid, config_gid);
+
 fprintf(f, "Size of off_t: " SIZE_T_FMT "\n", sizeof(off_t));
 
 /* Everything else is details which are only worth reporting when debugging.
diff --git a/src/src/globals.c b/src/src/globals.c
index 28cb06028..b5ac6ceaf 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -512,6 +512,8 @@ uschar *config_filename        = NULL;
 int     config_lineno          = 0;
 #ifdef CONFIGURE_GROUP
 gid_t   config_gid             = CONFIGURE_GROUP;
+#else
+gid_t   config_gid             = 0;
 #endif
 uschar *config_main_filelist   = US CONFIGURE_FILE
                          "\0<-----------Space to patch configure_filename->";
@@ -520,6 +522,8 @@ uschar *config_main_directory  = NULL;
 
 #ifdef CONFIGURE_OWNER
 uid_t   config_uid             = CONFIGURE_OWNER;
+#else
+uid_t   config_uid             = 0;
 #endif
 
 int     connection_max_messages= -1;
diff --git a/src/src/globals.h b/src/src/globals.h
index 0084a99e7..6e89dde1b 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -282,16 +282,12 @@ extern int     connection_max_messages;/* Max down one SMTP connection */
 extern BOOL    config_changed;         /* True if -C used */
 extern FILE   *config_file;            /* Configuration file */
 extern uschar *config_filename;        /* Configuration file name */
-#ifdef CONFIGURE_GROUP
 extern gid_t   config_gid;             /* Additional group owner */
-#endif
 extern int     config_lineno;          /* Line number */
 extern uschar *config_main_filelist;   /* List of possible config files */
 extern uschar *config_main_filename;   /* File name actually used */
 extern uschar *config_main_directory;  /* Directory where the main config file was found */
-#ifdef CONFIGURE_OWNER
 extern uid_t   config_uid;             /* Additional owner */
-#endif
 extern uschar *continue_hostname;      /* Host for continued delivery */
 extern uschar *continue_host_address;  /* IP address for ditto */
 extern BOOL    continue_more;          /* Flag more addresses waiting */
-- 
2.30.2