RDEV-3625: Minor fixes, repo cleaning

.gitignore

@@ -1,13 +1,5 @@
-*.so
 .vs/
 .vagrant/
 /*.log
 SSH/RPM/rublonPam-1.0/
 /.idea
-/SSH/PAM/cJSON.o
-/SSH/PAM/cfg_parse.o
-/SSH/PAM/coreHandler.o
-/SSH/PAM/pamApp.o
-/SSH/PAM/qrcodegen.o
-/SSH/PAM/rublonPam.o
-/SSH/PAM/signatureWrapper.o

SSH/PAM/.gitignore

@@ -1 +1,2 @@
 *.o
+*.so

SSH/PAM/Makefile

@@ -1,12 +1,11 @@
 make:
-	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
+	gcc -fPIC -fno-stack-protector -std=c99 -DOS_NAME="\"$(shell . /etc/os-release; echo $$PRETTY_NAME)\"" -I$(shell ./getPythonPath.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
 	semodule_package -o login_rublon.pp -m login_rublon.mod
 	#semodule -i login_rublon.pp
 install:
-	install -d $(DESTDIR)/etc
 	install -m 644 rublon.config $(DESTDIR)/etc
 
 	install -d $(DESTDIR)/usr/share/rublon-ssh
@@ -17,4 +16,4 @@ install:
 	install -d $(DESTDIR)/usr/lib64/security
 	install -m 644 pam_rublon.so $(DESTDIR)/usr/lib64/security/
 clean:
-	rm rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
+	rm pam_rublon.so rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o

SSH/PAM/buildRublonPam.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-gcc -fPIC -fno-stack-protector -std=c99 -I$(./getPythonVersion.sh) -c rublonPam.c src/pamApp.c src/coreHandler.c src/signatureWrapper.c lib/cfg_parse.c lib/cJSON.c lib/qrcodegen.c
-
-sudo mkdir -p /lib/x86_64-linux-gnu/security/
-sudo mkdir -p /usr/share/rublon-ssh
-
-sudo cp rublon.config /etc
-sudo cp confirmMethod.py /usr/share/rublon-ssh
-sudo cp confirmUser.py /usr/share/rublon-ssh
-
-sudo ld -x --shared -o /lib/x86_64-linux-gnu/security/pam_rublon.so -lcurl rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o
-
-rm rublonPam.o pamApp.o coreHandler.o signatureWrapper.o cfg_parse.o cJSON.o qrcodegen.o

SSH/PAM/hooks/installsemodule.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 semodule -i /usr/share/rublon-ssh/login_rublon.pp

SSH/PAM/src/coreHandler.c

@@ -227,7 +227,7 @@ char *curlHandler(pam_handle_t *pamh, char *jsonObj, char *url, char *secretKey)
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunks); 
         res = curl_easy_perform(curl);
         if(res != CURLE_OK) {
-            debugLog("No response from Rublon server", "");
+            debugLog("No response from Rublon server (perform)", "");
             return NULL;
         }
         long size;
@@ -246,7 +246,7 @@ char *curlHandler(pam_handle_t *pamh, char *jsonObj, char *url, char *secretKey)
         return curlResponse;
     }
     else {
-        debugLog("No response from Rublon server", "");
+        debugLog("No response from Rublon server (init)", "");
         return NULL;
     }
 }