1 files changed, 25 insertions, 23 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 3f1077c..b76d2c7 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -63,60 +63,65 @@ void sigterm ( int sig );
 void sigint ( int sig );
 void exit_closelog ( );
 
 int main ( int argc, char **argv )
 {
     int userExited = 0;
         pid_t ppid = ::getpid ( );
 
         if ( ::geteuid ( ) != 0 ) {
                 ::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)\n", argv [0] );
                 return 1;
         }
-        if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and
-                ::setuid ( 0 );      // messes up things like config files
-
-        //struct rlimit rl;
-        //::getrlimit ( RLIMIT_NOFILE, &rl );
-
-        //for ( unsigned int i = 0; i < rl. rlim_cur; i++ )
-        //      ::close ( i );
+    /*!
+     * @bug
+     * Qte does not really like being set UID root. This is
+     * largely because we do almost everything on config files
+     * in root context. So if you even want to use opie-login
+     * you are in for a world of hurt unless someone at least
+     * scrubs the settings area and the PIM apps to make sure that
+     * they are covered regarding perms and users.
+     */
+    if ( ::getuid ( ) != 0 )
+        ::setuid ( 0 );
 
         ::setpgid ( 0, 0 );
         ::setsid ( );
 
         ::signal ( SIGTERM, sigterm );
         ::signal ( SIGINT, sigterm );
 
         ::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV );
         ::atexit ( exit_closelog );
 
         const char* autolog = 0;
         Config c( "opie-login" );
         c.setGroup( "autologin" );
         QString entry = c.readEntry( "user", "" );
-        if ( !entry.isEmpty() ) autolog = ::strdup( (const char*) entry );
+    if ( !entry.isEmpty() )
+        autolog = ::strdup( (const char*) entry );
         
         while ( true ) {
                 pid_t child = ::fork ( );
 
                 if ( child < 0 ) {
                         ::syslog ( LOG_ERR, "Could not fork GUI process\n" );
                         break;
                 }
                 else if ( child > 0 ) {
                         int status = 0;
                         time_t started = ::time ( 0 );
 
-                        while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
+            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" );
                                         autolog = 0;
                                 }
                                 else {
                                         ::syslog ( LOG_ERR, "Respawning too fast -- going down\n" );
                                         break;
                                 }
@@ -171,31 +176,29 @@ int main ( int argc, char **argv )
                 else {
                         if ( !autolog ) {
                 QString confFile=QPEApplication::qpeDir() + "etc/opie-login.conf";
                                 Config cfg ( confFile, Config::File );
                                 cfg. setGroup ( "General" );
                                 QString user = cfg. readEntry ( "AutoLogin" );
 
                                 if ( !user. isEmpty ( ))
                                         autolog = ::strdup ( user. latin1 ( ));
                         }
 
                         if ( autolog && !userExited ) {
-
                 QWSServer::setDesktopBackground( QImage() );
                 ODevice::inst()->setDisplayStatus( true );
                 LoginApplication *app = new LoginApplication ( argc, argv, ppid );
                 LoginApplication::setLoginAs( autolog );
 
-
                                 if ( LoginApplication::changeIdentity ( ))
                                         ::exit ( LoginApplication::login ( ));
                                 else
                                         ::exit ( 0 );
                         }
                         else  {
                                 ::exit ( login_main ( argc, argv, ppid ));
             }
                 }
         }
         return 0;
 }
@@ -236,36 +239,35 @@ public:
   {
     switch ( level ) {
       case 0:
         if ( backlight() > 1 )
           setBacklight( 1 ); // lowest non-off
         return true;
         break;
       case 1:
         setBacklight( 0 ); // off
         return true;
         break;
       case 2:
+                default:
         // We're going to suspend the whole machine
         if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
           QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
           return true;
         }
         break;
     }
     return false;
   }
 
-private:
-public:
   void setIntervals( int i1 = 30, int i2 = 20, int i3 = 60 )
   {
     int v [4];
 
     v [ 0 ] = QMAX( 1000 * i1, 100 );
     v [ 1 ] = QMAX( 1000 * i2, 100 );
     v [ 2 ] = QMAX( 1000 * i3, 100 );
     v [ 3 ] = 0;
 
     if ( !i1 && !i2 && !i3 )
       QWSServer::setScreenSaverInterval ( 0 );
     else
@@ -280,84 +282,84 @@ public:
     return m_backlight_bright;
   }
 
   void setBacklight ( int bright )
   {
     if ( bright == -3 ) {
       // Forced on
       m_backlight_forcedoff = false;
       bright = -1;
     }
     if ( m_backlight_forcedoff && bright != -2 )
       return ;
+
     if ( bright == -2 ) {
       // Toggle between off and on
       bright = m_backlight_bright ? 0 : -1;
       m_backlight_forcedoff = !bright;
     }
 
     m_backlight_bright = bright;
 
     bright = backlight ( );
     ODevice::inst ( ) -> setDisplayBrightness ( bright );
 
     m_backlight_bright = bright;
   }
 
 private:
   bool m_lcd_status;
-
   int m_backlight_bright;
   bool m_backlight_forcedoff;
 };
 
 
 int login_main ( int argc, char **argv, pid_t ppid )
 {
         QWSServer::setDesktopBackground( QImage() );
         LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
         app-> setFont ( QFont ( "Helvetica", 10 ));
         app-> setStyle ( new QPEStyle ( ));
 
         if ( QWSServer::mouseHandler() &&
-             QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+         QWSServer::mouseHandler()-> inherits("QCalibratedMouseHandler") )
+    {
                 if ( !QFile::exists ( "/etc/pointercal" )) {
                         // Make sure calibration widget starts on top.
                         Calibrate *cal = new Calibrate;
                         cal-> exec ( );
                         delete cal;
                 }
         }
 
         LoginScreenSaver *saver = new LoginScreenSaver;
 
         saver-> setIntervals ( );
         QWSServer::setScreenSaver ( saver );
         saver-> restore ( );
 
-
         LoginWindowImpl *lw = new LoginWindowImpl ( );
         app-> setMainWidget ( lw );
-        lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
+    lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ),
+                       app-> desktop ( )-> height ( ));
         lw-> show ( );
 
         int rc = app-> exec ( );
 
         if ( app-> loginAs ( )) {
                 if ( app-> changeIdentity ( )) {
                         app-> login ( );
-
                         // if login succeeds, it never comes back
-
-                        QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." ));
+            QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ),
+                                    LoginWindowImpl::tr( "Could not start Opie." ));
                         rc = 1;
                 }
                 else {
-                        QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not switch to new user identity" ));
+            QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ),
+                                    LoginWindowImpl::tr( "Could not switch to new user identity" ));
                         rc = 2;
                 }
-
         }
         return rc;
 }