Commit b3d9dc56 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

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.
parent cc41e3f9
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.
2006-01-11 Brian Cameron <brian.cameron@sun.com>
* daemon/verify-crypt.c, daemon/verify-pam.c, daemon/verify-shadow.c,
......
......@@ -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
[Desktop Entry]
Encoding=UTF-8
_Name=Secure Remote connection
_Comment=This session logs you into a remote host using ssh
Exec=@GDMSSHSESSIONCMD@
Type=Application
......@@ -860,6 +860,32 @@ AC_SUBST(GDMPREFETCH)
AC_SUBST(GDMPREFETCHLIST)
AC_SUBST(GDMPREFETCHCMD)
AC_ARG_ENABLE(secureremote,
[ --enable-secureremote=[yes/no] Enable to offer a secure X connection through ssh [default=no]],,
enable_secureremote=no)
AC_PATH_PROG(ZENITY,zenity,no)
if test "x$ZENITY" = "xno" ; then
if test "x$enable_secureremote" = "xyes" ; then
AC_MSG_ERROR(Secure remote connection requested but zenity binary not found)
fi
# if it was no, nothing happens, if it was auto, well then we're out of luck
enable_console_helper=no
else
if test ! "x$enable_secureremote" = "xno" ; then
enable_secureremote=yes
fi
fi
if test x$enable_secureremote != xno ; then
SSHDESKTOP="ssh.desktop"
GDMSSHSESSION="gdm-ssh-session"
GDMSSHSESSIONCMD="$EXPANDED_LIBEXECDIR/gdm-ssh-session"
fi
AC_SUBST(SSHDESKTOP)
AC_SUBST(GDMSSHSESSION)
AC_SUBST(GDMSSHSESSIONCMD)
AC_ARG_WITH(xevie,
[ --with-xevie=[yes/no] Add XEvIE Xserver extension support [default=no]],,
with_xevie=no)
......@@ -1097,6 +1123,7 @@ config/Init
config/PreSession
config/PostSession
config/gdmprefetchlist
config/ssh.desktop
daemon/gdm
gdm-stop
gdm-restart
......@@ -1152,6 +1179,14 @@ else
echo "XDMCP (remote login) support : NO"
fi
dnl <= Secure remote connection =>
if test x"$enable_secureremote" = xyes ; then
echo "Secure remote connection : YES"
else
echo "Secure remote connection : NO"
fi
dnl <= DMX =>
if test x"$DMX_SUPPORT" = xyes ; then
echo "DMX (Distributed Multihead X) support : YES"
......@@ -1178,7 +1213,7 @@ dnl <= Authentication scheme =>
echo "Authentication scheme : $VRFY"
dnl <= Utils built =>
echo "Extra utilities built : "`echo $GDMOPEN $GDMASKPASS $GDMPREFETCH`
echo "Extra utilities built : "`echo $GDMOPEN $GDMASKPASS $GDMPREFETCH $GDMSSHSESSION`
echo ""
dnl <= End of configuration summary =>
......
......@@ -4940,6 +4940,17 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
</varlistentry>
</variablelist>
</sect3>
<sect3 id="gdm-ssh-session">
<title><command>gdm-ssh-session</command></title>
<para>
The <command>gdm-ssh-session</command> is normally executed by the
GDM daemon when starting a securte remote connection through ssh.
It does not take any options.
</para>
</sect3>
</sect2>
</sect1>
......
This diff is collapsed.
......@@ -581,7 +581,7 @@ PostSession/
<term>HaltCommand</term>
<listitem>
<synopsis>HaltCommand=/sbin/shutdown -h now</synopsis>
<para>Full path and arguments to command to be executed when user selects Shutdown from the Actions menu. This can be a ';' separated list of commands to try. If a value is missing, the shut down command is not available. Note that the default for this value is not empty so to disable shut down you must set this explicitly to an empty value.</para>
<para>Full path and arguments to command to be executed when user selects "Shut Down" from the Actions menu. This can be a ';' separated list of commands to try. If a value is missing, the shut down command is not available. Note that the default for this value is not empty, so to disable "Shut Down" it must be set to an empty value.</para>
</listitem>
</varlistentry>
......@@ -2714,6 +2714,13 @@ remote-flexi - In remote (XDMCP) &amp; flexi mode.
</varlistentry>
</variablelist>
</sect3>
<sect3 id="gdm-ssh-session">
<title><command>gdm-ssh-session</command></title>
<para>The <command>gdm-ssh-session</command> is normally executed by the GDM daemon when starting a securte remote connection through ssh. It does not take any options.</para>
</sect3>
</sect2>
</sect1>
......@@ -3088,7 +3095,7 @@ homogeneous="bool"&gt;
<para>Certain common localized labels can be specified via the stock tags. The "text" tag is ignored if the "stock" tag is used. You should really use the stock labels rather then just putting all the translations into the themes. This gives faster load times and likely better translations. The following values are valid:</para>
<para><filename>cancel</filename>, _("_Cancel"</para>
<para><filename>caps-lock-warning</filename>, _("Please make sure the Caps Lock key is not enabled."</para>
<para><filename>caps-lock-warning</filename>, _("Caps Lock key is on."</para>
<para><filename>chooser</filename>, _("_XDMCP Chooser"</para>
<para><filename>config</filename>, _("_Configure"</para>
<para><filename>disconnect</filename>, _("D_isconnect"</para>
......
......@@ -15,6 +15,7 @@ libexec_PROGRAMS = \
@GDMASKPASS@ \
@GDMOPEN@ \
@GDMPREFETCH@ \
@GDMSSHSESSION@ \
gdmtranslate
if DMX_SUPPORT
......
#!/bin/bash
ZENITY=`which zenity`
TARGETHOST=`$ZENITY --title "Host to connect to" --entry --text "Enter the name of the host you want to log in to"`
# @@@ should probably get a user name too;
# for now can bet set using the $USERNAME@ convention
# @@@ should it do an ssh-add so the user doesn't have to enter its passphrase again?
ssh -A -X -T -n "$TARGETHOST" /etc/X11/Xsession
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment