diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-01-13 19:24:23 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-01-13 19:24:23 +0000 |
| commit | b3d9dc562e53328809d9d6fa4e96ba353cbbb4b1 (patch) | |
| tree | 85ea9a924802395c9c9827497cf003b68ec7abe2 /config | |
| parent | cc41e3f9856b19c349c40b8b191bed6e6d8893fd (diff) | |
| download | gdm-b3d9dc562e53328809d9d6fa4e96ba353cbbb4b1.tar.gz | |
Enhancement patch provided by Dominique Hazael-Massieux
2006-01-13 Brian Cameron <brian.cameron@sun.com>
Enhancement patch provided by Dominique Hazael-Massieux
<dominique.hazael-massieux@centraliens.net> with some help from me
getting the configure/Makefile stuff working.
* configure.ac, config/Makefile.am, docs/C/gdm.xml, utils/Makefile.am:
Add support for --enable-secureremote
* config/ssh.desktop.in, utils/gdm-ssh-session: Added desktop file
and gdm-ssh-session script to support secure remote login.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 24 | ||||
| -rw-r--r-- | config/ssh.desktop.in | 6 |
2 files changed, 24 insertions, 6 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index c4f2cae4..6f635f03 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -15,7 +15,7 @@ postlogindir = $(sysconfdir)/gdm/PostLogin noinst_DATA = gdm.conf -DESKTOP_FILES = default.desktop CDE.desktop gnome.desktop +DESKTOP_FILES = default.desktop CDE.desktop gnome.desktop @SSHDESKTOP@ EXTRA_DIST = \ gdm.conf.in \ @@ -24,6 +24,7 @@ EXTRA_DIST = \ default.desktop.in \ gnome.desktop.in \ CDE.desktop.in \ + ssh.desktop.in \ Xsession.in \ gdm \ gdm-autologin \ @@ -44,13 +45,14 @@ gettextfoo.h: XKeepsCrashing Xsession.in clean-local: rm -f $(DESKTOP_FILES) - + uninstall-hook: rm -f $(DESTDIR)$(bisessdir)/gnome.desktop \ $(DESTDIR)$(bisessdir)/default.desktop \ $(DESTDIR)$(bisessdir)/CDE.desktop \ $(DESTDIR)$(instsessdir)/gnome.desktop \ $(DESTDIR)$(instsessdir)/default.desktop \ + $(DESTDIR)$(instsessdir)/ssh.desktop \ $(DESTDIR)$(instsessdir)/CDE.desktop \ $(DESTDIR)$(gdmconfdir)/gdm.conf \ $(DESTDIR)$(gdmconfdir)/gdm.conf-custom \ @@ -118,7 +120,7 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession -if test -f $(DESTDIR)$(bisessdir)/default.desktop; then \ cp -f $(DESTDIR)$(bisessdir)/default.desktop $(DESTDIR)$(bisessdir)/default.desktop.orig; \ fi - $(INSTALL_SCRIPT) default.desktop $(DESTDIR)$(bisessdir)/default.desktop + $(INSTALL_DATA) default.desktop $(DESTDIR)$(bisessdir)/default.desktop chmod 644 $(DESTDIR)$(bisessdir)/default.desktop -if test -f $(DESTDIR)$(bisessdir)/gnome.desktop; then \ @@ -127,7 +129,7 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession -if test -f $(DESTDIR)$(instsessdir)/gnome.desktop; then \ cp -f $(DESTDIR)$(instsessdir)/gnome.desktop $(DESTDIR)$(instsessdir)/gnome.desktop.orig; \ fi - $(INSTALL_SCRIPT) gnome.desktop $(DESTDIR)$(instsessdir)/gnome.desktop + $(INSTALL_DATA) gnome.desktop $(DESTDIR)$(instsessdir)/gnome.desktop chmod 644 $(DESTDIR)$(instsessdir)/gnome.desktop -if test -f /usr/dt/bin/Xsession; then \ @@ -137,7 +139,7 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession if test -f $(DESTDIR)$(instsessdir)/CDE.desktop; then \ cp -f $(DESTDIR)$(instsessdir)/CDE.desktop $(DESTDIR)$(instsessdir)/CDE.desktop.orig; \ fi; \ - $(INSTALL_SCRIPT) CDE.desktop $(DESTDIR)$(instsessdir)/CDE.desktop; \ + $(INSTALL_DATA) CDE.desktop $(DESTDIR)$(instsessdir)/CDE.desktop; \ fi if test '!' -d $(DESTDIR)$(initdir); then \ @@ -206,6 +208,16 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \ fi; \ fi + if test "x$(GDMPREFETCHLIST)" != "x"; then \ - $(INSTALL_SCRIPT) gdmprefetchlist $(DESTDIR)$(confdir)/gdmprefetchlist; \ + $(INSTALL_DATA) gdmprefetchlist $(DESTDIR)$(confdir)/gdmprefetchlist; \ + fi + + if test "x$(SSHDESKTOP)" != "x"; then \ + if test -f $(DESTDIR)$(instsessdir)/ssh.desktop; then \ + cp -f $(DESTDIR)$(instsessdir)/ssh.desktop $(DESTDIR)$(instsessdir)/ssh.desktop.orig; \ + fi; \ + $(INSTALL_SCRIPT) ssh.desktop $(DESTDIR)$(instsessdir)/ssh.desktop; \ + chmod 644 $(DESTDIR)$(instsessdir)/ssh.desktop; \ fi + diff --git a/config/ssh.desktop.in b/config/ssh.desktop.in new file mode 100644 index 00000000..e2a128fa --- /dev/null +++ b/config/ssh.desktop.in @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Secure Remote connection +_Comment=This session logs you into a remote host using ssh +Exec=@GDMSSHSESSIONCMD@ +Type=Application |