From abd320147455bd28c4c2af578be82ea195e8ce31 Mon Sep 17 00:00:00 2001
From: rublon-jfr <jfr@rublon.com>
Date: Fri, 28 Oct 2022 13:26:03 +0200
Subject: [PATCH] RDEV-3625: Standarize defining 'os' parameter for init
 request

---
 SSH/PAM/Makefile          | 2 +-
 SSH/PAM/src/coreHandler.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/SSH/PAM/Makefile b/SSH/PAM/Makefile
index 30304d4..b56cfdd 100644
--- a/SSH/PAM/Makefile
+++ b/SSH/PAM/Makefile
@@ -1,5 +1,5 @@
 make:
-	gcc -fPIC -fno-stack-protector -std=c99 -I$(shell ./getPythonVersion.sh) -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
+	gcc -fPIC -fno-stack-protector -std=c99 -DOS_NAME="\"$(shell . /etc/os-release; echo $$PRETTY_NAME)\"" -I$(shell ./getPythonVersion.sh) -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
 	ld -x --shared -o pam_rublon.so -lcurl rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
 selinux:
 	checkmodule -M -m -o login_rublon.mod login_rublon.te
diff --git a/SSH/PAM/src/coreHandler.c b/SSH/PAM/src/coreHandler.c
index a6a2240..f0dd5c7 100644
--- a/SSH/PAM/src/coreHandler.c
+++ b/SSH/PAM/src/coreHandler.c
@@ -15,6 +15,11 @@
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
+
+#ifndef OS_NAME
+#error "OS_NAME not defined"
+#endif
+
 struct MemoryStruct {
     char *memory;
     size_t size;
@@ -309,10 +314,10 @@ int postInit(pam_handle_t *pamh, cJSON **availableMethods, struct ApplicationInf
 
     cJSON_AddStringToObject(params, "userIP", userIP);
     cJSON_AddStringToObject(params, "appVer", moduleVersion);
-    cJSON_AddStringToObject(params, "os", "Centos7");
+    cJSON_AddStringToObject(params, "os", OS_NAME);
 
     cJSON_AddItemToObject(initQuery, "params", params);
-    //debugLog("Init JSON object: ", cJSON_PrintUnformatted(initQuery));
+    debugLog("Init JSON object: ", cJSON_PrintUnformatted(initQuery));
 
     asprintf(&url,"%s/api/transaction/init",rublonApiServer);
     char *curlResponse = curlHandler(pamh, cJSON_PrintUnformatted(initQuery), url, secretKey);