MINOR: version: Show uname output in display_version()

This patch adds the sysname, release, version and machine fields from
the uname results to the version output. It intentionally leaves out the
machine name, because it is usually not useful and users might not want to
expose their machine names for privacy reasons.

May be backported if it is considered useful for debugging.

diff --git a/src/haproxy.c b/src/haproxy.c
index d01ddfdabf3479b26c1b6eda722c2087bbe0fc89..f641a8a14de635311cb9a725f426265661b875ea 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -46,6 +46,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <sys/resource.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <syslog.h>
@@ -541,6 +542,8 @@ void hap_register_per_thread_free(int (*fct)())
 
 static void display_version()
 {
+       struct utsname utsname;
+
        printf("HA-Proxy version %s %s - https://haproxy.org/\n"
               PRODUCT_STATUS "\n", haproxy_version, haproxy_date);
 
@@ -563,6 +566,10 @@ static void display_version()
                else
                        printf("Known bugs: " PRODUCT_URL_BUGS "\n", base_version);
        }
+
+       if (uname(&utsname) == 0) {
+               printf("Running on: %s %s %s %s\n", utsname.sysname, utsname.release, utsname.version, utsname.machine);
+       }
 }
 
 static void display_build_opts()