aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-04 15:25:46 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-04 15:25:46 +0200
commiteed9d645552c7dca8b2cf0237d67a6affdf025a7 (patch)
treece1013a9b48f0d035fe911576ae689e9d0effc7b /src
parent9ff8e0945acf3815b6a0570920d7352efb929291 (diff)
downloadarctica-greeter-eed9d645552c7dca8b2cf0237d67a6affdf025a7.tar.gz
arctica-greeter-eed9d645552c7dca8b2cf0237d67a6affdf025a7.tar.bz2
arctica-greeter-eed9d645552c7dca8b2cf0237d67a6affdf025a7.zip
src/user-list.vala: Obtain PAM_X2GO prompts from public API in security/pam.x2go.h.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/pam_x2go.vapi9
-rw-r--r--src/user-list.vala8
3 files changed, 14 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f16db6..4e9c567 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ arctica_greeter_SOURCES = \
config.vapi \
fixes.vapi \
indicator.vapi \
+ pam_x2go.vapi \
xsync.vapi \
animate-timer.vala \
background.vala \
diff --git a/src/pam_x2go.vapi b/src/pam_x2go.vapi
new file mode 100644
index 0000000..b5df15d
--- /dev/null
+++ b/src/pam_x2go.vapi
@@ -0,0 +1,9 @@
+[CCode (cprefix = "PAM_X2GO_", cheader_filename = "security/pam-x2go.h")]
+namespace pam_x2go
+{
+ public const string PROMPT_GUESTLOGIN;
+ public const string PROMPT_USER;
+ public const string PROMPT_HOST;
+ public const string PROMPT_COMMAND;
+ public const string PROMPT_PASSWORD;
+}
diff --git a/src/user-list.vala b/src/user-list.vala
index 9b0f403..443dec8 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -1095,19 +1095,19 @@ public class UserList : GreeterList
{
if (selected_entry.id.has_prefix ("*remote_login"))
{
- if (text == "remote login:")
+ if ((text == pam_x2go.PROMPT_USER) || (text == "remote login:"))
{
Gtk.Entry field = current_remote_fields.get ("username") as Gtk.Entry;
var answer = field != null ? field.text : "";
ArcticaGreeter.singleton.respond (answer);
}
- else if (text == "password:")
+ else if ((text == pam_x2go.PROMPT_PASSWORD) || (text == "password:"))
{
Gtk.Entry field = current_remote_fields.get ("password") as Gtk.Entry;
var answer = field != null ? field.text : "";
ArcticaGreeter.singleton.respond (answer);
}
- else if (text == "remote host:")
+ else if ((text == pam_x2go.PROMPT_HOST) || (text == "remote host:"))
{
var answer = url_from_remote_loding_server_list_name (selected_entry.id);
ArcticaGreeter.singleton.respond (answer);
@@ -1118,7 +1118,7 @@ public class UserList : GreeterList
var answer = field != null ? field.text : "";
ArcticaGreeter.singleton.respond (answer);
}
- else if (text == "remote command:")
+ else if (text == pam_x2go.PROMPT_COMMAND)
{
Gtk.Entry field = current_remote_fields.get ("command") as Gtk.Entry;
var answer = field != null ? field.text : "";