diff options
| -rw-r--r-- | .bzrignore | 5 | ||||
| -rw-r--r-- | .gitgnore | 5 | ||||
| -rw-r--r-- | Makefile.am | 34 | ||||
| l---------[-rw-r--r--] | README | 2 | ||||
| -rw-r--r-- | README.md | 9 | ||||
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | freerdp.desktop.in | 8 | ||||
| -rw-r--r-- | freerdp2-session-wrapper.c (renamed from freerdp-session-wrapper.c) | 2 | ||||
| -rwxr-xr-x | freerdp2-session.in (renamed from freerdp-session.in) | 2 | ||||
| -rw-r--r-- | freerdp2.desktop.in | 8 | ||||
| -rw-r--r-- | lightdm-remote-freerdp2 (renamed from lightdm-remote-freerdp) | 0 | ||||
| -rw-r--r-- | lightdm-remote-session-freerdp2.in (renamed from lightdm-remote-session-freerdp.in) | 2 | ||||
| -rw-r--r-- | socket-sucker.c | 3 |
14 files changed, 48 insertions, 56 deletions
diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index 127de56..0000000 --- a/.bzrignore +++ /dev/null @@ -1,5 +0,0 @@ -socket-sucker -freerdp-session -freerdp.desktop -compile -.deps diff --git a/.gitgnore b/.gitgnore new file mode 100644 index 0000000..9949d96 --- /dev/null +++ b/.gitgnore @@ -0,0 +1,5 @@ +freerdp2-session +freerdp2.desktop +lightdm-remote-session-freerdp2 +compile +.deps diff --git a/Makefile.am b/Makefile.am index 44c2938..a02b80f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,33 +1,32 @@ - pam_sessiondir = $(sysconfdir)/pam.d/ pam_session_DATA = \ - lightdm-remote-freerdp + lightdm-remote-freerdp2 lightdm_sessiondir = $(datadir)/lightdm/remote-sessions lightdm_session_DATA = \ - freerdp.desktop + freerdp2.desktop %.desktop: %.desktop.in @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ session_startdir = $(pkgdatadir) session_start_SCRIPTS = \ - freerdp-session + freerdp2-session -freerdp-session: freerdp-session.in +freerdp2-session: freerdp2-session.in @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ @chmod +x $@ apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ - lightdm-remote-session-freerdp + lightdm-remote-session-freerdp2 -lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in +lightdm-remote-session-freerdp2: lightdm-remote-session-freerdp2.in @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ pkglibexec_PROGRAMS = \ socket-sucker \ - freerdp-session-wrapper + freerdp2-session-wrapper socket_sucker_SOURCES = \ socket-sucker.c @@ -37,22 +36,22 @@ socket_sucker_CFLAGS = \ socket_sucker_LDFLAGS = \ -pie -freerdp_session_wrapper_SOURCES = \ - freerdp-session-wrapper.c -freerdp_session_wrapper_CFLAGS = \ +freerdp2_session_wrapper_SOURCES = \ + freerdp2-session-wrapper.c +freerdp2_session_wrapper_CFLAGS = \ -DPKGDATADIR="\"$(pkgdatadir)\"" \ -Wall -Werror EXTRA_DIST = \ $(pam_session_DATA) \ - freerdp.desktop.in \ - freerdp-session.in \ - lightdm-remote-session-freerdp.in + freerdp2.desktop.in \ + freerdp2-session.in \ + lightdm-remote-session-freerdp2.in CLEANFILES = \ - freerdp.desktop \ - freerdp-session \ - lightdm-remote-session-freerdp + freerdp2.desktop \ + freerdp2-session \ + lightdm-remote-session-freerdp2 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall @@ -81,4 +80,3 @@ dist-hook: else \ echo Failed to generate AUTHORS: not a branch >&2; \ fi - @@ -1 +1 @@ -Configuration for LightDM to use the remote session +README.md
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..8c20350 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# LightDM (Arctica Greeter) Remote Logon: FreeRDP(2) # + +Configuration for LightDM / Arctica Greeter to launch remote FreeRDP +sessions using FreeRDPv2. + +This code project was originally started by Canonical Ltd. and has been +adapted by various authors with the purpose of making Remote Logon +against RDP servers via Arctica Greeter (formerly known as Unity Greeter) +available on Ubuntu and non-Ubuntu systems alike. @@ -1,9 +1,9 @@ #!/bin/sh -which gnome-autogen.sh || { - echo "Could not find 'gnome-autgen.sh'. Is gnome-common installed?" +which mate-autogen || { + echo "Could not find 'mate-autogen'. Is mate-common installed?" exit 1 } -. gnome-autogen.sh +. mate-autogen diff --git a/configure.ac b/configure.ac index 4216307..2d5a1c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lightdm-remote-session-freerdp], [1.0]) +AC_INIT([lightdm-remote-session-freerdp2], [1.0]) AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_SILENT_RULES([yes]) @@ -8,24 +8,10 @@ AC_PROG_INSTALL AM_PROG_CC_C_O ########################### -# Local Install -########################### - -with_localinstall="no" -AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], - [install all files locally (for distcheck)]), - with_localinstall=$enableval, - with_localinstall=no) - -########################### # PAM Module dir ########################### -if test "x$with_localinstall" = "xyes"; then - PAMMODULEDIR="${libdir}/security/" -else - PAMMODULEDIR="/lib/security" -fi +PAMMODULEDIR="/lib/security" AC_SUBST(PAMMODULEDIR) diff --git a/freerdp.desktop.in b/freerdp.desktop.in deleted file mode 100644 index 6eb26d4..0000000 --- a/freerdp.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=FreeRDP -Comment=Full Screen RDP session -Exec=@pkglibexecdir@/freerdp-session-wrapper -TryExec=@pkglibexecdir@/freerdp-session-wrapper -Icon= -Type=Application -X-LightDM-PAM-Service=lightdm-remote-freerdp diff --git a/freerdp-session-wrapper.c b/freerdp2-session-wrapper.c index 8c31fab..76f299f 100644 --- a/freerdp-session-wrapper.c +++ b/freerdp2-session-wrapper.c @@ -23,7 +23,7 @@ int main (int argc, char * argv[]) { char * args[2]; - args[0] = PKGDATADIR "/freerdp-session"; + args[0] = PKGDATADIR "/freerdp2-session"; args[1] = NULL; execvp(args[0], args); diff --git a/freerdp-session.in b/freerdp2-session.in index 7eaead3..3640b69 100755 --- a/freerdp-session.in +++ b/freerdp2-session.in @@ -1,7 +1,7 @@ #!/bin/bash if [ -e ~/.freerdp-socket ]; then - @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so -f --from-stdin + @pkglibexecdir@/socket-sucker | /usr/bin/xfreerdp --plugin rdpsnd.so /f /from-stdin else zenity --warning --text="Unable to locate FreeRDP socket" fi; diff --git a/freerdp2.desktop.in b/freerdp2.desktop.in new file mode 100644 index 0000000..1944b83 --- /dev/null +++ b/freerdp2.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=FreeRDP +Comment=Full Screen RDP session +Exec=@pkglibexecdir@/freerdp2-session-wrapper +TryExec=@pkglibexecdir@/freerdp2-session-wrapper +Icon= +Type=Application +X-LightDM-PAM-Service=lightdm-remote-freerdp2 diff --git a/lightdm-remote-freerdp b/lightdm-remote-freerdp2 index d79bc2e..d79bc2e 100644 --- a/lightdm-remote-freerdp +++ b/lightdm-remote-freerdp2 diff --git a/lightdm-remote-session-freerdp.in b/lightdm-remote-session-freerdp2.in index 38772f2..e298653 100644 --- a/lightdm-remote-session-freerdp.in +++ b/lightdm-remote-session-freerdp2.in @@ -5,7 +5,7 @@ #include <tunables/global> -@pkglibexecdir@/freerdp-session-wrapper { +@pkglibexecdir@/freerdp2-session-wrapper { #include <abstractions/authentication> #include <abstractions/nameservice> #include <abstractions/wutmp> diff --git a/socket-sucker.c b/socket-sucker.c index 8e8ad25..72c7941 100644 --- a/socket-sucker.c +++ b/socket-sucker.c @@ -42,7 +42,7 @@ main (int argc, char * argv[]) serv_addr.sun_family = AF_UNIX; - int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp-socket"); + int printsize = snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp2-socket"); if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) { return -1; } @@ -75,4 +75,3 @@ main (int argc, char * argv[]) return -1; } } - |