18523N/Adiff -urN tsoljdslabel.orig/Makefile.am tsoljdslabel.new/Makefile.am

18523N/A--- tsoljdslabel.orig/Makefile.am 2010-03-29 10:34:15.940032551 +0100

18523N/A+++ tsoljdslabel.new/Makefile.am 2010-03-29 10:39:15.934977946 +0100

18106N/A@@ -3,7 +3,7 @@

18106N/A AUTOMAKE_OPTIONS = dist-bzip2

18106N/A

18106N/A desktopdir = $(datadir)/xsessions/multilabel

18106N/A-desktop_in_files = tgnome.desktop.in

18106N/A+desktop_in_files = tgnome.desktop.in txfailsafe.desktop.in

18106N/A desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

18106N/A @INTLTOOL_DESKTOP_RULE@

18106N/A

18523N/Adiff -urN tsoljdslabel.orig/src/Makefile.am tsoljdslabel.new/src/Makefile.am

18523N/A--- tsoljdslabel.orig/src/Makefile.am 2010-03-29 10:34:15.928211196 +0100

18523N/A+++ tsoljdslabel.new/src/Makefile.am 2010-03-29 10:39:15.935811510 +0100

18106N/A@@ -6,6 +6,7 @@

18106N/A $(TSOLJDSLABEL_CFLAGS)

18106N/A

18106N/A bin_PROGRAMS = tsoljdslabel tsoljdslabel-ui

18106N/A+bin_SCRIPTS = txfailsafe

18106N/A

18106N/A tsoljdslabel_SOURCES = suidwrapper.c

18106N/A

18523N/Adiff -urN tsoljdslabel.orig/src/txfailsafe tsoljdslabel.new/src/txfailsafe

18523N/A--- tsoljdslabel.orig/src/txfailsafe 1970-01-01 01:00:00.000000000 +0100

18523N/A+++ tsoljdslabel.new/src/txfailsafe 2010-03-29 10:39:24.414532333 +0100

18523N/A@@ -0,0 +1,24 @@

18106N/A+#!/usr/bin/bash

18106N/A+

18523N/A+trap exit SIGINT

18523N/A+

18106N/A+rootrole=$(roles | grep -c root)

18106N/A+if [[ $rootrole == 1 ]] ; then

18106N/A+ echo "This is the failsafe xterm session. You must provide the root"

18106N/A+ echo "password to continue. If you cannot log in any other way please"

18523N/A+ echo "type Control-C and contact your system administrator."

18106N/A+ echo ""

18106N/A+ echo "Please enter the root password"

18106N/A+ su

18106N/A+ while [[ $? == 1 ]] ; do

18106N/A+ su

18106N/A+ done

18106N/A+else

18106N/A+ echo "The failsafe session is restricted to users who have been"

18106N/A+ echo "assigned the root role. If you cannot log in any other way"

18106N/A+ echo "please contact your system administrator."

18106N/A+ echo ""

18106N/A+ echo "Press the return key to return to the login screen"

18106N/A+ read line

18106N/A+fi

18106N/A+

18523N/Adiff -urN tsoljdslabel.orig/txfailsafe.desktop.in tsoljdslabel.new/txfailsafe.desktop.in

18523N/A--- tsoljdslabel.orig/txfailsafe.desktop.in 1970-01-01 01:00:00.000000000 +0100

18523N/A+++ tsoljdslabel.new/txfailsafe.desktop.in 2010-03-29 10:39:15.937161162 +0100

18106N/A@@ -0,0 +1,9 @@

18106N/A+[Desktop Entry]

18106N/A+Encoding=UTF-8

18106N/A+Name=Solaris Trusted Extension Failsafe

18106N/A+Comment=This session logs you into a Trusted Extensions failsafe xterm

18106N/A+Exec=/usr/X11/bin/xterm -e /usr/bin/txfailsafe

18106N/A+# no icon yet, only the top three are currently used

18106N/A+Icon=

18106N/A+Type=Application

18106N/A+X-GDM-BypassXsession=true