when quitting opie-login, don't kill the process id returned by getppid(),

but use the previously saved "real" parent pid.

3 files changed, 14 insertions, 7 deletions

diff --git a/core/opie-login/loginapplication.cpp b/core/opie-login/loginapplication.cpp
index 103d63b..8d86a71 100644
--- a/core/opie-login/loginapplication.cpp
+++ b/core/opie-login/loginapplication.cpp
@@ -35,28 +35,29 @@
 extern "C" {
 #include <security/pam_appl.h>
 }
 #else
 #include <crypt.h>
 #include <shadow.h>
 #endif
 
 #include "loginapplication.h"
 
 LoginApplication *lApp;
 
-LoginApplication::LoginApplication ( int &argc, char **argv )
+LoginApplication::LoginApplication ( int &argc, char **argv, pid_t parentpid )
         : QPEApplication ( argc, argv, GuiServer )
 {
         lApp = this;
+        m_parentpid = parentpid;
 }
 
 const char *LoginApplication::s_username = 0;
 
 #ifdef USEPAM
 
 const char *LoginApplication::s_pam_password = 0;
 
 int LoginApplication::pam_helper ( int num_msg, const struct pam_message **msg, struct pam_response **resp, void * )
 {
         int replies = 0;
         struct pam_response *reply = 0;
@@ -207,14 +208,14 @@ QStringList LoginApplication::allUsers ( )
                 if (( pwd-> pw_uid == 0 ) || ( pwd-> pw_uid >= 500 && pwd-> pw_uid < 65534 ))
                         sl << QString ( pwd-> pw_name );
         }
 
         ::endpwent ( );
 
         return sl;
 }
 
 void LoginApplication::quitToConsole ( )
 {
         QPEApplication::quit ( );
-        ::kill ( ::getppid ( ), SIGTERM );
+        ::kill ( m_parentpid, SIGTERM );
 }
diff --git a/core/opie-login/loginapplication.h b/core/opie-login/loginapplication.h
index 062c088..4e7cf79 100644
--- a/core/opie-login/loginapplication.h
+++ b/core/opie-login/loginapplication.h
@@ -30,38 +30,41 @@
 
 #include <qstringlist.h>
 
 #include <qpe/qpeapplication.h>
 
 #ifdef USEPAM
 struct pam_message;
 struct pam_response;
 #endif
 
 class LoginApplication : public QPEApplication {
 public:
-        LoginApplication ( int &argc, char **argv );
+        LoginApplication ( int &argc, char **argv, pid_t parentpid );
 
         static bool checkPassword ( const char *user, const char *password );
 
         static const char *loginAs ( );
         static void setLoginAs ( const char *user );
 
         static bool changeIdentity ( );
         static bool login ( );
 
         static QStringList allUsers ( );
 
         void quitToConsole ( );
 
 private:
         static const char *s_username;
 
 #ifdef USEPAM
         static int pam_helper ( int num_msg, const struct pam_message **msg, struct pam_response **resp, void * );
         static const char *s_pam_password;
 #endif
+
+private:
+        pid_t m_parentpid;
 };
 
 extern LoginApplication *lApp;
 
 #endif
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 579a93a..674829d 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -51,36 +51,39 @@
 #include <qwindowsystem_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qfile.h>
 
 #include "loginapplication.h"
 #include "loginwindowimpl.h"
 #include "calibrate.h"
 
 using namespace Opie;
 
-int login_main ( int argc, char **argv );
+int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
 void exit_closelog ( );
 
 static struct option long_options [] = {
         { "autologin", 1, 0, 'a' },
         { 0, 0, 0, 0 }
 };
 
 
 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;
         }
         if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and
                 ::setuid ( 0 );      // messes up things like config files
 
         char *autolog = 0;
         int c;
         while (( c = ::getopt_long ( argc, argv, "a:", long_options, 0 )) != -1 ) {
                 switch ( c ) {
                         case 'a':
@@ -174,25 +177,25 @@ int main ( int argc, char **argv )
                                         autolog = ::strdup ( user. latin1 ( ));
                         }
                 
                         if ( autolog ) {
                                 LoginApplication::setLoginAs ( autolog );
 
                                 if ( LoginApplication::changeIdentity ( ))
                                         ::exit ( LoginApplication::login ( ));
                                 else
                                         ::exit ( 0 );
                         }
                         else 
-                                ::exit ( login_main ( argc, argv ));
+                                ::exit ( login_main ( argc, argv, ppid ));
                 }
         }
         return 0;
 }
 
 void sigterm ( int /*sig*/ )
 {
         ::exit ( 0 );
 }
 
 
 void exit_closelog ( )
@@ -293,28 +296,28 @@ public:
   }
 
 private:
   bool m_lcd_status;
 
   int m_backlight_bright;
   bool m_backlight_forcedoff;
 };
 
 
 
 
-int login_main ( int argc, char **argv )
+int login_main ( int argc, char **argv, pid_t ppid )
 {
         QWSServer::setDesktopBackground( QImage() );
-        LoginApplication *app = new LoginApplication ( argc, argv );
+        LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
         app-> setFont ( QFont ( "Helvetica", 10 ));
         app-> setStyle ( new QPEStyle ( ));
 
         ODevice::inst ( )-> setSoftSuspend ( true );
 
 #if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
         if ( !QFile::exists ( "/etc/pointercal" )) {
                 // Make sure calibration widget starts on top.
                 Calibrate *cal = new Calibrate;
                 cal-> exec ( );
                 delete cal;