From 74ee30f7ea60054196f1f6068f0f98f163159e9d Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 4 May 2018 15:09:56 +0200
Subject: include/pam-x2go.h: Move login prompt strings into public include
 file, so it can be used by e.g. Arctica Greeter.

---
 src/Makefile.am | 11 +++++++++++
 src/pam-x2go.c  | 12 +++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e09c057..49d5639 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
 pamlibdir = $(PAMMODULEDIR)
 pamlib_LTLIBRARIES = pam_x2go.la
 
@@ -17,9 +19,18 @@ pam_x2go_la_CFLAGS = \
 	-DAUTH_CHECK="\"$(libexecdir)/x2go-auth-check\"" \
 	$(COVERAGE_CFLAGS)
 
+pam_x2go_la_CPPFLAGS =				\
+    -I$(top_srcdir)/include			\
+    $(NULL)
+
 pam_x2go_la_LIBADD = \
 	-lpam
 
+pam_x2goincludedir = $(includedir)/security/
+pam_x2goinclude_HEADERS =			\
+    $(top_srcdir)/include/pam-x2go.h		\
+    $(NULL)
+
 libexec_PROGRAMS = \
 	x2go-auth-check
 
diff --git a/src/pam-x2go.c b/src/pam-x2go.c
index 180ec0a..0d168f1 100644
--- a/src/pam-x2go.c
+++ b/src/pam-x2go.c
@@ -38,6 +38,8 @@
 #include <security/pam_modutil.h>
 #include <security/pam_appl.h>
 
+#include "pam-x2go.h"
+
 #include "pam-x2go-children.h"
 #include "auth-check-path.h"
 
@@ -93,20 +95,20 @@ get_item (pam_handle_t * pamh, int type)
 
 	switch (type) {
 	case PAM_USER:
-		message.msg = "login:";
+		message.msg = PAM_X2GO_PROMPT_GUESTLOGIN;
 		break;
 	case PAM_TYPE_X2GO_USER:
-		message.msg = "remote login:";
+		message.msg = PAM_X2GO_PROMPT_USER;
 		break;
 	case PAM_TYPE_X2GO_SERVER:
-		message.msg = "remote host:";
+		message.msg = PAM_X2GO_PROMPT_HOST;;
 		break;
 	case PAM_AUTHTOK:
-		message.msg = "password:";
+		message.msg = PAM_X2GO_PROMPT_PASSWORD;
 		message.msg_style = PAM_PROMPT_ECHO_OFF;
 		break;
 	case PAM_TYPE_X2GO_COMMAND:
-		message.msg = "remote command:";
+		message.msg = PAM_X2GO_PROMPT_COMMAND;
 		break;
 	default:
 		return NULL;
-- 
cgit v1.2.3