aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am10
-rw-r--r--src/user-list.vala5
3 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index dddc348..acdbde1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,8 +131,10 @@ dnl ##########################################################################
dnl Remote Logon Dependencies
dnl ##########################################################################
-AC_CHECK_HEADERS([security/pam-x2go.h],[],AC_MSG_ERROR([Could not find security/pam-x2go.h]))
-AC_CHECK_HEADERS([security/pam-freerdp2.h],[],AC_MSG_ERROR([Could not find security/pam-freerdp2.h]))
+dnl We do not have the necessary remote logon packages and PAM modules yet, so
+dnl just disable it for now.
+dnl AC_CHECK_HEADERS([security/pam-x2go.h],[],AC_MSG_ERROR([Could not find security/pam-x2go.h]))
+dnl AC_CHECK_HEADERS([security/pam-freerdp2.h],[],AC_MSG_ERROR([Could not find security/pam-freerdp2.h]))
dnl ###########################################################################
dnl Files to generate
diff --git a/src/Makefile.am b/src/Makefile.am
index bb91f59..c078f43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,6 @@ arctica_greeter_SOURCES = \
config.vapi \
fixes.vapi \
indicator.vapi \
- pam_freerdp2.vapi \
- pam_x2go.vapi \
xsync.vapi \
animate-timer.vala \
background.vala \
@@ -38,7 +36,13 @@ arctica_greeter_SOURCES = \
arctica-greeter.vala \
user-list.vala \
user-prompt-box.vala \
- util.vala
+ util.vala \
+ $(NULL)
+
+# Disable remote logon features we haven't packaged yet.
+# pam_freerdp2.vapi \
+# pam_x2go.vapi \
+# $(NULL)
logo_generator_SOURCES = logo-generator.vala
diff --git a/src/user-list.vala b/src/user-list.vala
index 3936768..124f5b3 100644
--- a/src/user-list.vala
+++ b/src/user-list.vala
@@ -1191,6 +1191,10 @@ public class UserList : GreeterList
if (selected_entry.id.has_prefix ("*remote_login"))
{
var greeter = new ArcticaGreeter ();
+ /*
+ * Fully disable some remote logon features for now.
+ */
+ /*
if ((text == pam_x2go.PROMPT_USER) || (text == pam_freerdp2.PROMPT_USER))
{
Gtk.Entry field = current_remote_fields.get ("username") as Gtk.Entry;
@@ -1225,6 +1229,7 @@ public class UserList : GreeterList
debug ("remote_login prompt parsing: command -> %s", answer);
greeter.respond (answer);
}
+ */
}
else
{