From 0e05c298cc4e5a5d509286e31a3a863e78c76456 Mon Sep 17 00:00:00 2001
From: sandman <sandman>
Date: Tue, 17 Dec 2002 19:41:05 +0000
Subject: Opie login becomes useable now:

 - pre- and post-session scripts (in $OPIEDIR/share/opie-login) to fix
   things like device ownership to user/root
 - logging in now doesn't simply mean: execute bin/qpe. instead opie-login
    * first tries to execute ~/.opie-session
    * if that doesn't exist $OPIEDIR/share/opie-login/opie-session
    * if that fails too, execute $OPIEDIR/bin/qpe
   you can now handle things like ssh-agent on a per-user basis.
(I'll commit the scripts later - for now it simply works like before)
---
(limited to 'core/opie-login/main.cpp')

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 674829d..81f4d1e 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -62,6 +62,7 @@ using namespace Opie;
 
 int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
+void sigint ( int sig );
 void exit_closelog ( );
 
 static struct option long_options [] = {
@@ -74,7 +75,6 @@ int main ( int argc, char **argv )
 {
 	pid_t ppid = ::getpid ( );
 
-
 	if ( ::geteuid ( ) != 0 ) {
 		::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
 		return 1;
@@ -104,7 +104,8 @@ int main ( int argc, char **argv )
 	::setpgid ( 0, 0 );
 	::setsid ( );
 
-	::signal ( SIGTERM, sigterm );
+	::signal ( SIGTERM, sigterm );	
+	::signal ( SIGINT, sigterm );
 
 	::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV );
 	::atexit ( exit_closelog );
@@ -122,6 +123,8 @@ int main ( int argc, char **argv )
 
 			while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
 
+			LoginApplication::logout ( );
+
 			if (( ::time ( 0 ) - started ) < 3 ) {
 				if ( autolog ) {
 					::syslog ( LOG_ERR, "Respawning too fast -- disabling auto-login\n" );
@@ -148,6 +151,8 @@ int main ( int argc, char **argv )
 			}
 			if ( killedbysig ) {  // qpe was killed by an uncaught signal
 				qApp = 0;
+				
+				::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
 
 				QWSServer::setDesktopBackground ( QImage ( ));
 				QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer );
@@ -303,6 +308,7 @@ private:
 };
 
 
+namespace Opie { extern int force_appearance; }  // HACK to get around the force-style setting
 
 
 int login_main ( int argc, char **argv, pid_t ppid )
@@ -310,6 +316,8 @@ int login_main ( int argc, char **argv, pid_t ppid )
 	QWSServer::setDesktopBackground( QImage() );
 	LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
+	Opie::force_appearance = 0;
+
 	app-> setFont ( QFont ( "Helvetica", 10 ));
 	app-> setStyle ( new QPEStyle ( ));
 
--
cgit v0.9.0.2